Change to v4.0 RTW

33 files changed, 3694 insertions, 3675 deletions

diff --git a/src/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj b/src/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj
index bc21448..b86c930 100644
--- a/src/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj
+++ b/src/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj
@@ -1,191 +1,191 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AA78D112-D889-414B-A7D4-467B34C7B663}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DotNetOpenAuth.ApplicationBlock</RootNamespace>
-    <AssemblyName>DotNetOpenAuth.ApplicationBlock</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkProfile />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\CodeAnalysis\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);SAMPLESONLY</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.InfoCard">
-      <HintPath>..\..\packages\DotNetOpenAuth.InfoCard.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.InfoCard.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth">
-      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Common">
-      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Consumer">
-      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider">
-      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2">
-      <HintPath>..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft\lib\net40-full\DotNetOpenAuth.OAuth2.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2.Client">
-      <HintPath>..\..\packages\DotNetOpenAuth.OAuth2.Client.0.23.0-draft\lib\net40-full\DotNetOpenAuth.OAuth2.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2.Client.UI">
-      <HintPath>..\..\packages\DotNetOpenAuth.OAuth2.Client.UI.0.23.0-draft\lib\net40-full\DotNetOpenAuth.OAuth2.Client.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.Provider">
-      <HintPath>..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty">
-      <HintPath>..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenIdOAuth">
-      <HintPath>..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel.Web" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomExtensions\Acme.cs" />
-    <Compile Include="CustomExtensions\AcmeRequest.cs" />
-    <Compile Include="CustomExtensions\AcmeResponse.cs" />
-    <Compile Include="Facebook\FacebookClient.cs" />
-    <Compile Include="Facebook\FacebookGraph.cs" />
-    <Compile Include="CustomExtensions\UIRequestAtRelyingPartyFactory.cs" />
-    <Compile Include="GoogleConsumer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InMemoryClientAuthorizationTracker.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InMemoryTokenManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TokenManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="TwitterConsumer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsLiveClient.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsLiveGraph.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="YammerConsumer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="YubikeyRelyingParty.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{AA78D112-D889-414B-A7D4-467B34C7B663}</ProjectGuid>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>DotNetOpenAuth.ApplicationBlock</RootNamespace>

+    <AssemblyName>DotNetOpenAuth.ApplicationBlock</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <FileAlignment>512</FileAlignment>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>3.5</OldToolsVersion>

+    <UpgradeBackupLocation />

+    <IsWebBootstrapper>false</IsWebBootstrapper>

+    <TargetFrameworkProfile />

+    <PublishUrl>publish\</PublishUrl>

+    <Install>true</Install>

+    <InstallFrom>Disk</InstallFrom>

+    <UpdateEnabled>false</UpdateEnabled>

+    <UpdateMode>Foreground</UpdateMode>

+    <UpdateInterval>7</UpdateInterval>

+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>

+    <UpdatePeriodically>false</UpdatePeriodically>

+    <UpdateRequired>false</UpdateRequired>

+    <MapFileExtensions>true</MapFileExtensions>

+    <ApplicationRevision>0</ApplicationRevision>

+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>

+    <UseApplicationTrust>false</UseApplicationTrust>

+    <BootstrapperEnabled>true</BootstrapperEnabled>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\Debug\</OutputPath>

+    <DefineConstants>TRACE;DEBUG</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\CodeAnalysis\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DebugType>full</DebugType>

+    <PlatformTarget>AnyCPU</PlatformTarget>

+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>

+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup>

+    <DefineConstants>$(DefineConstants);SAMPLESONLY</DefineConstants>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core">

+      <HintPath>..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.InfoCard">

+      <HintPath>..\..\packages\DotNetOpenAuth.InfoCard.4.0.0.12084\lib\net40-full\DotNetOpenAuth.InfoCard.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth">

+      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Common">

+      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Consumer">

+      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider">

+      <HintPath>..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2">

+      <HintPath>..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2.Client">

+      <HintPath>..\..\packages\DotNetOpenAuth.OAuth2.Client.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.Client.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2.Client.UI">

+      <HintPath>..\..\packages\DotNetOpenAuth.OAuth2.Client.UI.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.Client.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId">

+      <HintPath>..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.Provider">

+      <HintPath>..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty">

+      <HintPath>..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenIdOAuth">

+      <HintPath>..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.configuration" />

+    <Reference Include="System.Core">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Runtime.Serialization" />

+    <Reference Include="System.ServiceModel.Web" />

+    <Reference Include="System.Web" />

+    <Reference Include="System.Xml.Linq">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Data.DataSetExtensions">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="CustomExtensions\Acme.cs" />

+    <Compile Include="CustomExtensions\AcmeRequest.cs" />

+    <Compile Include="CustomExtensions\AcmeResponse.cs" />

+    <Compile Include="Facebook\FacebookClient.cs" />

+    <Compile Include="Facebook\FacebookGraph.cs" />

+    <Compile Include="CustomExtensions\UIRequestAtRelyingPartyFactory.cs" />

+    <Compile Include="GoogleConsumer.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="InMemoryClientAuthorizationTracker.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="InMemoryTokenManager.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="TokenManager.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="TwitterConsumer.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Util.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="WindowsLiveClient.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="WindowsLiveGraph.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="YammerConsumer.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="YubikeyRelyingParty.cs">

+      <SubType>Code</SubType>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>

+      <Install>false</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">

+      <Visible>False</Visible>

+      <ProductName>Windows Installer 3.1</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="packages.config" />

+  </ItemGroup>

+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/DotNetOpenAuth.ApplicationBlock/packages.config b/src/DotNetOpenAuth.ApplicationBlock/packages.config
index 4a552ac..4766339 100644
--- a/src/DotNetOpenAuth.ApplicationBlock/packages.config
+++ b/src/DotNetOpenAuth.ApplicationBlock/packages.config
@@ -1,17 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.InfoCard" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OAuth2.Client.UI" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0-RC1" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.InfoCard" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OAuth2.Client.UI" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Client.UI" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0.12084" />

 </packages>
\ No newline at end of file
diff --git a/src/OAuth/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj b/src/OAuth/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj
index 0d0f5ef..f148eca 100644
--- a/src/OAuth/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj
+++ b/src/OAuth/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj
@@ -1,192 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C78E8235-1D46-43EB-A912-80B522C4E9AE}</ProjectGuid>
-    <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OAuthAuthorizationServer</RootNamespace>
-    <AssemblyName>OAuthAuthorizationServer</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>false</UseIISExpress>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SAMPLESONLY</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;SAMPLESONLY</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft\lib\net40-full\DotNetOpenAuth.OAuth2.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2.AuthorizationServer">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.AuthorizationServer.0.23.0-draft\lib\net40-full\DotNetOpenAuth.OAuth2.AuthorizationServer.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.Linq" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Code\Client.cs" />
-    <Compile Include="Code\DatabaseKeyNonceStore.cs" />
-    <Compile Include="Code\DataClasses.designer.cs">
-      <DependentUpon>DataClasses.dbml</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="Code\HttpHeaderAttribute.cs" />
-    <Compile Include="Code\OAuth2AuthorizationServer.cs" />
-    <Compile Include="Code\Utilities.cs" />
-    <Compile Include="Controllers\AccountController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\OAuthController.cs" />
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="Models\AccountAuthorizeModel.cs" />
-    <Compile Include="Models\AccountModels.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Global.asax" />
-    <Content Include="Views\Home\CreateDatabase.aspx" />
-    <Content Include="Views\OAuth\Authorize.aspx" />
-    <Content Include="Web.config" />
-    <Content Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <Content Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <Content Include="Content\Site.css" />
-    <Content Include="Scripts\jquery-1.4.1.js" />
-    <Content Include="Scripts\jquery-1.4.1.min.js" />
-    <Content Include="Scripts\jquery-1.4.1-vsdoc.js" />
-    <Content Include="Scripts\jquery.validate.js" />
-    <Content Include="Scripts\jquery.validate.min.js" />
-    <Content Include="Scripts\jquery.validate-vsdoc.js" />
-    <Content Include="Scripts\MicrosoftAjax.js" />
-    <Content Include="Scripts\MicrosoftAjax.debug.js" />
-    <Content Include="Scripts\MicrosoftMvcAjax.js" />
-    <Content Include="Scripts\MicrosoftMvcAjax.debug.js" />
-    <Content Include="Scripts\MicrosoftMvcValidation.js" />
-    <Content Include="Scripts\MicrosoftMvcValidation.debug.js" />
-    <Content Include="Views\Account\LogOn.aspx" />
-    <Content Include="Views\Home\About.aspx" />
-    <Content Include="Views\Home\Index.aspx" />
-    <Content Include="Views\Shared\Error.aspx" />
-    <Content Include="Views\Shared\LogOnUserControl.ascx" />
-    <Content Include="Views\Shared\Site.Master" />
-    <Content Include="Views\Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Code\DataClasses.dbml">
-      <Generator>MSLinqToSQLGenerator</Generator>
-      <LastGenOutput>DataClasses.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </None>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Code\DataClasses.dbml.layout">
-      <DependentUpon>DataClasses.dbml</DependentUpon>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>

+    </ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{C78E8235-1D46-43EB-A912-80B522C4E9AE}</ProjectGuid>

+    <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>OAuthAuthorizationServer</RootNamespace>

+    <AssemblyName>OAuthAuthorizationServer</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <MvcBuildViews>false</MvcBuildViews>

+    <UseIISExpress>false</UseIISExpress>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE;DEBUG;SAMPLESONLY</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE;SAMPLESONLY</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2.AuthorizationServer">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.AuthorizationServer.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.AuthorizationServer.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>

+    </Reference>

+    <Reference Include="log4net">

+      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.CSharp" />

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Data.Linq" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Web.DynamicData" />

+    <Reference Include="System.Web.Entity" />

+    <Reference Include="System.Web.ApplicationServices" />

+    <Reference Include="System.ComponentModel.DataAnnotations">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Core">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Data.DataSetExtensions">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />

+    <Reference Include="System.Xml.Linq">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Web" />

+    <Reference Include="System.Web.Extensions">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Web.Abstractions" />

+    <Reference Include="System.Web.Routing" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Web.Services" />

+    <Reference Include="System.EnterpriseServices" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Code\Client.cs" />

+    <Compile Include="Code\DatabaseKeyNonceStore.cs" />

+    <Compile Include="Code\DataClasses.designer.cs">

+      <DependentUpon>DataClasses.dbml</DependentUpon>

+      <DesignTime>True</DesignTime>

+      <AutoGen>True</AutoGen>

+    </Compile>

+    <Compile Include="Code\HttpHeaderAttribute.cs" />

+    <Compile Include="Code\OAuth2AuthorizationServer.cs" />

+    <Compile Include="Code\Utilities.cs" />

+    <Compile Include="Controllers\AccountController.cs" />

+    <Compile Include="Controllers\HomeController.cs" />

+    <Compile Include="Controllers\OAuthController.cs" />

+    <Compile Include="Global.asax.cs">

+      <DependentUpon>Global.asax</DependentUpon>

+    </Compile>

+    <Compile Include="Models\AccountAuthorizeModel.cs" />

+    <Compile Include="Models\AccountModels.cs" />

+    <Compile Include="Properties\AssemblyInfo.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="Global.asax" />

+    <Content Include="Views\Home\CreateDatabase.aspx" />

+    <Content Include="Views\OAuth\Authorize.aspx" />

+    <Content Include="Web.config" />

+    <Content Include="Web.Debug.config">

+      <DependentUpon>Web.config</DependentUpon>

+    </Content>

+    <Content Include="Web.Release.config">

+      <DependentUpon>Web.config</DependentUpon>

+    </Content>

+    <Content Include="Content\Site.css" />

+    <Content Include="Scripts\jquery-1.4.1.js" />

+    <Content Include="Scripts\jquery-1.4.1.min.js" />

+    <Content Include="Scripts\jquery-1.4.1-vsdoc.js" />

+    <Content Include="Scripts\jquery.validate.js" />

+    <Content Include="Scripts\jquery.validate.min.js" />

+    <Content Include="Scripts\jquery.validate-vsdoc.js" />

+    <Content Include="Scripts\MicrosoftAjax.js" />

+    <Content Include="Scripts\MicrosoftAjax.debug.js" />

+    <Content Include="Scripts\MicrosoftMvcAjax.js" />

+    <Content Include="Scripts\MicrosoftMvcAjax.debug.js" />

+    <Content Include="Scripts\MicrosoftMvcValidation.js" />

+    <Content Include="Scripts\MicrosoftMvcValidation.debug.js" />

+    <Content Include="Views\Account\LogOn.aspx" />

+    <Content Include="Views\Home\About.aspx" />

+    <Content Include="Views\Home\Index.aspx" />

+    <Content Include="Views\Shared\Error.aspx" />

+    <Content Include="Views\Shared\LogOnUserControl.ascx" />

+    <Content Include="Views\Shared\Site.Master" />

+    <Content Include="Views\Web.config" />

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="App_Data\" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="Code\DataClasses.dbml">

+      <Generator>MSLinqToSQLGenerator</Generator>

+      <LastGenOutput>DataClasses.designer.cs</LastGenOutput>

+      <SubType>Designer</SubType>

+    </None>

+    <Content Include="packages.config" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="Code\DataClasses.dbml.layout">

+      <DependentUpon>DataClasses.dbml</DependentUpon>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
-  </Target> -->
-  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>50172</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  </Target> -->

+  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">

+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />

+  </Target>

+  <ProjectExtensions>

+    <VisualStudio>

+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

+        <WebProjectProperties>

+          <UseIIS>False</UseIIS>

+          <AutoAssignPort>True</AutoAssignPort>

+          <DevelopmentServerPort>50172</DevelopmentServerPort>

+          <DevelopmentServerVPath>/</DevelopmentServerVPath>

+          <IISUrl>

+          </IISUrl>

+          <NTLMAuthentication>False</NTLMAuthentication>

+          <UseCustomServer>False</UseCustomServer>

+          <CustomServerUrl>

+          </CustomServerUrl>

+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>

+        </WebProjectProperties>

+      </FlavorProperties>

+    </VisualStudio>

+  </ProjectExtensions>

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OAuth/OAuthAuthorizationServer/Web.config b/src/OAuth/OAuthAuthorizationServer/Web.config
index 619ebc2..1d6955f 100644
--- a/src/OAuth/OAuthAuthorizationServer/Web.config
+++ b/src/OAuth/OAuthAuthorizationServer/Web.config
@@ -1,96 +1,110 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  For more information on how to configure your ASP.NET application, please visit
-  http://go.microsoft.com/fwlink/?LinkId=152368
-  -->
-<configuration>
-  <configSections>
-    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />
-    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
-      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
-      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-    </sectionGroup>
-  </configSections>
-  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-	     which is necessary for OpenID urls with unicode characters in the domain/host name. 
-	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-  <uri>
-    <idn enabled="All" />
-    <iriParsing enabled="true" />
-  </uri>
-  <system.net>
-    <defaultProxy enabled="true" />
-    <settings>
-      <!-- This setting causes .NET to check certificate revocation lists (CRL) 
-			     before trusting HTTPS certificates.  But this setting tends to not 
-			     be allowed in shared hosting environments. -->
-      <!--<servicePointManager checkCertificateRevocationList="true"/>-->
-    </settings>
-  </system.net>
-  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->
-  <dotNetOpenAuth>
-    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-    <reporting enabled="true" />
-    <!-- Relaxing SSL requirements is useful for simple samples, but NOT a good idea in production. -->
-    <messaging relaxSslRequirements="true">
-      <untrustedWebRequest>
-        <whitelistHosts>
-          <!-- since this is a sample, and will often be used with localhost -->
-          <add name="localhost" />
-        </whitelistHosts>
-      </untrustedWebRequest>
-    </messaging>
-    <openid></openid>
-  </dotNetOpenAuth>
-  <log4net>
-    <!-- Setup the root category, add the appenders and set the default level -->
-    <root>
-      <level value="INFO" />
-      <!--<appender-ref ref="RollingFileAppender" />-->
-      <appender-ref ref="TracePageAppender" />
-    </root>
-    <!-- Specify the level for some specific categories -->
-    <logger name="DotNetOpenAuth">
-      <level value="ALL" />
-    </logger>
-  </log4net>
-  <connectionStrings>
-    <add name="DatabaseConnectionString" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\Database2.mdf;Integrated Security=True;User Instance=True" providerName="System.Data.SqlClient" />
-  </connectionStrings>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </assemblies>
-    </compilation>
-    <authentication mode="Forms">
-      <forms loginUrl="~/Account/LogOn" timeout="2880" />
-    </authentication>
-    <pages>
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-      </namespaces>
-    </pages>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true" />
-  </system.webServer>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-    <legacyHMACWarning enabled="0" />
-  </runtime>
+<?xml version="1.0" encoding="utf-8"?>

+<!--

+  For more information on how to configure your ASP.NET application, please visit

+  http://go.microsoft.com/fwlink/?LinkId=152368

+  -->

+<configuration>

+  <configSections>

+    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />

+    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">

+      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />

+      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />

+      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+    </sectionGroup>

+  </configSections>

+  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+	     which is necessary for OpenID urls with unicode characters in the domain/host name. 

+	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+  <uri>

+    <idn enabled="All" />

+    <iriParsing enabled="true" />

+  </uri>

+  <system.net>

+    <defaultProxy enabled="true" />

+    <settings>

+      <!-- This setting causes .NET to check certificate revocation lists (CRL) 

+			     before trusting HTTPS certificates.  But this setting tends to not 

+			     be allowed in shared hosting environments. -->

+      <!--<servicePointManager checkCertificateRevocationList="true"/>-->

+    </settings>

+  </system.net>

+  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->

+  <dotNetOpenAuth>

+    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->

+    <reporting enabled="true" />

+    <!-- Relaxing SSL requirements is useful for simple samples, but NOT a good idea in production. -->

+    <messaging relaxSslRequirements="true">

+      <untrustedWebRequest>

+        <whitelistHosts>

+          <!-- since this is a sample, and will often be used with localhost -->

+          <add name="localhost" />

+        </whitelistHosts>

+      </untrustedWebRequest>

+    </messaging>

+    <openid>

+      <relyingParty>

+        <security requireSsl="false">

+          <!-- Uncomment the trustedProviders tag if your relying party should only accept positive assertions from a closed set of OpenID Providers. -->

+          <!--<trustedProviders rejectAssertionsFromUntrustedProviders="true">

+						<add endpoint="https://www.google.com/accounts/o8/ud" />

+					</trustedProviders>-->

+        </security>

+        <behaviors>

+          <!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible

+					     with OPs that use Attribute Exchange (in various formats). -->

+          <add type="DotNetOpenAuth.OpenId.RelyingParty.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.RelyingParty" />

+        </behaviors>

+      </relyingParty>

+    </openid>

+  </dotNetOpenAuth>

+  <log4net>

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

+    <root>

+      <level value="INFO" />

+      <!--<appender-ref ref="RollingFileAppender" />-->

+      <appender-ref ref="TracePageAppender" />

+    </root>

+    <!-- Specify the level for some specific categories -->

+    <logger name="DotNetOpenAuth">

+      <level value="ALL" />

+    </logger>

+  </log4net>

+  <connectionStrings>

+    <add name="DatabaseConnectionString" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\Database2.mdf;Integrated Security=True;User Instance=True" providerName="System.Data.SqlClient" />

+  </connectionStrings>

+  <system.web>

+    <compilation debug="true" targetFramework="4.0">

+      <assemblies>

+        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+      </assemblies>

+    </compilation>

+    <authentication mode="Forms">

+      <forms loginUrl="~/Account/LogOn" timeout="2880" />

+    </authentication>

+    <pages>

+      <namespaces>

+        <add namespace="System.Web.Mvc" />

+        <add namespace="System.Web.Mvc.Ajax" />

+        <add namespace="System.Web.Mvc.Html" />

+        <add namespace="System.Web.Routing" />

+      </namespaces>

+    </pages>

+  </system.web>

+  <system.webServer>

+    <validation validateIntegratedModeConfiguration="false" />

+    <modules runAllManagedModulesForAllRequests="true" />

+  </system.webServer>

+  <runtime>

+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

+      <dependentAssembly>

+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />

+        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />

+      </dependentAssembly>

+    </assemblyBinding>

+    <legacyHMACWarning enabled="0" />

+  </runtime>

 </configuration>
\ No newline at end of file
diff --git a/src/OAuth/OAuthAuthorizationServer/packages.config b/src/OAuth/OAuthAuthorizationServer/packages.config
index 6c9e19f..c5d87eb 100644
--- a/src/OAuth/OAuthAuthorizationServer/packages.config
+++ b/src/OAuth/OAuthAuthorizationServer/packages.config
@@ -1,10 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth2.AuthorizationServer" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.0-RC1" />
-  <package id="log4net" version="2.0.0" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth2.AuthorizationServer" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.AuthorizationServer" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.0.12084" />

+  <package id="log4net" version="2.0.0" />

 </packages>
\ No newline at end of file
diff --git a/src/OAuth/OAuthClient/OAuthClient.csproj b/src/OAuth/OAuthClient/OAuthClient.csproj
index c1890f3..63d2070 100644
--- a/src/OAuth/OAuthClient/OAuthClient.csproj
+++ b/src/OAuth/OAuthClient/OAuthClient.csproj
@@ -1,250 +1,250 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9529606E-AF76-4387-BFB7-3D10A5B399AA}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OAuthClient</RootNamespace>
-    <AssemblyName>OAuthClient</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SAMPLESONLY</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;SAMPLESONLY</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);SAMPLESONLY</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.OAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Common">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Consumer">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft\lib\net35-full\DotNetOpenAuth.OAuth2.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2.Client">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Client.0.23.0-draft\lib\net35-full\DotNetOpenAuth.OAuth2.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenIdOAuth">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net35-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Contracts">
-      <HintPath>..\..\..\packages\CodeContracts.Unofficial.1.0.0.2\lib\net35-client\Microsoft.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Default.aspx" />
-    <Content Include="Facebook.aspx" />
-    <Content Include="favicon.ico" />
-    <Content Include="Global.asax" />
-    <Content Include="GoogleAddressBook.aspx" />
-    <Content Include="GoogleApps2Legged.aspx" />
-    <Content Include="images\Sign-in-with-Twitter-darker.png" />
-    <Content Include="SampleWcf2Javascript.html" />
-    <Content Include="SampleWcf2Javascript.js" />
-    <Content Include="Scripts\jquery-1.6.1.js" />
-    <Content Include="Scripts\jquery-1.6.1.min.js" />
-    <Content Include="WindowsLive.aspx" />
-    <Content Include="Yammer.aspx" />
-    <Content Include="packages.config" />
-    <None Include="Service References\SampleResourceServer\DataApi.disco" />
-    <None Include="Service References\SampleResourceServer\configuration91.svcinfo" />
-    <None Include="Service References\SampleResourceServer\configuration.svcinfo" />
-    <None Include="Service References\SampleResourceServer\Reference.svcmap">
-      <Generator>WCF Proxy Generator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <Content Include="SampleWcf2.aspx" />
-    <Content Include="SignInWithTwitter.aspx" />
-    <Content Include="TracePage.aspx" />
-    <Content Include="Twitter.aspx" />
-    <Content Include="Web.config" />
-    <None Include="Service References\SampleResourceServer\DataApi1.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Service References\SampleResourceServer\DataApi2.xsd">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Facebook.aspx.cs">
-      <DependentUpon>Facebook.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Facebook.aspx.designer.cs">
-      <DependentUpon>Facebook.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="GoogleAddressBook.aspx.designer.cs">
-      <DependentUpon>GoogleAddressBook.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="SampleWcf2.aspx.cs">
-      <DependentUpon>SampleWcf2.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="GoogleApps2Legged.aspx.cs">
-      <DependentUpon>GoogleApps2Legged.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="GoogleApps2Legged.aspx.designer.cs">
-      <DependentUpon>GoogleApps2Legged.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="SampleWcf2.aspx.designer.cs">
-      <DependentUpon>SampleWcf2.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Service References\SampleResourceServer\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Compile>
-    <Compile Include="SignInWithTwitter.aspx.cs">
-      <DependentUpon>SignInWithTwitter.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="SignInWithTwitter.aspx.designer.cs">
-      <DependentUpon>SignInWithTwitter.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="TracePage.aspx.cs">
-      <DependentUpon>TracePage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TracePage.aspx.designer.cs">
-      <DependentUpon>TracePage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Twitter.aspx.cs">
-      <DependentUpon>Twitter.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Code\Logging.cs" />
-    <Compile Include="Code\TracePageAppender.cs" />
-    <Compile Include="GoogleAddressBook.aspx.cs">
-      <DependentUpon>GoogleAddressBook.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Twitter.aspx.designer.cs">
-      <DependentUpon>Twitter.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="WindowsLive.aspx.cs">
-      <DependentUpon>WindowsLive.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WindowsLive.aspx.designer.cs">
-      <DependentUpon>WindowsLive.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Yammer.aspx.cs">
-      <DependentUpon>Yammer.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Yammer.aspx.designer.cs">
-      <DependentUpon>Yammer.aspx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="MasterPage.master" />
-    <None Include="Service References\SampleResourceServer\DataApi.wsdl" />
-    <None Include="Service References\SampleResourceServer\DataApi.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Settings.StyleCop" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">
-      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>
-      <Name>DotNetOpenAuth.ApplicationBlock</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadataStorage Include="Service References\SampleResourceServer\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>59721</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>

+    </ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{9529606E-AF76-4387-BFB7-3D10A5B399AA}</ProjectGuid>

+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>OAuthClient</RootNamespace>

+    <AssemblyName>OAuthClient</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <TargetFrameworkProfile />

+    <UseIISExpress>false</UseIISExpress>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE;DEBUG;SAMPLESONLY</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE;SAMPLESONLY</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup>

+    <DefineConstants>$(DefineConstants);SAMPLESONLY</DefineConstants>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Common">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Consumer">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2.Client">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Client.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.Client.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenIdOAuth, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>

+    </Reference>

+    <Reference Include="log4net">

+      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net35-full\log4net.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Contracts">

+      <HintPath>..\..\..\packages\CodeContracts.Unofficial.1.0.0.2\lib\net35-client\Microsoft.Contracts.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Data.DataSetExtensions" />

+    <Reference Include="System.Runtime.Serialization" />

+    <Reference Include="System.ServiceModel" />

+    <Reference Include="System.Web.Abstractions" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Web" />

+    <Reference Include="System.Web.ApplicationServices" />

+    <Reference Include="System.Web.Extensions" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Web.Services" />

+    <Reference Include="System.EnterpriseServices" />

+    <Reference Include="System.Web.DynamicData" />

+    <Reference Include="System.Web.Entity" />

+    <Reference Include="System.Xml.Linq" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="Default.aspx" />

+    <Content Include="Facebook.aspx" />

+    <Content Include="favicon.ico" />

+    <Content Include="Global.asax" />

+    <Content Include="GoogleAddressBook.aspx" />

+    <Content Include="GoogleApps2Legged.aspx" />

+    <Content Include="images\Sign-in-with-Twitter-darker.png" />

+    <Content Include="SampleWcf2Javascript.html" />

+    <Content Include="SampleWcf2Javascript.js" />

+    <Content Include="Scripts\jquery-1.6.1.js" />

+    <Content Include="Scripts\jquery-1.6.1.min.js" />

+    <Content Include="WindowsLive.aspx" />

+    <Content Include="Yammer.aspx" />

+    <Content Include="packages.config" />

+    <None Include="Service References\SampleResourceServer\DataApi.disco" />

+    <None Include="Service References\SampleResourceServer\configuration91.svcinfo" />

+    <None Include="Service References\SampleResourceServer\configuration.svcinfo" />

+    <None Include="Service References\SampleResourceServer\Reference.svcmap">

+      <Generator>WCF Proxy Generator</Generator>

+      <LastGenOutput>Reference.cs</LastGenOutput>

+    </None>

+    <Content Include="SampleWcf2.aspx" />

+    <Content Include="SignInWithTwitter.aspx" />

+    <Content Include="TracePage.aspx" />

+    <Content Include="Twitter.aspx" />

+    <Content Include="Web.config" />

+    <None Include="Service References\SampleResourceServer\DataApi1.xsd">

+      <SubType>Designer</SubType>

+    </None>

+    <None Include="Service References\SampleResourceServer\DataApi2.xsd">

+      <SubType>Designer</SubType>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Facebook.aspx.cs">

+      <DependentUpon>Facebook.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Facebook.aspx.designer.cs">

+      <DependentUpon>Facebook.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Global.asax.cs">

+      <DependentUpon>Global.asax</DependentUpon>

+    </Compile>

+    <Compile Include="GoogleAddressBook.aspx.designer.cs">

+      <DependentUpon>GoogleAddressBook.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="SampleWcf2.aspx.cs">

+      <DependentUpon>SampleWcf2.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="GoogleApps2Legged.aspx.cs">

+      <DependentUpon>GoogleApps2Legged.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="GoogleApps2Legged.aspx.designer.cs">

+      <DependentUpon>GoogleApps2Legged.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="SampleWcf2.aspx.designer.cs">

+      <DependentUpon>SampleWcf2.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Service References\SampleResourceServer\Reference.cs">

+      <AutoGen>True</AutoGen>

+      <DesignTime>True</DesignTime>

+      <DependentUpon>Reference.svcmap</DependentUpon>

+    </Compile>

+    <Compile Include="SignInWithTwitter.aspx.cs">

+      <DependentUpon>SignInWithTwitter.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="SignInWithTwitter.aspx.designer.cs">

+      <DependentUpon>SignInWithTwitter.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="TracePage.aspx.cs">

+      <DependentUpon>TracePage.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="TracePage.aspx.designer.cs">

+      <DependentUpon>TracePage.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Twitter.aspx.cs">

+      <DependentUpon>Twitter.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Code\Logging.cs" />

+    <Compile Include="Code\TracePageAppender.cs" />

+    <Compile Include="GoogleAddressBook.aspx.cs">

+      <DependentUpon>GoogleAddressBook.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="Twitter.aspx.designer.cs">

+      <DependentUpon>Twitter.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="WindowsLive.aspx.cs">

+      <DependentUpon>WindowsLive.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="WindowsLive.aspx.designer.cs">

+      <DependentUpon>WindowsLive.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Yammer.aspx.cs">

+      <DependentUpon>Yammer.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Yammer.aspx.designer.cs">

+      <DependentUpon>Yammer.aspx</DependentUpon>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="App_Data\" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="MasterPage.master" />

+    <None Include="Service References\SampleResourceServer\DataApi.wsdl" />

+    <None Include="Service References\SampleResourceServer\DataApi.xsd">

+      <SubType>Designer</SubType>

+    </None>

+    <None Include="Settings.StyleCop" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">

+      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>

+      <Name>DotNetOpenAuth.ApplicationBlock</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <WCFMetadata Include="Service References\" />

+  </ItemGroup>

+  <ItemGroup>

+    <WCFMetadataStorage Include="Service References\SampleResourceServer\" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

+  <ProjectExtensions>

+    <VisualStudio>

+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

+        <WebProjectProperties>

+          <UseIIS>False</UseIIS>

+          <AutoAssignPort>False</AutoAssignPort>

+          <DevelopmentServerPort>59721</DevelopmentServerPort>

+          <DevelopmentServerVPath>/</DevelopmentServerVPath>

+          <IISUrl>

+          </IISUrl>

+          <NTLMAuthentication>False</NTLMAuthentication>

+          <UseCustomServer>False</UseCustomServer>

+          <CustomServerUrl>

+          </CustomServerUrl>

+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>

+        </WebProjectProperties>

+      </FlavorProperties>

+    </VisualStudio>

+  </ProjectExtensions>

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OAuth/OAuthClient/Web.config b/src/OAuth/OAuthClient/Web.config
index e6e466e..0e5ed14 100644
--- a/src/OAuth/OAuthClient/Web.config
+++ b/src/OAuth/OAuthClient/Web.config
@@ -1,141 +1,141 @@
-<?xml version="1.0"?>
-<configuration>
-  <configSections>
-    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false"/>
-    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true"/>
-      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true"/>
-      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true"/>
-      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true"/>
-    </sectionGroup>
-  </configSections>
-  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-       which is necessary for OpenID urls with unicode characters in the domain/host name. 
-       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-  <uri>
-    <idn enabled="All"/>
-    <iriParsing enabled="true"/>
-  </uri>
-  <system.net>
-    <defaultProxy enabled="true"/>
-    <settings>
-      <!-- This setting causes .NET to check certificate revocation lists (CRL) 
-           before trusting HTTPS certificates.  But this setting tends to not 
-           be allowed in shared hosting environments. -->
-      <!--<servicePointManager checkCertificateRevocationList="true"/>-->
-    </settings>
-  </system.net>
-  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->
-  <dotNetOpenAuth>
-    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-    <reporting enabled="true"/>
-    <!-- Relaxing SSL requirements is useful for simple samples, but NOT a good idea in production. -->
-    <messaging relaxSslRequirements="true">
-      <untrustedWebRequest>
-        <whitelistHosts>
-          <!-- Uncomment to enable communication with localhost (should generally not activate in production!) -->
-          <!--<add name="localhost" />-->
-        </whitelistHosts>
-      </untrustedWebRequest>
-    </messaging>
-    <openid/>
-  </dotNetOpenAuth>
-  <appSettings>
-    <!-- Fill in your various consumer keys and secrets here to make the sample work. -->
-    <!-- You must get these values by signing up with each individual service provider. -->
-    <!-- Twitter sign-up: https://twitter.com/oauth_clients -->
-    <add key="twitterConsumerKey" value="eRJd2AMcOnGqDOtF3IrBQ"/>
-    <add key="twitterConsumerSecret" value="iTijQWFOSDokpkVIPnlLbdmf3wPZgUVqktXKASg0QjM"/>
-    <!-- Google sign-up: https://www.google.com/accounts/ManageDomains -->
-    <add key="googleConsumerKey" value="anonymous"/>
-    <add key="googleConsumerSecret" value="anonymous"/>
-    <!-- Yammer sign-up: https://www.yammer.com/client_applications/new -->
-    <add key="yammerConsumerKey" value=""/>
-    <add key="yammerConsumerSecret" value=""/>
-    <!-- Facebook sign-up: http://developers.facebook.com/setup/ -->
-    <add key="facebookAppID" value="367207604173"/>
-    <add key="facebookAppSecret" value="1df77e64055c4d7d3583cefdf2bc62d7"/>
-    <!-- Windows Live sign-up: http://go.microsoft.com/fwlink/p/?LinkId=193157 -->
-    <add key="windowsLiveAppID" value="000000004408E558"/>
-    <add key="windowsLiveAppSecret" value="od8NVdanEIWqmlKu9hOepBE3AfUu4jCw"/>
-  </appSettings>
-  <connectionStrings/>
-  <system.web>
-    <!-- 
-            Set compilation debug="true" to insert debugging 
-            symbols into the compiled page. Because this 
-            affects performance, set this value to true only 
-            during development.
-        -->
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <remove assembly="DotNetOpenAuth.Contracts"/>
-      </assemblies>
-    </compilation>
-    <!--
-            The <authentication> section enables configuration 
-            of the security authentication mode used by 
-            ASP.NET to identify an incoming user. 
-        -->
-    <authentication mode="Windows"/>
-    <!--
-            The <customErrors> section enables configuration 
-            of what to do if/when an unhandled error occurs 
-            during the execution of a request. Specifically, 
-            it enables developers to configure html error pages 
-            to be displayed in place of a error stack trace.
-
-        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
-            <error statusCode="403" redirect="NoAccess.htm" />
-            <error statusCode="404" redirect="FileNotFound.htm" />
-        </customErrors>
-        -->
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
-  </system.web>
-  <!-- 
-        The system.webServer section is required for running ASP.NET AJAX under Internet
-        Information Services 7.0.  It is not necessary for previous version of IIS.
-    -->
-  <runtime>
-    <legacyHMACWarning enabled="0"/>
-  </runtime>
-  <log4net>
-    <appender name="TracePageAppender" type="OAuthClient.TracePageAppender, OAuthClient">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline"/>
-      </layout>
-    </appender>
-    <!-- Setup the root category, add the appenders and set the default level -->
-    <root>
-      <level value="INFO"/>
-      <!--<appender-ref ref="RollingFileAppender" />-->
-      <appender-ref ref="TracePageAppender"/>
-    </root>
-    <!-- Specify the level for some specific categories -->
-    <logger name="DotNetOpenAuth">
-      <level value="ALL"/>
-    </logger>
-  </log4net>
-  <system.serviceModel>
-    <bindings>
-      <wsHttpBinding>
-        <binding name="WSHttpBinding_IDataApi" 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=""/>
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default"/>
-          </security>
-        </binding>
-      </wsHttpBinding>
-    </bindings>
-    <client>
-      <endpoint address="http://localhost:65169/DataApi.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IDataApi" contract="SampleResourceServer.IDataApi" name="WSHttpBinding_IDataApi">
-        <identity>
-          <dns value="localhost"/>
-        </identity>
-      </endpoint>
-    </client>
-  </system.serviceModel>
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <configSections>

+    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />

+    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">

+      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />

+      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />

+      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+    </sectionGroup>

+  </configSections>

+  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+       which is necessary for OpenID urls with unicode characters in the domain/host name. 

+       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+  <uri>

+    <idn enabled="All" />

+    <iriParsing enabled="true" />

+  </uri>

+  <system.net>

+    <defaultProxy enabled="true" />

+    <settings>

+      <!-- This setting causes .NET to check certificate revocation lists (CRL) 

+           before trusting HTTPS certificates.  But this setting tends to not 

+           be allowed in shared hosting environments. -->

+      <!--<servicePointManager checkCertificateRevocationList="true"/>-->

+    </settings>

+  </system.net>

+  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->

+  <dotNetOpenAuth>

+    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->

+    <reporting enabled="true" />

+    <!-- Relaxing SSL requirements is useful for simple samples, but NOT a good idea in production. -->

+    <messaging relaxSslRequirements="true">

+      <untrustedWebRequest>

+        <whitelistHosts>

+          <!-- Uncomment to enable communication with localhost (should generally not activate in production!) -->

+          <!--<add name="localhost" />-->

+        </whitelistHosts>

+      </untrustedWebRequest>

+    </messaging>

+    <openid />

+  </dotNetOpenAuth>

+  <appSettings>

+    <!-- Fill in your various consumer keys and secrets here to make the sample work. -->

+    <!-- You must get these values by signing up with each individual service provider. -->

+    <!-- Twitter sign-up: https://twitter.com/oauth_clients -->

+    <add key="twitterConsumerKey" value="eRJd2AMcOnGqDOtF3IrBQ" />

+    <add key="twitterConsumerSecret" value="iTijQWFOSDokpkVIPnlLbdmf3wPZgUVqktXKASg0QjM" />

+    <!-- Google sign-up: https://www.google.com/accounts/ManageDomains -->

+    <add key="googleConsumerKey" value="anonymous" />

+    <add key="googleConsumerSecret" value="anonymous" />

+    <!-- Yammer sign-up: https://www.yammer.com/client_applications/new -->

+    <add key="yammerConsumerKey" value="" />

+    <add key="yammerConsumerSecret" value="" />

+    <!-- Facebook sign-up: http://developers.facebook.com/setup/ -->

+    <add key="facebookAppID" value="367207604173" />

+    <add key="facebookAppSecret" value="1df77e64055c4d7d3583cefdf2bc62d7" />

+    <!-- Windows Live sign-up: http://go.microsoft.com/fwlink/p/?LinkId=193157 -->

+    <add key="windowsLiveAppID" value="000000004408E558" />

+    <add key="windowsLiveAppSecret" value="od8NVdanEIWqmlKu9hOepBE3AfUu4jCw" />

+  </appSettings>

+  <connectionStrings />

+  <system.web>

+    <!-- 

+            Set compilation debug="true" to insert debugging 

+            symbols into the compiled page. Because this 

+            affects performance, set this value to true only 

+            during development.

+        -->

+    <compilation debug="true" targetFramework="4.0">

+      <assemblies>

+        <remove assembly="DotNetOpenAuth.Contracts" />

+      </assemblies>

+    </compilation>

+    <!--

+            The <authentication> section enables configuration 

+            of the security authentication mode used by 

+            ASP.NET to identify an incoming user. 

+        -->

+    <authentication mode="Windows" />

+    <!--

+            The <customErrors> section enables configuration 

+            of what to do if/when an unhandled error occurs 

+            during the execution of a request. Specifically, 

+            it enables developers to configure html error pages 

+            to be displayed in place of a error stack trace.

+

+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">

+            <error statusCode="403" redirect="NoAccess.htm" />

+            <error statusCode="404" redirect="FileNotFound.htm" />

+        </customErrors>

+        -->

+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />

+  </system.web>

+  <!-- 

+        The system.webServer section is required for running ASP.NET AJAX under Internet

+        Information Services 7.0.  It is not necessary for previous version of IIS.

+    -->

+  <runtime>

+    <legacyHMACWarning enabled="0" />

+  </runtime>

+  <log4net>

+    <appender name="TracePageAppender" type="OAuthClient.TracePageAppender, OAuthClient">

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

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

+      </layout>

+    </appender>

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

+    <root>

+      <level value="INFO" />

+      <!--<appender-ref ref="RollingFileAppender" />-->

+      <appender-ref ref="TracePageAppender" />

+    </root>

+    <!-- Specify the level for some specific categories -->

+    <logger name="DotNetOpenAuth">

+      <level value="ALL" />

+    </logger>

+  </log4net>

+  <system.serviceModel>

+    <bindings>

+      <wsHttpBinding>

+        <binding name="WSHttpBinding_IDataApi" 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="" />

+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" />

+          </security>

+        </binding>

+      </wsHttpBinding>

+    </bindings>

+    <client>

+      <endpoint address="http://localhost:65169/DataApi.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IDataApi" contract="SampleResourceServer.IDataApi" name="WSHttpBinding_IDataApi">

+        <identity>

+          <dns value="localhost" />

+        </identity>

+      </endpoint>

+    </client>

+  </system.serviceModel>

 </configuration>
\ No newline at end of file
diff --git a/src/OAuth/OAuthClient/packages.config b/src/OAuth/OAuthClient/packages.config
index 01cb536..7704415 100644
--- a/src/OAuth/OAuthClient/packages.config
+++ b/src/OAuth/OAuthClient/packages.config
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0-RC1" />
-  <package id="log4net" version="2.0.0" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0.12084" />

+  <package id="log4net" version="2.0.0" />

 </packages>
\ No newline at end of file
diff --git a/src/OAuth/OAuthConsumer/OAuthConsumer.csproj b/src/OAuth/OAuthConsumer/OAuthConsumer.csproj
index 705b797..2e362f2 100644
--- a/src/OAuth/OAuthConsumer/OAuthConsumer.csproj
+++ b/src/OAuth/OAuthConsumer/OAuthConsumer.csproj
@@ -1,220 +1,220 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OAuthConsumer</RootNamespace>
-    <AssemblyName>OAuthConsumer</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);SAMPLESONLY</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Common">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Consumer">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenIdOAuth">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Default.aspx" />
-    <Content Include="favicon.ico" />
-    <Content Include="Global.asax" />
-    <Content Include="GoogleAddressBook.aspx" />
-    <Content Include="GoogleApps2Legged.aspx" />
-    <Content Include="images\Sign-in-with-Twitter-darker.png" />
-    <Content Include="SampleWcf.aspx" />
-    <Content Include="Yammer.aspx" />
-    <Content Include="packages.config" />
-    <None Include="Service References\SampleServiceProvider\DataApi.disco" />
-    <None Include="Service References\SampleServiceProvider\configuration91.svcinfo" />
-    <None Include="Service References\SampleServiceProvider\configuration.svcinfo" />
-    <None Include="Service References\SampleServiceProvider\Reference.svcmap">
-      <Generator>WCF Proxy Generator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <Content Include="SignInWithTwitter.aspx" />
-    <Content Include="TracePage.aspx" />
-    <Content Include="Twitter.aspx" />
-    <Content Include="Web.config" />
-    <None Include="Service References\SampleServiceProvider\DataApi1.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Service References\SampleServiceProvider\DataApi2.xsd">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="GoogleAddressBook.aspx.designer.cs">
-      <DependentUpon>GoogleAddressBook.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="GoogleApps2Legged.aspx.cs">
-      <DependentUpon>GoogleApps2Legged.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="GoogleApps2Legged.aspx.designer.cs">
-      <DependentUpon>GoogleApps2Legged.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="SampleWcf.aspx.cs">
-      <DependentUpon>SampleWcf.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="SampleWcf.aspx.designer.cs">
-      <DependentUpon>SampleWcf.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Service References\SampleServiceProvider\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Compile>
-    <Compile Include="SignInWithTwitter.aspx.cs">
-      <DependentUpon>SignInWithTwitter.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="SignInWithTwitter.aspx.designer.cs">
-      <DependentUpon>SignInWithTwitter.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="TracePage.aspx.cs">
-      <DependentUpon>TracePage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TracePage.aspx.designer.cs">
-      <DependentUpon>TracePage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Twitter.aspx.cs">
-      <DependentUpon>Twitter.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Code\Logging.cs" />
-    <Compile Include="Code\TracePageAppender.cs" />
-    <Compile Include="GoogleAddressBook.aspx.cs">
-      <DependentUpon>GoogleAddressBook.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Twitter.aspx.designer.cs">
-      <DependentUpon>Twitter.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Yammer.aspx.cs">
-      <DependentUpon>Yammer.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Yammer.aspx.designer.cs">
-      <DependentUpon>Yammer.aspx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="MasterPage.master" />
-    <None Include="Service References\SampleServiceProvider\DataApi.wsdl" />
-    <None Include="Service References\SampleServiceProvider\DataApi.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Settings.StyleCop" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">
-      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>
-      <Name>DotNetOpenAuth.ApplicationBlock</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadataStorage Include="Service References\SampleServiceProvider\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>59721</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>

+    </ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D}</ProjectGuid>

+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>OAuthConsumer</RootNamespace>

+    <AssemblyName>OAuthConsumer</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <TargetFrameworkProfile />

+    <UseIISExpress>false</UseIISExpress>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE;DEBUG</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup>

+    <DefineConstants>$(DefineConstants);SAMPLESONLY</DefineConstants>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Consumer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenIdOAuth, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>

+    </Reference>

+    <Reference Include="log4net">

+      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Data.DataSetExtensions" />

+    <Reference Include="System.Runtime.Serialization" />

+    <Reference Include="System.ServiceModel" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Web" />

+    <Reference Include="System.Web.ApplicationServices" />

+    <Reference Include="System.Web.Extensions" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Web.Services" />

+    <Reference Include="System.EnterpriseServices" />

+    <Reference Include="System.Web.DynamicData" />

+    <Reference Include="System.Web.Entity" />

+    <Reference Include="System.Xml.Linq" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="Default.aspx" />

+    <Content Include="favicon.ico" />

+    <Content Include="Global.asax" />

+    <Content Include="GoogleAddressBook.aspx" />

+    <Content Include="GoogleApps2Legged.aspx" />

+    <Content Include="images\Sign-in-with-Twitter-darker.png" />

+    <Content Include="SampleWcf.aspx" />

+    <Content Include="Yammer.aspx" />

+    <Content Include="packages.config" />

+    <None Include="Service References\SampleServiceProvider\DataApi.disco" />

+    <None Include="Service References\SampleServiceProvider\configuration91.svcinfo" />

+    <None Include="Service References\SampleServiceProvider\configuration.svcinfo" />

+    <None Include="Service References\SampleServiceProvider\Reference.svcmap">

+      <Generator>WCF Proxy Generator</Generator>

+      <LastGenOutput>Reference.cs</LastGenOutput>

+    </None>

+    <Content Include="SignInWithTwitter.aspx" />

+    <Content Include="TracePage.aspx" />

+    <Content Include="Twitter.aspx" />

+    <Content Include="Web.config" />

+    <None Include="Service References\SampleServiceProvider\DataApi1.xsd">

+      <SubType>Designer</SubType>

+    </None>

+    <None Include="Service References\SampleServiceProvider\DataApi2.xsd">

+      <SubType>Designer</SubType>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Global.asax.cs">

+      <DependentUpon>Global.asax</DependentUpon>

+    </Compile>

+    <Compile Include="GoogleAddressBook.aspx.designer.cs">

+      <DependentUpon>GoogleAddressBook.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="GoogleApps2Legged.aspx.cs">

+      <DependentUpon>GoogleApps2Legged.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="GoogleApps2Legged.aspx.designer.cs">

+      <DependentUpon>GoogleApps2Legged.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="SampleWcf.aspx.cs">

+      <DependentUpon>SampleWcf.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="SampleWcf.aspx.designer.cs">

+      <DependentUpon>SampleWcf.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Service References\SampleServiceProvider\Reference.cs">

+      <AutoGen>True</AutoGen>

+      <DesignTime>True</DesignTime>

+      <DependentUpon>Reference.svcmap</DependentUpon>

+    </Compile>

+    <Compile Include="SignInWithTwitter.aspx.cs">

+      <DependentUpon>SignInWithTwitter.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="SignInWithTwitter.aspx.designer.cs">

+      <DependentUpon>SignInWithTwitter.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="TracePage.aspx.cs">

+      <DependentUpon>TracePage.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="TracePage.aspx.designer.cs">

+      <DependentUpon>TracePage.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Twitter.aspx.cs">

+      <DependentUpon>Twitter.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Code\Logging.cs" />

+    <Compile Include="Code\TracePageAppender.cs" />

+    <Compile Include="GoogleAddressBook.aspx.cs">

+      <DependentUpon>GoogleAddressBook.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="Twitter.aspx.designer.cs">

+      <DependentUpon>Twitter.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Yammer.aspx.cs">

+      <DependentUpon>Yammer.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Yammer.aspx.designer.cs">

+      <DependentUpon>Yammer.aspx</DependentUpon>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="App_Data\" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="MasterPage.master" />

+    <None Include="Service References\SampleServiceProvider\DataApi.wsdl" />

+    <None Include="Service References\SampleServiceProvider\DataApi.xsd">

+      <SubType>Designer</SubType>

+    </None>

+    <None Include="Settings.StyleCop" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">

+      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>

+      <Name>DotNetOpenAuth.ApplicationBlock</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <WCFMetadata Include="Service References\" />

+  </ItemGroup>

+  <ItemGroup>

+    <WCFMetadataStorage Include="Service References\SampleServiceProvider\" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

+  <ProjectExtensions>

+    <VisualStudio>

+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

+        <WebProjectProperties>

+          <UseIIS>False</UseIIS>

+          <AutoAssignPort>False</AutoAssignPort>

+          <DevelopmentServerPort>59721</DevelopmentServerPort>

+          <DevelopmentServerVPath>/</DevelopmentServerVPath>

+          <IISUrl>

+          </IISUrl>

+          <NTLMAuthentication>False</NTLMAuthentication>

+          <UseCustomServer>False</UseCustomServer>

+          <CustomServerUrl>

+          </CustomServerUrl>

+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>

+        </WebProjectProperties>

+      </FlavorProperties>

+    </VisualStudio>

+  </ProjectExtensions>

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OAuth/OAuthConsumer/Web.config b/src/OAuth/OAuthConsumer/Web.config
index 52b20b8..3963433 100644
--- a/src/OAuth/OAuthConsumer/Web.config
+++ b/src/OAuth/OAuthConsumer/Web.config
@@ -1,141 +1,140 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />
-    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
-      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
-    </sectionGroup>
-  </configSections>
-  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-       which is necessary for OpenID urls with unicode characters in the domain/host name. 
-       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-  <uri>
-    <idn enabled="All" />
-    <iriParsing enabled="true" />
-  </uri>
-  <system.net>
-    <defaultProxy enabled="true" />
-    <settings>
-      <!-- This setting causes .NET to check certificate revocation lists (CRL) 
-           before trusting HTTPS certificates.  But this setting tends to not 
-           be allowed in shared hosting environments. -->
-      <!--<servicePointManager checkCertificateRevocationList="true"/>-->
-    </settings>
-  </system.net>
-  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->
-  <dotNetOpenAuth>
-    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-    <reporting enabled="true" />
-    <messaging>
-      <untrustedWebRequest>
-        <whitelistHosts>
-          <!-- Uncomment to enable communication with localhost (should generally not activate in production!) -->
-          <!--<add name="localhost" />-->
-        </whitelistHosts>
-      </untrustedWebRequest>
-    </messaging>
-    <openid></openid>
-  </dotNetOpenAuth>
-  <appSettings>
-    <!-- Fill in your various consumer keys and secrets here to make the sample work. -->
-    <!-- You must get these values by signing up with each individual service provider. -->
-    <!-- Twitter sign-up: https://twitter.com/oauth_clients -->
-    <add key="twitterConsumerKey" value="" />
-    <add key="twitterConsumerSecret" value="" />
-    <!-- Google sign-up: https://www.google.com/accounts/ManageDomains -->
-    <add key="googleConsumerKey" value="anonymous" />
-    <add key="googleConsumerSecret" value="anonymous" />
-    <!-- Yammer sign-up: https://www.yammer.com/client_applications/new -->
-    <add key="yammerConsumerKey" value="" />
-    <add key="yammerConsumerSecret" value="" />
-  </appSettings>
-  <connectionStrings />
-  <system.web>
-    <!-- 
-            Set compilation debug="true" to insert debugging 
-            symbols into the compiled page. Because this 
-            affects performance, set this value to true only 
-            during development.
-        -->
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <remove assembly="DotNetOpenAuth.Contracts" />
-      </assemblies>
-    </compilation>
-    <!--
-            The <authentication> section enables configuration 
-            of the security authentication mode used by 
-            ASP.NET to identify an incoming user. 
-        -->
-    <authentication mode="Windows" />
-    <!--
-            The <customErrors> section enables configuration 
-            of what to do if/when an unhandled error occurs 
-            during the execution of a request. Specifically, 
-            it enables developers to configure html error pages 
-            to be displayed in place of a error stack trace.
-
-        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
-            <error statusCode="403" redirect="NoAccess.htm" />
-            <error statusCode="404" redirect="FileNotFound.htm" />
-        </customErrors>
-        -->
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />
-  </system.web>
-  <!-- 
-        The system.webServer section is required for running ASP.NET AJAX under Internet
-        Information Services 7.0.  It is not necessary for previous version of IIS.
-    -->
-  <log4net>
-    <appender name="TracePageAppender" type="OAuthConsumer.TracePageAppender, OAuthConsumer">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />
-      </layout>
-    </appender>
-    <!-- Setup the root category, add the appenders and set the default level -->
-    <root>
-      <level value="INFO" />
-      <!--<appender-ref ref="RollingFileAppender" />-->
-      <appender-ref ref="TracePageAppender" />
-    </root>
-    <!-- Specify the level for some specific categories -->
-    <logger name="DotNetOpenAuth">
-      <level value="ALL" />
-    </logger>
-  </log4net>
-  <system.serviceModel>
-    <bindings>
-      <wsHttpBinding>
-        <binding name="WSHttpBinding_IDataApi" 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="" />
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" establishSecurityContext="true" />
-          </security>
-        </binding>
-      </wsHttpBinding>
-    </bindings>
-    <client>
-      <endpoint address="http://localhost:65169/DataApi.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IDataApi" contract="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi">
-        <identity>
-          <dns value="localhost" />
-        </identity>
-      </endpoint>
-    </client>
-  </system.serviceModel>
-  <runtime>
-    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->
-    <legacyHMACWarning enabled="0" />
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <configSections>

+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />

+    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">

+      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />

+      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />

+    </sectionGroup>

+  </configSections>

+  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+       which is necessary for OpenID urls with unicode characters in the domain/host name. 

+       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->

+  <appSettings>

+    <!-- Fill in your various consumer keys and secrets here to make the sample work. -->

+    <!-- You must get these values by signing up with each individual service provider. -->

+    <!-- Twitter sign-up: https://twitter.com/oauth_clients -->

+    <add key="twitterConsumerKey" value="" />

+    <add key="twitterConsumerSecret" value="" />

+    <!-- Google sign-up: https://www.google.com/accounts/ManageDomains -->

+    <add key="googleConsumerKey" value="anonymous" />

+    <add key="googleConsumerSecret" value="anonymous" />

+    <!-- Yammer sign-up: https://www.yammer.com/client_applications/new -->

+    <add key="yammerConsumerKey" value="" />

+    <add key="yammerConsumerSecret" value="" />

+  </appSettings>

+  <connectionStrings />

+  <system.web>

+    <!-- 

+            Set compilation debug="true" to insert debugging 

+            symbols into the compiled page. Because this 

+            affects performance, set this value to true only 

+            during development.

+        -->

+    <compilation debug="true" targetFramework="4.0">

+      <assemblies>

+        <remove assembly="DotNetOpenAuth.Contracts" />

+      </assemblies>

+    </compilation>

+    <!--

+            The <authentication> section enables configuration 

+            of the security authentication mode used by 

+            ASP.NET to identify an incoming user. 

+        -->

+    <authentication mode="Windows" />

+    <!--

+            The <customErrors> section enables configuration 

+            of what to do if/when an unhandled error occurs 

+            during the execution of a request. Specifically, 

+            it enables developers to configure html error pages 

+            to be displayed in place of a error stack trace.

+

+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">

+            <error statusCode="403" redirect="NoAccess.htm" />

+            <error statusCode="404" redirect="FileNotFound.htm" />

+        </customErrors>

+        -->

+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />

+  </system.web>

+  <!-- 

+        The system.webServer section is required for running ASP.NET AJAX under Internet

+        Information Services 7.0.  It is not necessary for previous version of IIS.

+    -->

+  <log4net>

+    <appender name="TracePageAppender" type="OAuthConsumer.TracePageAppender, OAuthConsumer">

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

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

+      </layout>

+    </appender>

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

+    <root>

+      <level value="INFO" />

+      <!--<appender-ref ref="RollingFileAppender" />-->

+      <appender-ref ref="TracePageAppender" />

+    </root>

+    <!-- Specify the level for some specific categories -->

+    <logger name="DotNetOpenAuth">

+      <level value="ALL" />

+    </logger>

+  </log4net>

+  <system.serviceModel>

+    <bindings>

+      <wsHttpBinding>

+        <binding name="WSHttpBinding_IDataApi" 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="" />

+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" establishSecurityContext="true" />

+          </security>

+        </binding>

+      </wsHttpBinding>

+    </bindings>

+    <client>

+      <endpoint address="http://localhost:65169/DataApi.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IDataApi" contract="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi">

+        <identity>

+          <dns value="localhost" />

+        </identity>

+      </endpoint>

+    </client>

+  </system.serviceModel>

+  <system.net>

+    <defaultProxy enabled="true" />

+    <settings>

+      <!-- This setting causes .NET to check certificate revocation lists (CRL) 

+			     before trusting HTTPS certificates.  But this setting tends to not 

+			     be allowed in shared hosting environments. -->

+      <!--<servicePointManager checkCertificateRevocationList="true"/>-->

+    </settings>

+  </system.net>

+  <runtime>

+    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->

+    <legacyHMACWarning enabled="0" />

+  </runtime>

+  <dotNetOpenAuth>

+    <messaging>

+      <untrustedWebRequest>

+        <whitelistHosts>

+          <!-- Uncomment to enable communication with localhost (should generally not activate in production!) -->

+          <!--<add name="localhost" />-->

+        </whitelistHosts>

+      </untrustedWebRequest>

+    </messaging>

+    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->

+    <reporting enabled="true" />

+    <openid></openid>

+  </dotNetOpenAuth>

+  <uri>

+    <!-- See an error due to this section?  When targeting .NET 3.5, please add the following line to your <configSections> at the top of this file:

+		<section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+		-->

+    <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+	     which is necessary for OpenID urls with unicode characters in the domain/host name. 

+	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+    <idn enabled="All" />

+    <iriParsing enabled="true" />

+  </uri>

 </configuration>
\ No newline at end of file
diff --git a/src/OAuth/OAuthConsumer/packages.config b/src/OAuth/OAuthConsumer/packages.config
index 85688d9..56ae497 100644
--- a/src/OAuth/OAuthConsumer/packages.config
+++ b/src/OAuth/OAuthConsumer/packages.config
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0-RC1" />
-  <package id="log4net" version="2.0.0" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0.12084" />

+  <package id="log4net" version="2.0.0" />

 </packages>
\ No newline at end of file
diff --git a/src/OAuth/OAuthConsumerWpf/OAuthConsumerWpf.csproj b/src/OAuth/OAuthConsumerWpf/OAuthConsumerWpf.csproj
index 1dd28dd..98e4a82 100644
--- a/src/OAuth/OAuthConsumerWpf/OAuthConsumerWpf.csproj
+++ b/src/OAuth/OAuthConsumerWpf/OAuthConsumerWpf.csproj
@@ -1,262 +1,262 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6EC36418-DBC5-4AD1-A402-413604AA7A08}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DotNetOpenAuth.Samples.OAuthConsumerWpf</RootNamespace>
-    <AssemblyName>OAuthConsumerWpf</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\CodeAnalysis\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.OAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Consumer">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft\lib\net35-full\DotNetOpenAuth.OAuth2.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2.Client">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Client.0.23.0-draft\lib\net35-full\DotNetOpenAuth.OAuth2.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2.Client.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Client.UI.0.23.0-draft\lib\net35-full\DotNetOpenAuth.OAuth2.Client.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net35-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Contracts">
-      <HintPath>..\..\..\packages\CodeContracts.Unofficial.1.0.0.2\lib\net35-client\Microsoft.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.ServiceModel">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="UIAutomationProvider">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationCore">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationFramework">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xaml" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="Authorize.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Authorize2.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Authorize2.xaml.cs">
-      <DependentUpon>Authorize2.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Authorize.xaml.cs">
-      <DependentUpon>Authorize.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="InMemoryTokenManager.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="Service References\WcfSampleService\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <None Include="Service References\WcfSampleService\DataApi.wsdl" />
-    <None Include="Service References\WcfSampleService\DataApi.xsd" />
-    <None Include="Service References\WcfSampleService\DataApi1.xsd" />
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">
-      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>
-      <Name>DotNetOpenAuth.ApplicationBlock</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadataStorage Include="Service References\WcfSampleService\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\WcfSampleService\DataApi.disco" />
-    <None Include="Service References\WcfSampleService\DataApi2.xsd" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\WcfSampleService\configuration91.svcinfo" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\WcfSampleService\configuration.svcinfo" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\WcfSampleService\Reference.svcmap">
-      <Generator>WCF Proxy Generator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{6EC36418-DBC5-4AD1-A402-413604AA7A08}</ProjectGuid>

+    <OutputType>WinExe</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>DotNetOpenAuth.Samples.OAuthConsumerWpf</RootNamespace>

+    <AssemblyName>OAuthConsumerWpf</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <FileAlignment>512</FileAlignment>

+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+    <WarningLevel>4</WarningLevel>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>3.5</OldToolsVersion>

+    <UpgradeBackupLocation />

+    <PublishUrl>publish\</PublishUrl>

+    <Install>true</Install>

+    <InstallFrom>Disk</InstallFrom>

+    <UpdateEnabled>false</UpdateEnabled>

+    <UpdateMode>Foreground</UpdateMode>

+    <UpdateInterval>7</UpdateInterval>

+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>

+    <UpdatePeriodically>false</UpdatePeriodically>

+    <UpdateRequired>false</UpdateRequired>

+    <MapFileExtensions>true</MapFileExtensions>

+    <ApplicationRevision>0</ApplicationRevision>

+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>

+    <IsWebBootstrapper>false</IsWebBootstrapper>

+    <UseApplicationTrust>false</UseApplicationTrust>

+    <BootstrapperEnabled>true</BootstrapperEnabled>

+    <TargetFrameworkProfile />

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\CodeAnalysis\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DebugType>full</DebugType>

+    <PlatformTarget>AnyCPU</PlatformTarget>

+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>

+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Consumer">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2.Client">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Client.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.Client.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2.Client.UI">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Client.UI.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.Client.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="log4net">

+      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net35-full\log4net.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Contracts">

+      <HintPath>..\..\..\packages\CodeContracts.Unofficial.1.0.0.2\lib\net35-client\Microsoft.Contracts.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.configuration" />

+    <Reference Include="System.Core">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Runtime.Serialization">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.ServiceModel">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Web" />

+    <Reference Include="System.Xml.Linq">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Data.DataSetExtensions">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml" />

+    <Reference Include="WindowsFormsIntegration" />

+    <Reference Include="System.Windows.Forms" />

+    <Reference Include="UIAutomationProvider">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="WindowsBase">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="PresentationCore">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="PresentationFramework">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Xaml" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">

+      <RequiredTargetFramework>4.0</RequiredTargetFramework>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <ApplicationDefinition Include="App.xaml">

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+    </ApplicationDefinition>

+    <Page Include="Authorize.xaml">

+      <SubType>Designer</SubType>

+      <Generator>MSBuild:Compile</Generator>

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+    </Page>

+    <Page Include="Authorize2.xaml">

+      <SubType>Designer</SubType>

+      <Generator>MSBuild:Compile</Generator>

+    </Page>

+    <Page Include="MainWindow.xaml">

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+    </Page>

+    <Compile Include="App.xaml.cs">

+      <DependentUpon>App.xaml</DependentUpon>

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Authorize2.xaml.cs">

+      <DependentUpon>Authorize2.xaml</DependentUpon>

+    </Compile>

+    <Compile Include="MainWindow.xaml.cs">

+      <DependentUpon>MainWindow.xaml</DependentUpon>

+      <SubType>Code</SubType>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Authorize.xaml.cs">

+      <DependentUpon>Authorize.xaml</DependentUpon>

+    </Compile>

+    <Compile Include="InMemoryTokenManager.cs" />

+    <Compile Include="Properties\AssemblyInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Properties\Resources.Designer.cs">

+      <AutoGen>True</AutoGen>

+      <DesignTime>True</DesignTime>

+      <DependentUpon>Resources.resx</DependentUpon>

+    </Compile>

+    <Compile Include="Properties\Settings.Designer.cs">

+      <AutoGen>True</AutoGen>

+      <DependentUpon>Settings.settings</DependentUpon>

+      <DesignTimeSharedInput>True</DesignTimeSharedInput>

+    </Compile>

+    <Compile Include="Service References\WcfSampleService\Reference.cs">

+      <AutoGen>True</AutoGen>

+      <DesignTime>True</DesignTime>

+      <DependentUpon>Reference.svcmap</DependentUpon>

+    </Compile>

+    <EmbeddedResource Include="Properties\Resources.resx">

+      <Generator>ResXFileCodeGenerator</Generator>

+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>

+    </EmbeddedResource>

+    <None Include="App.config" />

+    <None Include="packages.config" />

+    <None Include="Properties\Settings.settings">

+      <Generator>SettingsSingleFileGenerator</Generator>

+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>

+    </None>

+    <None Include="Service References\WcfSampleService\DataApi.wsdl" />

+    <None Include="Service References\WcfSampleService\DataApi.xsd" />

+    <None Include="Service References\WcfSampleService\DataApi1.xsd" />

+    <AppDesigner Include="Properties\" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">

+      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>

+      <Name>DotNetOpenAuth.ApplicationBlock</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <WCFMetadata Include="Service References\" />

+  </ItemGroup>

+  <ItemGroup>

+    <WCFMetadataStorage Include="Service References\WcfSampleService\" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="Service References\WcfSampleService\DataApi.disco" />

+    <None Include="Service References\WcfSampleService\DataApi2.xsd" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="Service References\WcfSampleService\configuration91.svcinfo" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="Service References\WcfSampleService\configuration.svcinfo" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="Service References\WcfSampleService\Reference.svcmap">

+      <Generator>WCF Proxy Generator</Generator>

+      <LastGenOutput>Reference.cs</LastGenOutput>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>

+      <Install>false</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">

+      <Visible>False</Visible>

+      <ProductName>Windows Installer 3.1</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+  </ItemGroup>

+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  -->

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OAuth/OAuthConsumerWpf/packages.config b/src/OAuth/OAuthConsumerWpf/packages.config
index 7a010bc..23deca0 100644
--- a/src/OAuth/OAuthConsumerWpf/packages.config
+++ b/src/OAuth/OAuthConsumerWpf/packages.config
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OAuth2.Client.UI" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />
-  <package id="log4net" version="2.0.0" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OAuth2.Client.UI" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Client.UI" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft2" />

+  <package id="log4net" version="2.0.0" />

 </packages>
\ No newline at end of file
diff --git a/src/OAuth/OAuthResourceServer/OAuthResourceServer.csproj b/src/OAuth/OAuthResourceServer/OAuthResourceServer.csproj
index 38cc9c8..9904726 100644
--- a/src/OAuth/OAuthResourceServer/OAuthResourceServer.csproj
+++ b/src/OAuth/OAuthResourceServer/OAuthResourceServer.csproj
@@ -1,156 +1,156 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E135F455-0669-49F8-9207-07FCA8C8FC79}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OAuthResourceServer</RootNamespace>
-    <AssemblyName>OAuthResourceServer</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <UseIISExpress>false</UseIISExpress>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SAMPLESONLY</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;SAMPLESONLY</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Common">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft\lib\net40-full\DotNetOpenAuth.OAuth2.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth2.ResourceServer">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.ResourceServer.0.23.0-draft\lib\net40-full\DotNetOpenAuth.OAuth2.ResourceServer.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data.Linq" />
-    <Reference Include="System.IdentityModel" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ServiceModel.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="DataApi.svc" />
-    <Content Include="Default.aspx" />
-    <Content Include="favicon.ico" />
-    <Content Include="Global.asax" />
-    <Content Include="Login.aspx" />
-    <Content Include="Members\Logoff.aspx" />
-    <Content Include="TracePage.aspx" />
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DataApi.cs">
-      <DependentUpon>DataApi.svc</DependentUpon>
-    </Compile>
-    <Compile Include="Code\Global.cs" />
-    <Compile Include="Code\IDataApi.cs" />
-    <Compile Include="Code\OAuthAuthorizationManager.cs" />
-    <Compile Include="Code\OAuthPrincipalAuthorizationPolicy.cs" />
-    <Compile Include="Code\TracePageAppender.cs" />
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TracePage.aspx.cs">
-      <DependentUpon>TracePage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TracePage.aspx.designer.cs">
-      <DependentUpon>TracePage.aspx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="MasterPage.master" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Members\Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>65169</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>

+    </ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{E135F455-0669-49F8-9207-07FCA8C8FC79}</ProjectGuid>

+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>OAuthResourceServer</RootNamespace>

+    <AssemblyName>OAuthResourceServer</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <UseIISExpress>false</UseIISExpress>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+    <TargetFrameworkProfile />

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE;DEBUG;SAMPLESONLY</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE;SAMPLESONLY</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Common">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth2.ResourceServer">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.ResourceServer.0.23.0-draft2\lib\net40-full\DotNetOpenAuth.OAuth2.ResourceServer.dll</HintPath>

+    </Reference>

+    <Reference Include="log4net">

+      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Data.DataSetExtensions" />

+    <Reference Include="System.Data.Linq" />

+    <Reference Include="System.IdentityModel" />

+    <Reference Include="System.ServiceModel" />

+    <Reference Include="System.ServiceModel.Web" />

+    <Reference Include="System.Web.Abstractions" />

+    <Reference Include="System.Web.ApplicationServices" />

+    <Reference Include="System.Web.DynamicData" />

+    <Reference Include="System.Web.Entity" />

+    <Reference Include="System.Web.Extensions" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Web" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Web.Services" />

+    <Reference Include="System.EnterpriseServices" />

+    <Reference Include="System.Web.Mobile" />

+    <Reference Include="System.Xml.Linq" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="DataApi.svc" />

+    <Content Include="Default.aspx" />

+    <Content Include="favicon.ico" />

+    <Content Include="Global.asax" />

+    <Content Include="Login.aspx" />

+    <Content Include="Members\Logoff.aspx" />

+    <Content Include="TracePage.aspx" />

+    <Content Include="Web.config" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Default.aspx.designer.cs">

+      <DependentUpon>Default.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="DataApi.cs">

+      <DependentUpon>DataApi.svc</DependentUpon>

+    </Compile>

+    <Compile Include="Code\Global.cs" />

+    <Compile Include="Code\IDataApi.cs" />

+    <Compile Include="Code\OAuthAuthorizationManager.cs" />

+    <Compile Include="Code\OAuthPrincipalAuthorizationPolicy.cs" />

+    <Compile Include="Code\TracePageAppender.cs" />

+    <Compile Include="Default.aspx.cs">

+      <DependentUpon>Default.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="TracePage.aspx.cs">

+      <DependentUpon>TracePage.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="TracePage.aspx.designer.cs">

+      <DependentUpon>TracePage.aspx</DependentUpon>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="App_Data\" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="MasterPage.master" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="Members\Web.config" />

+  </ItemGroup>

+  <ItemGroup>

+    <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="packages.config" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

+  <ProjectExtensions>

+    <VisualStudio>

+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

+        <WebProjectProperties>

+          <UseIIS>False</UseIIS>

+          <AutoAssignPort>False</AutoAssignPort>

+          <DevelopmentServerPort>65169</DevelopmentServerPort>

+          <DevelopmentServerVPath>/</DevelopmentServerVPath>

+          <IISUrl>

+          </IISUrl>

+          <NTLMAuthentication>False</NTLMAuthentication>

+          <UseCustomServer>False</UseCustomServer>

+          <CustomServerUrl>

+          </CustomServerUrl>

+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>

+        </WebProjectProperties>

+      </FlavorProperties>

+    </VisualStudio>

+  </ProjectExtensions>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  -->

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OAuth/OAuthResourceServer/Web.config b/src/OAuth/OAuthResourceServer/Web.config
index d5d9d24..1ab8dfa 100644
--- a/src/OAuth/OAuthResourceServer/Web.config
+++ b/src/OAuth/OAuthResourceServer/Web.config
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />
-    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
-      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
-      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-    </sectionGroup>
-  </configSections>
-  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-       which is necessary for OpenID urls with unicode characters in the domain/host name. 
-       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-  <uri>
-    <idn enabled="All" />
-    <iriParsing enabled="true" />
-  </uri>
-  <system.net>
-    <defaultProxy enabled="true" />
-    <settings>
-      <!-- This setting causes .NET to check certificate revocation lists (CRL) 
-           before trusting HTTPS certificates.  But this setting tends to not 
-           be allowed in shared hosting environments. -->
-      <!--<servicePointManager checkCertificateRevocationList="true"/>-->
-    </settings>
-  </system.net>
-  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->
-  <dotNetOpenAuth>
-    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-    <reporting enabled="true" />
-    <!-- Relaxing SSL requirements is useful for simple samples, but NOT a good idea in production. -->
-    <messaging relaxSslRequirements="true">
-      <untrustedWebRequest>
-        <whitelistHosts>
-          <!-- Uncomment to enable communication with localhost (should generally not activate in production!) -->
-          <!--<add name="localhost" />-->
-        </whitelistHosts>
-      </untrustedWebRequest>
-    </messaging>
-  </dotNetOpenAuth>
-  <appSettings />
-  <connectionStrings>
-    <add name="DatabaseConnectionString" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\Database.mdf;Integrated Security=True;User Instance=True" providerName="System.Data.SqlClient" />
-  </connectionStrings>
-  <system.web>
-    <!-- 
-            Set compilation debug="true" to insert debugging 
-            symbols into the compiled page. Because this 
-            affects performance, set this value to true only 
-            during development.
-        -->
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <remove assembly="DotNetOpenAuth.Contracts" />
-        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-      </assemblies>
-    </compilation>
-    <authentication mode="Forms">
-      <forms name="oauthSP" />
-    </authentication>
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />
-  </system.web>
-  <!-- 
-        The system.webServer section is required for running ASP.NET AJAX under Internet
-        Information Services 7.0.  It is not necessary for previous version of IIS.
-    -->
-  <log4net>
-    <appender name="TracePageAppender" type="OAuthResourceServer.Code.TracePageAppender, OAuthResourceServer">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />
-      </layout>
-    </appender>
-    <!-- Setup the root category, add the appenders and set the default level -->
-    <root>
-      <level value="INFO" />
-      <!--<appender-ref ref="RollingFileAppender" />-->
-      <appender-ref ref="TracePageAppender" />
-    </root>
-    <!-- Specify the level for some specific categories -->
-    <logger name="DotNetOpenAuth">
-      <level value="ALL" />
-    </logger>
-  </log4net>
-  <system.serviceModel>
-    <behaviors>
-      <serviceBehaviors>
-        <behavior name="DataApiBehavior">
-          <serviceMetadata httpGetEnabled="true" />
-          <serviceDebug includeExceptionDetailInFaults="true" />
-          <serviceAuthorization serviceAuthorizationManagerType="OAuthResourceServer.Code.OAuthAuthorizationManager, OAuthResourceServer" principalPermissionMode="Custom" />
-        </behavior>
-      </serviceBehaviors>
-      <endpointBehaviors>
-        <behavior name="DataApiWebBehavior">
-          <webHttp />
-        </behavior>
-      </endpointBehaviors>
-    </behaviors>
-    <services>
-      <service behaviorConfiguration="DataApiBehavior" name="OAuthResourceServer.DataApi">
-        <endpoint address="" binding="wsHttpBinding" contract="OAuthResourceServer.Code.IDataApi">
-          <identity>
-            <dns value="localhost" />
-          </identity>
-        </endpoint>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
-        <endpoint address="web" binding="webHttpBinding" contract="OAuthResourceServer.Code.IDataApi" behaviorConfiguration="DataApiWebBehavior" />
-      </service>
-    </services>
-  </system.serviceModel>
-  <runtime>
-    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->
-    <legacyHMACWarning enabled="0" />
-  </runtime>
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <configSections>

+    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />

+    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">

+      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />

+      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />

+      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+    </sectionGroup>

+  </configSections>

+  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+       which is necessary for OpenID urls with unicode characters in the domain/host name. 

+       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+  <uri>

+    <idn enabled="All" />

+    <iriParsing enabled="true" />

+  </uri>

+  <system.net>

+    <defaultProxy enabled="true" />

+    <settings>

+      <!-- This setting causes .NET to check certificate revocation lists (CRL) 

+           before trusting HTTPS certificates.  But this setting tends to not 

+           be allowed in shared hosting environments. -->

+      <!--<servicePointManager checkCertificateRevocationList="true"/>-->

+    </settings>

+  </system.net>

+  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->

+  <dotNetOpenAuth>

+    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->

+    <reporting enabled="true" />

+    <!-- Relaxing SSL requirements is useful for simple samples, but NOT a good idea in production. -->

+    <messaging relaxSslRequirements="true">

+      <untrustedWebRequest>

+        <whitelistHosts>

+          <!-- Uncomment to enable communication with localhost (should generally not activate in production!) -->

+          <!--<add name="localhost" />-->

+        </whitelistHosts>

+      </untrustedWebRequest>

+    </messaging>

+  </dotNetOpenAuth>

+  <appSettings />

+  <connectionStrings>

+    <add name="DatabaseConnectionString" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\Database.mdf;Integrated Security=True;User Instance=True" providerName="System.Data.SqlClient" />

+  </connectionStrings>

+  <system.web>

+    <!-- 

+            Set compilation debug="true" to insert debugging 

+            symbols into the compiled page. Because this 

+            affects performance, set this value to true only 

+            during development.

+        -->

+    <compilation debug="true" targetFramework="4.0">

+      <assemblies>

+        <remove assembly="DotNetOpenAuth.Contracts" />

+        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />

+      </assemblies>

+    </compilation>

+    <authentication mode="Forms">

+      <forms name="oauthSP" />

+    </authentication>

+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />

+  </system.web>

+  <!-- 

+        The system.webServer section is required for running ASP.NET AJAX under Internet

+        Information Services 7.0.  It is not necessary for previous version of IIS.

+    -->

+  <log4net>

+    <appender name="TracePageAppender" type="OAuthResourceServer.Code.TracePageAppender, OAuthResourceServer">

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

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

+      </layout>

+    </appender>

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

+    <root>

+      <level value="INFO" />

+      <!--<appender-ref ref="RollingFileAppender" />-->

+      <appender-ref ref="TracePageAppender" />

+    </root>

+    <!-- Specify the level for some specific categories -->

+    <logger name="DotNetOpenAuth">

+      <level value="ALL" />

+    </logger>

+  </log4net>

+  <system.serviceModel>

+    <behaviors>

+      <serviceBehaviors>

+        <behavior name="DataApiBehavior">

+          <serviceMetadata httpGetEnabled="true" />

+          <serviceDebug includeExceptionDetailInFaults="true" />

+          <serviceAuthorization serviceAuthorizationManagerType="OAuthResourceServer.Code.OAuthAuthorizationManager, OAuthResourceServer" principalPermissionMode="Custom" />

+        </behavior>

+      </serviceBehaviors>

+      <endpointBehaviors>

+        <behavior name="DataApiWebBehavior">

+          <webHttp />

+        </behavior>

+      </endpointBehaviors>

+    </behaviors>

+    <services>

+      <service behaviorConfiguration="DataApiBehavior" name="OAuthResourceServer.DataApi">

+        <endpoint address="" binding="wsHttpBinding" contract="OAuthResourceServer.Code.IDataApi">

+          <identity>

+            <dns value="localhost" />

+          </identity>

+        </endpoint>

+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />

+        <endpoint address="web" binding="webHttpBinding" contract="OAuthResourceServer.Code.IDataApi" behaviorConfiguration="DataApiWebBehavior" />

+      </service>

+    </services>

+  </system.serviceModel>

+  <runtime>

+    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->

+    <legacyHMACWarning enabled="0" />

+  </runtime>

 </configuration>
\ No newline at end of file
diff --git a/src/OAuth/OAuthResourceServer/packages.config b/src/OAuth/OAuthResourceServer/packages.config
index e651ea5..0e5b33a 100644
--- a/src/OAuth/OAuthResourceServer/packages.config
+++ b/src/OAuth/OAuthResourceServer/packages.config
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />
-  <package id="DotNetOpenAuth.OAuth2.ResourceServer" version="0.23.0-draft" />
-  <package id="log4net" version="2.0.0" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft2" />

+  <package id="DotNetOpenAuth.OAuth2.ResourceServer" version="0.23.0-draft" />

+  <package id="DotNetOpenAuth.OAuth2.ResourceServer" version="0.23.0-draft2" />

+  <package id="log4net" version="2.0.0" />

 </packages>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj b/src/OpenID/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
index 501a5f0..ed946e2 100644
--- a/src/OpenID/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
+++ b/src/OpenID/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
@@ -1,221 +1,221 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5C65603B-235F-47E6-B536-06385C60DE7F}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DotNetOpenAuth.OpenIdOfflineProvider</RootNamespace>
-    <AssemblyName>OpenIdOfflineProvider</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <UICulture>en-US</UICulture>
-    <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>
-    <OutputPath Condition=" '$(OutputPath)' == '' ">bin\$(TargetFrameworkVersion)\$(Configuration)\</OutputPath>
-    <ApplicationIcon>openid.ico</ApplicationIcon>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkProfile />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
-    <CodeContractsCustomRewriterAssembly>
-    </CodeContractsCustomRewriterAssembly>
-    <CodeContractsCustomRewriterClass>
-    </CodeContractsCustomRewriterClass>
-    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
-    <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
-    <CodeContractsBuildReferenceAssembly>False</CodeContractsBuildReferenceAssembly>
-    <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
-    <CodeContractsBoundsObligations>False</CodeContractsBoundsObligations>
-    <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
-    <CodeContractsLibPaths>
-    </CodeContractsLibPaths>
-    <CodeContractsPlatformPath>
-    </CodeContractsPlatformPath>
-    <CodeContractsExtraAnalysisOptions>
-    </CodeContractsExtraAnalysisOptions>
-    <CodeContractsBaseLineFile>
-    </CodeContractsBaseLineFile>
-    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
-    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
-    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
-    <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
-    <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
-    <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
-    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
-    <CodeContractsExtraRewriteOptions />
-    <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.Provider">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UIAutomationProvider">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationCore">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationFramework">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xaml" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="CheckIdWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CheckIdWindow.xaml.cs">
-      <DependentUpon>CheckIdWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="HostedProvider.cs" />
-    <Compile Include="HttpHost.cs" />
-    <Compile Include="NativeMethods.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="TextBoxTextWriter.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="openid.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{5C65603B-235F-47E6-B536-06385C60DE7F}</ProjectGuid>

+    <OutputType>WinExe</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>DotNetOpenAuth.OpenIdOfflineProvider</RootNamespace>

+    <AssemblyName>OpenIdOfflineProvider</AssemblyName>

+    <FileAlignment>512</FileAlignment>

+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+    <WarningLevel>4</WarningLevel>

+    <UICulture>en-US</UICulture>

+    <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>

+    <OutputPath Condition=" '$(OutputPath)' == '' ">bin\$(TargetFrameworkVersion)\$(Configuration)\</OutputPath>

+    <ApplicationIcon>openid.ico</ApplicationIcon>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>3.5</OldToolsVersion>

+    <UpgradeBackupLocation />

+    <IsWebBootstrapper>false</IsWebBootstrapper>

+    <TargetFrameworkProfile />

+    <PublishUrl>publish\</PublishUrl>

+    <Install>true</Install>

+    <InstallFrom>Disk</InstallFrom>

+    <UpdateEnabled>false</UpdateEnabled>

+    <UpdateMode>Foreground</UpdateMode>

+    <UpdateInterval>7</UpdateInterval>

+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>

+    <UpdatePeriodically>false</UpdatePeriodically>

+    <UpdateRequired>false</UpdateRequired>

+    <MapFileExtensions>true</MapFileExtensions>

+    <ApplicationRevision>0</ApplicationRevision>

+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>

+    <UseApplicationTrust>false</UseApplicationTrust>

+    <BootstrapperEnabled>true</BootstrapperEnabled>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>

+    <CodeContractsCustomRewriterAssembly>

+    </CodeContractsCustomRewriterAssembly>

+    <CodeContractsCustomRewriterClass>

+    </CodeContractsCustomRewriterClass>

+    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>

+    <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>

+    <CodeContractsBuildReferenceAssembly>False</CodeContractsBuildReferenceAssembly>

+    <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>

+    <CodeContractsBoundsObligations>False</CodeContractsBoundsObligations>

+    <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>

+    <CodeContractsLibPaths>

+    </CodeContractsLibPaths>

+    <CodeContractsPlatformPath>

+    </CodeContractsPlatformPath>

+    <CodeContractsExtraAnalysisOptions>

+    </CodeContractsExtraAnalysisOptions>

+    <CodeContractsBaseLineFile>

+    </CodeContractsBaseLineFile>

+    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>

+    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>

+    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>

+    <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>

+    <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>

+    <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>

+    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>

+    <CodeContractsExtraRewriteOptions />

+    <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.Provider">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>

+    </Reference>

+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Core">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Web" />

+    <Reference Include="System.Xml.Linq">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Data.DataSetExtensions">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml" />

+    <Reference Include="UIAutomationProvider">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="WindowsBase">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="PresentationCore">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="PresentationFramework">

+      <RequiredTargetFramework>3.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Xaml" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">

+      <RequiredTargetFramework>4.0</RequiredTargetFramework>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <ApplicationDefinition Include="App.xaml">

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+    </ApplicationDefinition>

+    <Page Include="CheckIdWindow.xaml">

+      <SubType>Designer</SubType>

+      <Generator>MSBuild:Compile</Generator>

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+    </Page>

+    <Page Include="MainWindow.xaml">

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+      <Generator>MSBuild:Compile</Generator>

+      <SubType>Designer</SubType>

+    </Page>

+    <Compile Include="App.xaml.cs">

+      <DependentUpon>App.xaml</DependentUpon>

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="MainWindow.xaml.cs">

+      <DependentUpon>MainWindow.xaml</DependentUpon>

+      <SubType>Code</SubType>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="CheckIdWindow.xaml.cs">

+      <DependentUpon>CheckIdWindow.xaml</DependentUpon>

+    </Compile>

+    <Compile Include="HostedProvider.cs" />

+    <Compile Include="HttpHost.cs" />

+    <Compile Include="NativeMethods.cs" />

+    <Compile Include="Properties\AssemblyInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Properties\Resources.Designer.cs">

+      <AutoGen>True</AutoGen>

+      <DesignTime>True</DesignTime>

+      <DependentUpon>Resources.resx</DependentUpon>

+    </Compile>

+    <Compile Include="Properties\Settings.Designer.cs">

+      <AutoGen>True</AutoGen>

+      <DependentUpon>Settings.settings</DependentUpon>

+      <DesignTimeSharedInput>True</DesignTimeSharedInput>

+    </Compile>

+    <Compile Include="TextBoxTextWriter.cs" />

+    <EmbeddedResource Include="Properties\Resources.resx">

+      <Generator>ResXFileCodeGenerator</Generator>

+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>

+    </EmbeddedResource>

+    <None Include="App.config" />

+    <None Include="packages.config" />

+    <None Include="Properties\Settings.settings">

+      <Generator>SettingsSingleFileGenerator</Generator>

+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>

+    </None>

+    <AppDesigner Include="Properties\" />

+  </ItemGroup>

+  <ItemGroup>

+    <Resource Include="openid.ico" />

+  </ItemGroup>

+  <ItemGroup>

+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>

+      <Install>false</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">

+      <Visible>False</Visible>

+      <ProductName>Windows Installer 3.1</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+  </ItemGroup>

+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdOfflineProvider/packages.config b/src/OpenID/OpenIdOfflineProvider/packages.config
index 78f1cf8..7081e60 100644
--- a/src/OpenID/OpenIdOfflineProvider/packages.config
+++ b/src/OpenID/OpenIdOfflineProvider/packages.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0-RC1" />
-  <package id="log4net" version="2.0.0" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0.12084" />

+  <package id="log4net" version="2.0.0" />

 </packages>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdProviderMvc/OpenIdProviderMvc.csproj b/src/OpenID/OpenIdProviderMvc/OpenIdProviderMvc.csproj
index f0c992a..db65a1c 100644
--- a/src/OpenID/OpenIdProviderMvc/OpenIdProviderMvc.csproj
+++ b/src/OpenID/OpenIdProviderMvc/OpenIdProviderMvc.csproj
@@ -1,177 +1,177 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AEA29D4D-396F-47F6-BC81-B58D4B855245}</ProjectGuid>
-    <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenIdProviderMvc</RootNamespace>
-    <AssemblyName>OpenIdProviderMvc</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.Core.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.Provider">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.Provider.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.Provider.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Contracts">
-      <HintPath>..\..\..\packages\CodeContracts.Unofficial.1.0.0.2\lib\net35-client\Microsoft.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Mvc" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">
-      <RequiredTargetFramework>v4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Code\AccountMembershipService.cs" />
-    <Compile Include="Code\AnonymousIdentifierProvider.cs" />
-    <Compile Include="Code\FormsAuthenticationService.cs" />
-    <Compile Include="Code\IFormsAuthentication.cs" />
-    <Compile Include="Code\IMembershipService.cs" />
-    <Compile Include="Code\ReadOnlyXmlMembershipProvider.cs" />
-    <Compile Include="Code\Util.cs" />
-    <Compile Include="Controllers\AccountController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\OpenIdController.cs" />
-    <Compile Include="Controllers\UserController.cs" />
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="Models\User.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Data\Users.xml" />
-    <Content Include="Default.aspx" />
-    <Content Include="favicon.ico" />
-    <Content Include="Global.asax" />
-    <Content Include="Views\Account\ChangePassword.aspx" />
-    <Content Include="Views\Account\ChangePasswordSuccess.aspx" />
-    <Content Include="Views\Account\Register.aspx" />
-    <Content Include="Views\OpenId\AskUser.aspx" />
-    <Content Include="Views\Shared\Xrds.aspx" />
-    <Content Include="Views\OpenId\Provider.aspx" />
-    <Content Include="Views\User\Identity.aspx" />
-    <Content Include="Web.config" />
-    <Content Include="Content\Site.css" />
-    <Content Include="Scripts\jquery-1.3.1.js" />
-    <Content Include="Scripts\jquery-1.3.1.min.js" />
-    <Content Include="Scripts\jquery-1.3.1-vsdoc.js" />
-    <Content Include="Scripts\jquery-1.3.1.min-vsdoc.js" />
-    <Content Include="Scripts\MicrosoftAjax.js" />
-    <Content Include="Scripts\MicrosoftAjax.debug.js" />
-    <Content Include="Scripts\MicrosoftMvcAjax.js" />
-    <Content Include="Scripts\MicrosoftMvcAjax.debug.js" />
-    <Content Include="Views\Account\LogOn.aspx" />
-    <Content Include="Views\Home\About.aspx" />
-    <Content Include="Views\Home\Index.aspx" />
-    <Content Include="Views\Shared\Error.aspx" />
-    <Content Include="Views\Shared\LogOnUserControl.ascx" />
-    <Content Include="Views\Shared\Site.Master" />
-    <Content Include="Views\Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">
-      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>
-      <Name>DotNetOpenAuth.ApplicationBlock</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{AEA29D4D-396F-47F6-BC81-B58D4B855245}</ProjectGuid>

+    <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>OpenIdProviderMvc</RootNamespace>

+    <AssemblyName>OpenIdProviderMvc</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <MvcBuildViews>false</MvcBuildViews>

+    <TargetFrameworkProfile />

+    <UseIISExpress>false</UseIISExpress>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.Core.UI">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.Provider">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.Provider.UI">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.Provider.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.UI">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Contracts">

+      <HintPath>..\..\..\packages\CodeContracts.Unofficial.1.0.0.2\lib\net35-client\Microsoft.Contracts.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Data.DataSetExtensions" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Web.DynamicData" />

+    <Reference Include="System.Web.Entity" />

+    <Reference Include="System.ComponentModel.DataAnnotations">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Web.Extensions" />

+    <Reference Include="System.Web.Mvc" />

+    <Reference Include="System.Web" />

+    <Reference Include="System.Web.ApplicationServices" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">

+      <RequiredTargetFramework>v4.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Web.Abstractions" />

+    <Reference Include="System.Web.Routing" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Web.Services" />

+    <Reference Include="System.EnterpriseServices" />

+    <Reference Include="System.Web.Mobile" />

+    <Reference Include="System.Xml.Linq" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Code\AccountMembershipService.cs" />

+    <Compile Include="Code\AnonymousIdentifierProvider.cs" />

+    <Compile Include="Code\FormsAuthenticationService.cs" />

+    <Compile Include="Code\IFormsAuthentication.cs" />

+    <Compile Include="Code\IMembershipService.cs" />

+    <Compile Include="Code\ReadOnlyXmlMembershipProvider.cs" />

+    <Compile Include="Code\Util.cs" />

+    <Compile Include="Controllers\AccountController.cs" />

+    <Compile Include="Controllers\HomeController.cs" />

+    <Compile Include="Controllers\OpenIdController.cs" />

+    <Compile Include="Controllers\UserController.cs" />

+    <Compile Include="Default.aspx.cs">

+      <DependentUpon>Default.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Global.asax.cs">

+      <DependentUpon>Global.asax</DependentUpon>

+    </Compile>

+    <Compile Include="Models\User.cs" />

+    <Compile Include="Properties\AssemblyInfo.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="App_Data\Users.xml" />

+    <Content Include="Default.aspx" />

+    <Content Include="favicon.ico" />

+    <Content Include="Global.asax" />

+    <Content Include="Views\Account\ChangePassword.aspx" />

+    <Content Include="Views\Account\ChangePasswordSuccess.aspx" />

+    <Content Include="Views\Account\Register.aspx" />

+    <Content Include="Views\OpenId\AskUser.aspx" />

+    <Content Include="Views\Shared\Xrds.aspx" />

+    <Content Include="Views\OpenId\Provider.aspx" />

+    <Content Include="Views\User\Identity.aspx" />

+    <Content Include="Web.config" />

+    <Content Include="Content\Site.css" />

+    <Content Include="Scripts\jquery-1.3.1.js" />

+    <Content Include="Scripts\jquery-1.3.1.min.js" />

+    <Content Include="Scripts\jquery-1.3.1-vsdoc.js" />

+    <Content Include="Scripts\jquery-1.3.1.min-vsdoc.js" />

+    <Content Include="Scripts\MicrosoftAjax.js" />

+    <Content Include="Scripts\MicrosoftAjax.debug.js" />

+    <Content Include="Scripts\MicrosoftMvcAjax.js" />

+    <Content Include="Scripts\MicrosoftMvcAjax.debug.js" />

+    <Content Include="Views\Account\LogOn.aspx" />

+    <Content Include="Views\Home\About.aspx" />

+    <Content Include="Views\Home\Index.aspx" />

+    <Content Include="Views\Shared\Error.aspx" />

+    <Content Include="Views\Shared\LogOnUserControl.ascx" />

+    <Content Include="Views\Shared\Site.Master" />

+    <Content Include="Views\Web.config" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">

+      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>

+      <Name>DotNetOpenAuth.ApplicationBlock</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="packages.config" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
-  </Target> -->
-  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>4864</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  </Target> -->

+  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">

+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />

+  </Target>

+  <ProjectExtensions>

+    <VisualStudio>

+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

+        <WebProjectProperties>

+          <UseIIS>False</UseIIS>

+          <AutoAssignPort>True</AutoAssignPort>

+          <DevelopmentServerPort>4864</DevelopmentServerPort>

+          <DevelopmentServerVPath>/</DevelopmentServerVPath>

+          <IISUrl>

+          </IISUrl>

+          <NTLMAuthentication>False</NTLMAuthentication>

+          <UseCustomServer>False</UseCustomServer>

+          <CustomServerUrl>

+          </CustomServerUrl>

+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>

+        </WebProjectProperties>

+      </FlavorProperties>

+    </VisualStudio>

+  </ProjectExtensions>

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdProviderMvc/Web.config b/src/OpenID/OpenIdProviderMvc/Web.config
index 2925b54..8c0056c 100644
--- a/src/OpenID/OpenIdProviderMvc/Web.config
+++ b/src/OpenID/OpenIdProviderMvc/Web.config
@@ -1,170 +1,170 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />
-    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
-      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
-    </sectionGroup>
-    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  </configSections>
-  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-       which is necessary for OpenID urls with unicode characters in the domain/host name. 
-       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->
-  <dotNetOpenAuth>
-    <openid>
-      <provider>
-        <security requireSsl="false" />
-        <behaviors>
-          <!-- Behaviors activate themselves automatically for individual matching requests. 
-               The first one in this list to match an incoming request "owns" the request.  If no
-               profile matches, the default behavior is assumed. -->
-          <!--<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.GsaIcamProfile, DotNetOpenAuth.OpenId.Provider" />-->
-          <add type="DotNetOpenAuth.OpenId.Provider.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />
-          <add type="DotNetOpenAuth.OpenId.Provider.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.Provider" />
-        </behaviors>
-        <!-- Uncomment the following to activate the sample custom store.  -->
-        <!--<store type="RelyingPartyWebForms.CustomStore, RelyingPartyWebForms" />-->
-      </provider>
-    </openid>
-    <messaging>
-      <untrustedWebRequest>
-        <whitelistHosts>
-          <!-- since this is a sample, and will often be used with localhost -->
-          <add name="localhost" />
-        </whitelistHosts>
-      </untrustedWebRequest>
-    </messaging>
-    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-    <reporting enabled="true" />
-  </dotNetOpenAuth>
-  <appSettings />
-  <system.web>
-    <!-- 
-            Set compilation debug="true" to insert debugging 
-            symbols into the compiled page. Because this 
-            affects performance, set this value to true only 
-            during development.
-    -->
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <remove assembly="DotNetOpenAuth.Contracts" />
-        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-      </assemblies>
-    </compilation>
-    <!--
-            The <authentication> section enables configuration 
-            of the security authentication mode used by 
-            ASP.NET to identify an incoming user. 
-    -->
-    <authentication mode="Forms">
-      <forms loginUrl="~/Account/LogOn" timeout="2880" name="ProviderMvcSession" />
-      <!-- named cookie prevents conflicts with other samples -->
-    </authentication>
-    <membership defaultProvider="AspNetReadOnlyXmlMembershipProvider">
-      <providers>
-        <clear />
-        <add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdProviderMvc.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider" xmlFileName="~/App_Data/Users.xml" />
-      </providers>
-    </membership>
-    <profile>
-      <providers>
-        <clear />
-        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="ApplicationServices" applicationName="/" />
-      </providers>
-    </profile>
-    <roleManager enabled="false">
-      <providers>
-        <clear />
-        <add connectionStringName="ApplicationServices" applicationName="/" name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-        <add applicationName="/" name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-      </providers>
-    </roleManager>
-    <!--
-            The <customErrors> section enables configuration 
-            of what to do if/when an unhandled error occurs 
-            during the execution of a request. Specifically, 
-            it enables developers to configure html error pages 
-            to be displayed in place of a error stack trace.
-
-        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
-            <error statusCode="403" redirect="NoAccess.htm" />
-            <error statusCode="404" redirect="FileNotFound.htm" />
-        </customErrors>
-    -->
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="System.Linq" />
-        <add namespace="System.Collections.Generic" />
-      </namespaces>
-    </pages>
-    <httpHandlers>
-      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    </httpHandlers>
-  </system.web>
-  <system.web.extensions />
-  <!-- 
-        The system.webServer section is required for running ASP.NET AJAX under Internet
-        Information Services 7.0.  It is not necessary for previous version of IIS.
-  -->
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true" />
-    <handlers>
-      <remove name="MvcHttpHandler" />
-      <remove name="UrlRoutingHandler" />
-      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    </handlers>
-  </system.webServer>
-  <runtime>
-    <!-- When targeting ASP.NET MVC 2, this assemblyBinding makes MVC 1 references relink
-         to MVC 2 so libraries such as DotNetOpenAuth that compile against MVC 1 will work with it. -->
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="DotNetOpenAuth.OpenId.RelyingParty" publicKeyToken="2780ccd10d57b246" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="DotNetOpenAuth.OpenId" publicKeyToken="2780ccd10d57b246" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.12030" newVersion="4.0.0.12030" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="DotNetOpenAuth.Core" publicKeyToken="2780ccd10d57b246" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.12030" newVersion="4.0.0.12030" />
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="DotNetOpenAuth.Core.UI" publicKeyToken="2780ccd10d57b246" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.12030" newVersion="4.0.0.12030" />
-      </dependentAssembly>
-    </assemblyBinding>
-    <legacyHMACWarning enabled="0" />
-  </runtime>
-  <system.net>
-    <defaultProxy enabled="true" />
-    <settings>
-      <!-- This setting causes .NET to check certificate revocation lists (CRL) 
-			     before trusting HTTPS certificates.  But this setting tends to not 
-			     be allowed in shared hosting environments. -->
-      <!--<servicePointManager checkCertificateRevocationList="true"/>-->
-    </settings>
-  </system.net>
-  <uri>
-    <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-	     which is necessary for OpenID urls with unicode characters in the domain/host name. 
-	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-    <idn enabled="All" />
-    <iriParsing enabled="true" />
-  </uri>
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <configSections>

+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />

+    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">

+      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />

+      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />

+    </sectionGroup>

+    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+  </configSections>

+  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+       which is necessary for OpenID urls with unicode characters in the domain/host name. 

+       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->

+  <dotNetOpenAuth>

+    <openid>

+      <provider>

+        <security requireSsl="false" />

+        <behaviors>

+          <!-- Behaviors activate themselves automatically for individual matching requests. 

+               The first one in this list to match an incoming request "owns" the request.  If no

+               profile matches, the default behavior is assumed. -->

+          <!--<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.GsaIcamProfile, DotNetOpenAuth.OpenId.Provider" />-->

+          <add type="DotNetOpenAuth.OpenId.Provider.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />

+          <add type="DotNetOpenAuth.OpenId.Provider.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.Provider" />

+        </behaviors>

+        <!-- Uncomment the following to activate the sample custom store.  -->

+        <!--<store type="RelyingPartyWebForms.CustomStore, RelyingPartyWebForms" />-->

+      </provider>

+    </openid>

+    <messaging>

+      <untrustedWebRequest>

+        <whitelistHosts>

+          <!-- since this is a sample, and will often be used with localhost -->

+          <add name="localhost" />

+        </whitelistHosts>

+      </untrustedWebRequest>

+    </messaging>

+    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->

+    <reporting enabled="true" />

+  </dotNetOpenAuth>

+  <appSettings />

+  <system.web>

+    <!-- 

+            Set compilation debug="true" to insert debugging 

+            symbols into the compiled page. Because this 

+            affects performance, set this value to true only 

+            during development.

+    -->

+    <compilation debug="true" targetFramework="4.0">

+      <assemblies>

+        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+        <remove assembly="DotNetOpenAuth.Contracts" />

+        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />

+      </assemblies>

+    </compilation>

+    <!--

+            The <authentication> section enables configuration 

+            of the security authentication mode used by 

+            ASP.NET to identify an incoming user. 

+    -->

+    <authentication mode="Forms">

+      <forms loginUrl="~/Account/LogOn" timeout="2880" name="ProviderMvcSession" />

+      <!-- named cookie prevents conflicts with other samples -->

+    </authentication>

+    <membership defaultProvider="AspNetReadOnlyXmlMembershipProvider">

+      <providers>

+        <clear />

+        <add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdProviderMvc.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider" xmlFileName="~/App_Data/Users.xml" />

+      </providers>

+    </membership>

+    <profile>

+      <providers>

+        <clear />

+        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="ApplicationServices" applicationName="/" />

+      </providers>

+    </profile>

+    <roleManager enabled="false">

+      <providers>

+        <clear />

+        <add connectionStringName="ApplicationServices" applicationName="/" name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+        <add applicationName="/" name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+      </providers>

+    </roleManager>

+    <!--

+            The <customErrors> section enables configuration 

+            of what to do if/when an unhandled error occurs 

+            during the execution of a request. Specifically, 

+            it enables developers to configure html error pages 

+            to be displayed in place of a error stack trace.

+

+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">

+            <error statusCode="403" redirect="NoAccess.htm" />

+            <error statusCode="404" redirect="FileNotFound.htm" />

+        </customErrors>

+    -->

+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">

+      <namespaces>

+        <add namespace="System.Web.Mvc" />

+        <add namespace="System.Web.Mvc.Ajax" />

+        <add namespace="System.Web.Mvc.Html" />

+        <add namespace="System.Web.Routing" />

+        <add namespace="System.Linq" />

+        <add namespace="System.Collections.Generic" />

+      </namespaces>

+    </pages>

+    <httpHandlers>

+      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+    </httpHandlers>

+  </system.web>

+  <system.web.extensions />

+  <!-- 

+        The system.webServer section is required for running ASP.NET AJAX under Internet

+        Information Services 7.0.  It is not necessary for previous version of IIS.

+  -->

+  <system.webServer>

+    <validation validateIntegratedModeConfiguration="false" />

+    <modules runAllManagedModulesForAllRequests="true" />

+    <handlers>

+      <remove name="MvcHttpHandler" />

+      <remove name="UrlRoutingHandler" />

+      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+    </handlers>

+  </system.webServer>

+  <runtime>

+    <!-- When targeting ASP.NET MVC 2, this assemblyBinding makes MVC 1 references relink

+         to MVC 2 so libraries such as DotNetOpenAuth that compile against MVC 1 will work with it. -->

+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

+      <dependentAssembly>

+        <assemblyIdentity name="DotNetOpenAuth.OpenId.RelyingParty" publicKeyToken="2780ccd10d57b246" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />

+      </dependentAssembly>

+      <dependentAssembly>

+        <assemblyIdentity name="DotNetOpenAuth.OpenId" publicKeyToken="2780ccd10d57b246" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.12030" newVersion="4.0.0.12030" />

+      </dependentAssembly>

+      <dependentAssembly>

+        <assemblyIdentity name="DotNetOpenAuth.Core" publicKeyToken="2780ccd10d57b246" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.12030" newVersion="4.0.0.12030" />

+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />

+        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />

+      </dependentAssembly>

+      <dependentAssembly>

+        <assemblyIdentity name="DotNetOpenAuth.Core.UI" publicKeyToken="2780ccd10d57b246" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.12030" newVersion="4.0.0.12030" />

+      </dependentAssembly>

+    </assemblyBinding>

+    <legacyHMACWarning enabled="0" />

+  </runtime>

+  <system.net>

+    <defaultProxy enabled="true" />

+    <settings>

+      <!-- This setting causes .NET to check certificate revocation lists (CRL) 

+			     before trusting HTTPS certificates.  But this setting tends to not 

+			     be allowed in shared hosting environments. -->

+      <!--<servicePointManager checkCertificateRevocationList="true"/>-->

+    </settings>

+  </system.net>

+  <uri>

+    <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+	     which is necessary for OpenID urls with unicode characters in the domain/host name. 

+	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+    <idn enabled="All" />

+    <iriParsing enabled="true" />

+  </uri>

 </configuration>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdProviderMvc/packages.config b/src/OpenID/OpenIdProviderMvc/packages.config
index 765974d..cfe9741 100644
--- a/src/OpenID/OpenIdProviderMvc/packages.config
+++ b/src/OpenID/OpenIdProviderMvc/packages.config
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Provider.UI" version="4.0.0-RC1" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Provider.UI" version="4.0.0.12084" />

 </packages>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj b/src/OpenID/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj
index 49929ff..d4e2b90 100644
--- a/src/OpenID/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj
+++ b/src/OpenID/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj
@@ -1,258 +1,258 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2A59DE0A-B76A-4B42-9A33-04D34548353D}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenIdProviderWebForms</RootNamespace>
-    <AssemblyName>OpenIdProviderWebForms</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.Core.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Common">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.Consumer">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.Provider">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.Provider.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.Provider.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenIdOAuth">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Extensions.Design" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-    <Reference Include="System.Web.ApplicationServices" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">
-      <RequiredTargetFramework>v4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Data\Users.xml" />
-    <Content Include="op_xrds.aspx" />
-    <Content Include="decide.aspx" />
-    <Content Include="Default.aspx" />
-    <Content Include="login.aspx" />
-    <Content Include="ProfileFields.ascx" />
-    <Content Include="server.aspx" />
-    <Content Include="user.aspx" />
-    <Content Include="Global.asax" />
-    <Content Include="Web.config" />
-    <Content Include="user_xrds.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="access_token.ashx.cs">
-      <DependentUpon>access_token.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="Code\InMemoryConsumerDescription.cs" />
-    <Compile Include="Code\InMemoryServiceProviderAccessToken.cs" />
-    <Compile Include="Code\CustomStore.cs" />
-    <Compile Include="Code\CustomStoreDataSet.Designer.cs">
-      <DependentUpon>CustomStoreDataSet.xsd</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Code\InMemoryServiceProviderRequestToken.cs" />
-    <Compile Include="Code\InMemoryTokenManager.cs" />
-    <Compile Include="Code\OAuthHybrid.cs" />
-    <Compile Include="Code\ReadOnlyXmlMembershipProvider.cs" />
-    <Compile Include="Code\TracePageAppender.cs" />
-    <Compile Include="Code\Util.cs" />
-    <Compile Include="decide.aspx.cs">
-      <DependentUpon>decide.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="decide.aspx.designer.cs">
-      <DependentUpon>decide.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="login.aspx.cs">
-      <DependentUpon>login.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="login.aspx.designer.cs">
-      <DependentUpon>login.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="ProfileFields.ascx.cs">
-      <DependentUpon>ProfileFields.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="ProfileFields.ascx.designer.cs">
-      <DependentUpon>ProfileFields.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Provider.ashx.cs">
-      <DependentUpon>Provider.ashx</DependentUpon>
-    </Compile>
-    <Compile Include="server.aspx.cs">
-      <DependentUpon>server.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="server.aspx.designer.cs">
-      <DependentUpon>server.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="TracePage.aspx.cs">
-      <DependentUpon>TracePage.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TracePage.aspx.designer.cs">
-      <DependentUpon>TracePage.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="user.aspx.cs">
-      <DependentUpon>user.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="user.aspx.designer.cs">
-      <DependentUpon>user.aspx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="favicon.ico" />
-    <Content Include="Site.Master" />
-    <Content Include="styles.css" />
-    <Content Include="TracePage.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="access_token.ashx" />
-    <None Include="Code\CustomStoreDataSet.xsc">
-      <DependentUpon>CustomStoreDataSet.xsd</DependentUpon>
-    </None>
-    <None Include="Code\CustomStoreDataSet.xsd">
-      <Generator>MSDataSetGenerator</Generator>
-      <LastGenOutput>CustomStoreDataSet.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Code\CustomStoreDataSet.xss">
-      <DependentUpon>CustomStoreDataSet.xsd</DependentUpon>
-    </None>
-    <Content Include="images\DotNetOpenAuth.png" />
-    <Content Include="Provider.ashx" />
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">
-      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>
-      <Name>DotNetOpenAuth.ApplicationBlock</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{2A59DE0A-B76A-4B42-9A33-04D34548353D}</ProjectGuid>

+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>OpenIdProviderWebForms</RootNamespace>

+    <AssemblyName>OpenIdProviderWebForms</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>3.5</OldToolsVersion>

+    <UpgradeBackupLocation />

+    <TargetFrameworkProfile />

+    <UseIISExpress>false</UseIISExpress>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>DEBUG</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>DEBUG</DefineConstants>

+    <DebugType>full</DebugType>

+    <PlatformTarget>AnyCPU</PlatformTarget>

+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>

+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.Core.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.Consumer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.Provider, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.Provider.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.Provider.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenIdOAuth, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>

+    </Reference>

+    <Reference Include="log4net">

+      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Data.DataSetExtensions" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Web" />

+    <Reference Include="System.Web.DynamicData" />

+    <Reference Include="System.Web.Entity" />

+    <Reference Include="System.Web.Extensions" />

+    <Reference Include="System.Web.Extensions.Design" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Web.Services" />

+    <Reference Include="System.EnterpriseServices" />

+    <Reference Include="System.Web.Mobile" />

+    <Reference Include="System.Web.ApplicationServices" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">

+      <RequiredTargetFramework>v4.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Xml.Linq" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="App_Data\Users.xml" />

+    <Content Include="op_xrds.aspx" />

+    <Content Include="decide.aspx" />

+    <Content Include="Default.aspx" />

+    <Content Include="login.aspx" />

+    <Content Include="ProfileFields.ascx" />

+    <Content Include="server.aspx" />

+    <Content Include="user.aspx" />

+    <Content Include="Global.asax" />

+    <Content Include="Web.config" />

+    <Content Include="user_xrds.aspx" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="access_token.ashx.cs">

+      <DependentUpon>access_token.ashx</DependentUpon>

+    </Compile>

+    <Compile Include="Code\InMemoryConsumerDescription.cs" />

+    <Compile Include="Code\InMemoryServiceProviderAccessToken.cs" />

+    <Compile Include="Code\CustomStore.cs" />

+    <Compile Include="Code\CustomStoreDataSet.Designer.cs">

+      <DependentUpon>CustomStoreDataSet.xsd</DependentUpon>

+      <AutoGen>True</AutoGen>

+      <DesignTime>True</DesignTime>

+    </Compile>

+    <Compile Include="Code\InMemoryServiceProviderRequestToken.cs" />

+    <Compile Include="Code\InMemoryTokenManager.cs" />

+    <Compile Include="Code\OAuthHybrid.cs" />

+    <Compile Include="Code\ReadOnlyXmlMembershipProvider.cs" />

+    <Compile Include="Code\TracePageAppender.cs" />

+    <Compile Include="Code\Util.cs" />

+    <Compile Include="decide.aspx.cs">

+      <DependentUpon>decide.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="decide.aspx.designer.cs">

+      <DependentUpon>decide.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Default.aspx.cs">

+      <DependentUpon>Default.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Default.aspx.designer.cs">

+      <DependentUpon>Default.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Global.asax.cs">

+      <DependentUpon>Global.asax</DependentUpon>

+    </Compile>

+    <Compile Include="login.aspx.cs">

+      <DependentUpon>login.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="login.aspx.designer.cs">

+      <DependentUpon>login.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="ProfileFields.ascx.cs">

+      <DependentUpon>ProfileFields.ascx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="ProfileFields.ascx.designer.cs">

+      <DependentUpon>ProfileFields.ascx</DependentUpon>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="Provider.ashx.cs">

+      <DependentUpon>Provider.ashx</DependentUpon>

+    </Compile>

+    <Compile Include="server.aspx.cs">

+      <DependentUpon>server.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="server.aspx.designer.cs">

+      <DependentUpon>server.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="TracePage.aspx.cs">

+      <DependentUpon>TracePage.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="TracePage.aspx.designer.cs">

+      <DependentUpon>TracePage.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="user.aspx.cs">

+      <DependentUpon>user.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="user.aspx.designer.cs">

+      <DependentUpon>user.aspx</DependentUpon>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="favicon.ico" />

+    <Content Include="Site.Master" />

+    <Content Include="styles.css" />

+    <Content Include="TracePage.aspx" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="access_token.ashx" />

+    <None Include="Code\CustomStoreDataSet.xsc">

+      <DependentUpon>CustomStoreDataSet.xsd</DependentUpon>

+    </None>

+    <None Include="Code\CustomStoreDataSet.xsd">

+      <Generator>MSDataSetGenerator</Generator>

+      <LastGenOutput>CustomStoreDataSet.Designer.cs</LastGenOutput>

+      <SubType>Designer</SubType>

+    </None>

+    <None Include="Code\CustomStoreDataSet.xss">

+      <DependentUpon>CustomStoreDataSet.xsd</DependentUpon>

+    </None>

+    <Content Include="images\DotNetOpenAuth.png" />

+    <Content Include="Provider.ashx" />

+    <Content Include="packages.config" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">

+      <Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>

+      <Name>DotNetOpenAuth.ApplicationBlock</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>4860</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  -->

+  <ProjectExtensions>

+    <VisualStudio>

+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

+        <WebProjectProperties>

+          <UseIIS>False</UseIIS>

+          <AutoAssignPort>False</AutoAssignPort>

+          <DevelopmentServerPort>4860</DevelopmentServerPort>

+          <DevelopmentServerVPath>/</DevelopmentServerVPath>

+          <IISUrl>

+          </IISUrl>

+          <NTLMAuthentication>False</NTLMAuthentication>

+          <UseCustomServer>False</UseCustomServer>

+          <CustomServerUrl>

+          </CustomServerUrl>

+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>

+        </WebProjectProperties>

+      </FlavorProperties>

+    </VisualStudio>

+  </ProjectExtensions>

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdProviderWebForms/Web.config b/src/OpenID/OpenIdProviderWebForms/Web.config
index 227c065..49058f0 100644
--- a/src/OpenID/OpenIdProviderWebForms/Web.config
+++ b/src/OpenID/OpenIdProviderWebForms/Web.config
@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />
-    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
-      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
-      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-    </sectionGroup>
-  </configSections>
-  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-       which is necessary for OpenID urls with unicode characters in the domain/host name. 
-       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-  <uri>
-    <idn enabled="All" />
-    <iriParsing enabled="true" />
-  </uri>
-  <system.net>
-    <defaultProxy enabled="true" />
-    <settings>
-      <!-- This setting causes .NET to check certificate revocation lists (CRL) 
-           before trusting HTTPS certificates.  But this setting tends to not 
-           be allowed in shared hosting environments. -->
-      <!--<servicePointManager checkCertificateRevocationList="true"/>-->
-    </settings>
-  </system.net>
-  <!-- this is an optional configuration section where aspects of DotNetOpenAuth can be customized -->
-  <dotNetOpenAuth>
-    <openid>
-      <provider>
-        <security requireSsl="false" />
-        <behaviors>
-          <!-- Behaviors activate themselves automatically for individual matching requests. 
-               The first one in this list to match an incoming request "owns" the request.  If no
-               profile matches, the default behavior is assumed. -->
-          <!--<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />-->
-        </behaviors>
-        <!-- Uncomment the following to activate the sample custom store.  -->
-        <!--<store type="OpenIdProviderWebForms.Code.CustomStore, OpenIdProviderWebForms" />-->
-      </provider>
-    </openid>
-    <messaging>
-      <untrustedWebRequest>
-        <whitelistHosts>
-          <!-- since this is a sample, and will often be used with localhost -->
-          <add name="localhost" />
-        </whitelistHosts>
-      </untrustedWebRequest>
-    </messaging>
-    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-    <reporting enabled="true" />
-  </dotNetOpenAuth>
-  <appSettings>
-    <!-- Get your own Yubico API key here: https://upgrade.yubico.com/getapikey/ -->
-    <add key="YubicoAPIKey" value="3961" />
-  </appSettings>
-  <system.web>
-    <!-- 
-            Set compilation debug="true" to insert debugging 
-            symbols into the compiled page. Because this 
-            affects performance, set this value to true only 
-            during development.
-        -->
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <remove assembly="DotNetOpenAuth.Contracts" />
-      </assemblies>
-    </compilation>
-    <sessionState mode="InProc" cookieless="false" />
-    <membership defaultProvider="AspNetReadOnlyXmlMembershipProvider">
-      <providers>
-        <clear />
-        <add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdProviderWebForms.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider" xmlFileName="~/App_Data/Users.xml" />
-      </providers>
-    </membership>
-    <authentication mode="Forms">
-      <!-- named cookie prevents conflicts with other samples -->
-      <forms name="OpenIdProviderWebForms" />
-    </authentication>
-    <customErrors mode="RemoteOnly" />
-    <!-- Trust level discussion:
-    Full: everything works (this is required for Google Apps for Domains support)
-    High: TRACE compilation symbol must NOT be defined
-    Medium: doesn't work unless originUrl=".*" or WebPermission.Connect is extended, and Google Apps doesn't work.
-    Low: doesn't work because WebPermission.Connect is denied.
-    -->
-    <trust level="Medium" originUrl=".*" />
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />
-  </system.web>
-  <location path="decide.aspx">
-    <system.web>
-      <authorization>
-        <deny users="?" />
-      </authorization>
-    </system.web>
-  </location>
-  <!-- log4net is a 3rd party (free) logger library that DotNetOpenAuth will use if present but does not require. -->
-  <log4net>
-    <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="Provider.log" />
-      <appendToFile value="true" />
-      <rollingStyle value="Size" />
-      <maxSizeRollBackups value="10" />
-      <maximumFileSize value="100KB" />
-      <staticLogFileName value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="TracePageAppender" type="OpenIdProviderWebForms.Code.TracePageAppender, OpenIdProviderWebForms">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />
-      </layout>
-    </appender>
-    <!-- Setup the root category, add the appenders and set the default level -->
-    <root>
-      <level value="INFO" />
-      <!--<appender-ref ref="RollingFileAppender" />-->
-      <appender-ref ref="TracePageAppender" />
-    </root>
-    <!-- Specify the level for some specific categories -->
-    <logger name="DotNetOpenAuth">
-      <level value="INFO" />
-    </logger>
-  </log4net>
-  <runtime>
-    <legacyHMACWarning enabled="0" />
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <configSections>

+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />

+    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">

+      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />

+      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />

+    </sectionGroup>

+  </configSections>

+  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+       which is necessary for OpenID urls with unicode characters in the domain/host name. 

+       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+  <!-- this is an optional configuration section where aspects of DotNetOpenAuth can be customized -->

+  <dotNetOpenAuth>

+    <openid>

+      <provider>

+        <security requireSsl="false" />

+        <behaviors>

+          <!-- Behaviors activate themselves automatically for individual matching requests. 

+               The first one in this list to match an incoming request "owns" the request.  If no

+               profile matches, the default behavior is assumed. -->

+          <!--<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />-->

+        </behaviors>

+        <!-- Uncomment the following to activate the sample custom store.  -->

+        <!--<store type="OpenIdProviderWebForms.Code.CustomStore, OpenIdProviderWebForms" />-->

+      </provider>

+    </openid>

+    <messaging>

+      <untrustedWebRequest>

+        <whitelistHosts>

+          <!-- since this is a sample, and will often be used with localhost -->

+          <add name="localhost" />

+        </whitelistHosts>

+      </untrustedWebRequest>

+    </messaging>

+    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->

+    <reporting enabled="true" />

+  </dotNetOpenAuth>

+  <appSettings>

+    <!-- Get your own Yubico API key here: https://upgrade.yubico.com/getapikey/ -->

+    <add key="YubicoAPIKey" value="3961" />

+  </appSettings>

+  <system.web>

+    <!-- 

+            Set compilation debug="true" to insert debugging 

+            symbols into the compiled page. Because this 

+            affects performance, set this value to true only 

+            during development.

+        -->

+    <compilation debug="true" targetFramework="4.0">

+      <assemblies>

+        <remove assembly="DotNetOpenAuth.Contracts" />

+      </assemblies>

+    </compilation>

+    <sessionState mode="InProc" cookieless="false" />

+    <membership defaultProvider="AspNetReadOnlyXmlMembershipProvider">

+      <providers>

+        <clear />

+        <add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdProviderWebForms.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider" xmlFileName="~/App_Data/Users.xml" />

+      </providers>

+    </membership>

+    <authentication mode="Forms">

+      <!-- named cookie prevents conflicts with other samples -->

+      <forms name="OpenIdProviderWebForms" />

+    </authentication>

+    <customErrors mode="RemoteOnly" />

+    <!-- Trust level discussion:

+    Full: everything works (this is required for Google Apps for Domains support)

+    High: TRACE compilation symbol must NOT be defined

+    Medium: doesn't work unless originUrl=".*" or WebPermission.Connect is extended, and Google Apps doesn't work.

+    Low: doesn't work because WebPermission.Connect is denied.

+    -->

+    <trust level="Medium" originUrl=".*" />

+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />

+  </system.web>

+  <location path="decide.aspx">

+    <system.web>

+      <authorization>

+        <deny users="?" />

+      </authorization>

+    </system.web>

+  </location>

+  <!-- log4net is a 3rd party (free) logger library that DotNetOpenAuth will use if present but does not require. -->

+  <log4net>

+    <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">

+      <file value="Provider.log" />

+      <appendToFile value="true" />

+      <rollingStyle value="Size" />

+      <maxSizeRollBackups value="10" />

+      <maximumFileSize value="100KB" />

+      <staticLogFileName value="true" />

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

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

+      </layout>

+    </appender>

+    <appender name="TracePageAppender" type="OpenIdProviderWebForms.Code.TracePageAppender, OpenIdProviderWebForms">

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

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

+      </layout>

+    </appender>

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

+    <root>

+      <level value="INFO" />

+      <!--<appender-ref ref="RollingFileAppender" />-->

+      <appender-ref ref="TracePageAppender" />

+    </root>

+    <!-- Specify the level for some specific categories -->

+    <logger name="DotNetOpenAuth">

+      <level value="INFO" />

+    </logger>

+  </log4net>

+  <uri>

+    <!-- See an error due to this section?  When targeting .NET 3.5, please add the following line to your <configSections> at the top of this file:

+		<section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+		-->

+    <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+	     which is necessary for OpenID urls with unicode characters in the domain/host name. 

+	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+    <idn enabled="All" />

+    <iriParsing enabled="true" />

+  </uri>

+  <system.net>

+    <defaultProxy enabled="true" />

+    <settings>

+      <!-- This setting causes .NET to check certificate revocation lists (CRL) 

+			     before trusting HTTPS certificates.  But this setting tends to not 

+			     be allowed in shared hosting environments. -->

+      <!--<servicePointManager checkCertificateRevocationList="true"/>-->

+    </settings>

+  </system.net>

+  <runtime>

+    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->

+    <legacyHMACWarning enabled="0" />

+  </runtime>

 </configuration>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdProviderWebForms/packages.config b/src/OpenID/OpenIdProviderWebForms/packages.config
index 7ddb5e3..f09d52e 100644
--- a/src/OpenID/OpenIdProviderWebForms/packages.config
+++ b/src/OpenID/OpenIdProviderWebForms/packages.config
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Provider.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0-RC1" />
-  <package id="log4net" version="2.0.0" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Provider.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0.12084" />

+  <package id="log4net" version="2.0.0" />

 </packages>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj b/src/OpenID/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
index f80fd01..8249a65 100644
--- a/src/OpenID/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
+++ b/src/OpenID/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
@@ -1,188 +1,188 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}</ProjectGuid>
-    <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenIdRelyingPartyMvc</RootNamespace>
-    <AssemblyName>OpenIdRelyingPartyMvc</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.Core.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Mvc" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\UserController.cs" />
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Views\Shared\Site.Master.cs">
-      <DependentUpon>Site.Master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Views\Shared\Site.Master.designer.cs">
-      <DependentUpon>Site.Master</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Content\css\openidlogin.css" />
-    <Content Include="Content\images\aol.gif" />
-    <Content Include="Content\images\facebook.gif" />
-    <Content Include="Content\images\google.gif" />
-    <Content Include="Content\images\openid.png" />
-    <Content Include="Content\images\openid_small.gif" />
-    <Content Include="Content\images\yahoo.gif" />
-    <Content Include="Content\scripts\jquery-1.3.1.js" />
-    <Content Include="Content\scripts\jquery-ui-personalized-1.6rc6.js" />
-    <Content Include="Content\scripts\jquery-ui-personalized-1.6rc6.min.js" />
-    <Content Include="Content\theme\images\ui-bg_flat_55_999999_40x100.png" />
-    <Content Include="Content\theme\images\ui-bg_flat_75_aaaaaa_40x100.png" />
-    <Content Include="Content\theme\images\ui-bg_glass_45_0078ae_1x400.png" />
-    <Content Include="Content\theme\images\ui-bg_glass_55_f8da4e_1x400.png" />
-    <Content Include="Content\theme\images\ui-bg_glass_75_79c9ec_1x400.png" />
-    <Content Include="Content\theme\images\ui-bg_gloss-wave_45_e14f1c_500x100.png" />
-    <Content Include="Content\theme\images\ui-bg_gloss-wave_50_6eac2c_500x100.png" />
-    <Content Include="Content\theme\images\ui-bg_gloss-wave_75_2191c0_500x100.png" />
-    <Content Include="Content\theme\images\ui-bg_inset-hard_100_fcfdfd_1x100.png" />
-    <Content Include="Content\theme\images\ui-icons_0078ae_256x240.png" />
-    <Content Include="Content\theme\images\ui-icons_056b93_256x240.png" />
-    <Content Include="Content\theme\images\ui-icons_d8e7f3_256x240.png" />
-    <Content Include="Content\theme\images\ui-icons_e0fdff_256x240.png" />
-    <Content Include="Content\theme\images\ui-icons_f5e175_256x240.png" />
-    <Content Include="Content\theme\images\ui-icons_f7a50d_256x240.png" />
-    <Content Include="Content\theme\images\ui-icons_fcd113_256x240.png" />
-    <Content Include="Content\theme\ui.accordion.css" />
-    <Content Include="Content\theme\ui.all.css" />
-    <Content Include="Content\theme\ui.base.css" />
-    <Content Include="Content\theme\ui.core.css" />
-    <Content Include="Content\theme\ui.datepicker.css" />
-    <Content Include="Content\theme\ui.dialog.css" />
-    <Content Include="Content\theme\ui.progressbar.css" />
-    <Content Include="Content\theme\ui.resizable.css" />
-    <Content Include="Content\theme\ui.slider.css" />
-    <Content Include="Content\theme\ui.tabs.css" />
-    <Content Include="Content\theme\ui.theme.css" />
-    <Content Include="Default.aspx" />
-    <Content Include="favicon.ico" />
-    <Content Include="Global.asax" />
-    <Content Include="Views\User\Index.aspx" />
-    <Content Include="Views\User\Login.aspx" />
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Content\Site.css" />
-    <Content Include="Views\Home\Index.aspx" />
-    <Content Include="Views\Shared\Site.Master" />
-    <Content Include="Views\Web.config" />
-    <Content Include="Views\Home\xrds.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-    <Folder Include="Models\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}</ProjectGuid>

+    <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>OpenIdRelyingPartyMvc</RootNamespace>

+    <AssemblyName>OpenIdRelyingPartyMvc</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <MvcBuildViews>false</MvcBuildViews>

+    <TargetFrameworkProfile />

+    <UseIISExpress>false</UseIISExpress>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.Core.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="log4net">

+      <HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Data.DataSetExtensions" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Web.ApplicationServices" />

+    <Reference Include="System.Web.DynamicData" />

+    <Reference Include="System.Web.Entity" />

+    <Reference Include="System.ComponentModel.DataAnnotations">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Web.Extensions" />

+    <Reference Include="System.Web.Mvc" />

+    <Reference Include="System.Web" />

+    <Reference Include="System.Web.Abstractions" />

+    <Reference Include="System.Web.Routing" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Web.Services" />

+    <Reference Include="System.EnterpriseServices" />

+    <Reference Include="System.Web.Mobile" />

+    <Reference Include="System.Xml.Linq" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Controllers\HomeController.cs" />

+    <Compile Include="Controllers\UserController.cs" />

+    <Compile Include="Global.asax.cs">

+      <DependentUpon>Global.asax</DependentUpon>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="Views\Shared\Site.Master.cs">

+      <DependentUpon>Site.Master</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Views\Shared\Site.Master.designer.cs">

+      <DependentUpon>Site.Master</DependentUpon>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="Content\css\openidlogin.css" />

+    <Content Include="Content\images\aol.gif" />

+    <Content Include="Content\images\facebook.gif" />

+    <Content Include="Content\images\google.gif" />

+    <Content Include="Content\images\openid.png" />

+    <Content Include="Content\images\openid_small.gif" />

+    <Content Include="Content\images\yahoo.gif" />

+    <Content Include="Content\scripts\jquery-1.3.1.js" />

+    <Content Include="Content\scripts\jquery-ui-personalized-1.6rc6.js" />

+    <Content Include="Content\scripts\jquery-ui-personalized-1.6rc6.min.js" />

+    <Content Include="Content\theme\images\ui-bg_flat_55_999999_40x100.png" />

+    <Content Include="Content\theme\images\ui-bg_flat_75_aaaaaa_40x100.png" />

+    <Content Include="Content\theme\images\ui-bg_glass_45_0078ae_1x400.png" />

+    <Content Include="Content\theme\images\ui-bg_glass_55_f8da4e_1x400.png" />

+    <Content Include="Content\theme\images\ui-bg_glass_75_79c9ec_1x400.png" />

+    <Content Include="Content\theme\images\ui-bg_gloss-wave_45_e14f1c_500x100.png" />

+    <Content Include="Content\theme\images\ui-bg_gloss-wave_50_6eac2c_500x100.png" />

+    <Content Include="Content\theme\images\ui-bg_gloss-wave_75_2191c0_500x100.png" />

+    <Content Include="Content\theme\images\ui-bg_inset-hard_100_fcfdfd_1x100.png" />

+    <Content Include="Content\theme\images\ui-icons_0078ae_256x240.png" />

+    <Content Include="Content\theme\images\ui-icons_056b93_256x240.png" />

+    <Content Include="Content\theme\images\ui-icons_d8e7f3_256x240.png" />

+    <Content Include="Content\theme\images\ui-icons_e0fdff_256x240.png" />

+    <Content Include="Content\theme\images\ui-icons_f5e175_256x240.png" />

+    <Content Include="Content\theme\images\ui-icons_f7a50d_256x240.png" />

+    <Content Include="Content\theme\images\ui-icons_fcd113_256x240.png" />

+    <Content Include="Content\theme\ui.accordion.css" />

+    <Content Include="Content\theme\ui.all.css" />

+    <Content Include="Content\theme\ui.base.css" />

+    <Content Include="Content\theme\ui.core.css" />

+    <Content Include="Content\theme\ui.datepicker.css" />

+    <Content Include="Content\theme\ui.dialog.css" />

+    <Content Include="Content\theme\ui.progressbar.css" />

+    <Content Include="Content\theme\ui.resizable.css" />

+    <Content Include="Content\theme\ui.slider.css" />

+    <Content Include="Content\theme\ui.tabs.css" />

+    <Content Include="Content\theme\ui.theme.css" />

+    <Content Include="Default.aspx" />

+    <Content Include="favicon.ico" />

+    <Content Include="Global.asax" />

+    <Content Include="Views\User\Index.aspx" />

+    <Content Include="Views\User\Login.aspx" />

+    <Content Include="Web.config">

+      <SubType>Designer</SubType>

+    </Content>

+    <Content Include="Content\Site.css" />

+    <Content Include="Views\Home\Index.aspx" />

+    <Content Include="Views\Shared\Site.Master" />

+    <Content Include="Views\Web.config" />

+    <Content Include="Views\Home\xrds.aspx" />

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="App_Data\" />

+    <Folder Include="Models\" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="packages.config" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
-  </Target> -->
-  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>54347</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  </Target> -->

+  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">

+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />

+  </Target>

+  <ProjectExtensions>

+    <VisualStudio>

+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

+        <WebProjectProperties>

+          <UseIIS>False</UseIIS>

+          <AutoAssignPort>True</AutoAssignPort>

+          <DevelopmentServerPort>54347</DevelopmentServerPort>

+          <DevelopmentServerVPath>/</DevelopmentServerVPath>

+          <IISUrl>

+          </IISUrl>

+          <NTLMAuthentication>False</NTLMAuthentication>

+          <UseCustomServer>False</UseCustomServer>

+          <CustomServerUrl>

+          </CustomServerUrl>

+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>

+        </WebProjectProperties>

+      </FlavorProperties>

+    </VisualStudio>

+  </ProjectExtensions>

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdRelyingPartyMvc/Web.config b/src/OpenID/OpenIdRelyingPartyMvc/Web.config
index 59d0e7d..123f3dd 100644
--- a/src/OpenID/OpenIdRelyingPartyMvc/Web.config
+++ b/src/OpenID/OpenIdRelyingPartyMvc/Web.config
@@ -1,134 +1,132 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
-      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
-      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-    </sectionGroup>
-  </configSections>
-  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-       which is necessary for OpenID urls with unicode characters in the domain/host name. 
-       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-  <uri>
-    <idn enabled="All" />
-    <iriParsing enabled="true" />
-  </uri>
-  <system.net>
-    <defaultProxy enabled="true" />
-    <settings>
-      <!-- This setting causes .NET to check certificate revocation lists (CRL) 
-           before trusting HTTPS certificates.  But this setting tends to not 
-           be allowed in shared hosting environments. -->
-      <!--<servicePointManager checkCertificateRevocationList="true"/>-->
-    </settings>
-  </system.net>
-  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->
-  <dotNetOpenAuth>
-    <openid>
-      <relyingParty>
-        <security requireSsl="false">
-          <!-- Uncomment the trustedProviders tag if your relying party should only accept positive assertions from a closed set of OpenID Providers. -->
-          <!--<trustedProviders rejectAssertionsFromUntrustedProviders="true">
-            <add endpoint="https://www.google.com/accounts/o8/ud" />
-          </trustedProviders>-->
-        </security>
-        <behaviors>
-          <!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
-                 with OPs that use Attribute Exchange (in various formats). -->
-          <add type="DotNetOpenAuth.OpenId.RelyingParty.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.RelyingParty" />
-        </behaviors>
-      </relyingParty>
-    </openid>
-    <messaging>
-      <untrustedWebRequest>
-        <whitelistHosts>
-          <!-- since this is a sample, and will often be used with localhost -->
-          <add name="localhost" />
-        </whitelistHosts>
-      </untrustedWebRequest>
-    </messaging>
-    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-    <reporting enabled="true" />
-  </dotNetOpenAuth>
-  <appSettings />
-  <connectionStrings />
-  <system.web>
-    <!-- 
-      Set compilation debug="true" to insert debugging 
-      symbols into the compiled page. Because this 
-      affects performance, set this value to true only 
-      during development.
-    -->
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <remove assembly="DotNetOpenAuth.Contracts" />
-        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-      </assemblies>
-    </compilation>
-    <!--
-      The <authentication> section enables configuration 
-      of the security authentication mode used by 
-      ASP.NET to identify an incoming user. 
-    -->
-    <authentication mode="Forms">
-      <forms defaultUrl="~/Home" loginUrl="~/User/Login" name="OpenIdRelyingPartyMvcSession" />
-      <!-- named cookie prevents conflicts with other samples -->
-    </authentication>
-    <!--
-          The <customErrors> section enables configuration 
-          of what to do if/when an unhandled error occurs 
-          during the execution of a request. Specifically, 
-          it enables developers to configure html error pages 
-          to be displayed in place of a error stack trace.
-
-      <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
-        <error statusCode="403" redirect="NoAccess.htm" />
-        <error statusCode="404" redirect="FileNotFound.htm" />
-      </customErrors>
-    -->
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="System.Linq" />
-        <add namespace="System.Collections.Generic" />
-      </namespaces>
-    </pages>
-    <httpHandlers>
-      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    </httpHandlers>
-  </system.web>
-  <system.web.extensions />
-  <!-- 
-    The system.webServer section is required for running ASP.NET AJAX under Internet
-    Information Services 7.0.  It is not necessary for previous version of IIS.
-  -->
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true" />
-    <handlers>
-      <remove name="MvcHttpHandler" />
-      <remove name="UrlRoutingHandler" />
-      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    </handlers>
-  </system.webServer>
-  <runtime>
-    <legacyHMACWarning enabled="0" />
-    <!-- When targeting ASP.NET MVC 2, this assemblyBinding makes MVC 1 references relink
-         to MVC 2 so libraries such as DotNetOpenAuth that compile against MVC 1 will work with it. -->
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <configSections>

+    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">

+      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />

+      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />

+    </sectionGroup>

+  </configSections>

+  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+       which is necessary for OpenID urls with unicode characters in the domain/host name. 

+       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->

+  <dotNetOpenAuth>

+    <messaging>

+      <untrustedWebRequest>

+        <whitelistHosts>

+          <!-- since this is a sample, and will often be used with localhost -->

+          <add name="localhost" />

+        </whitelistHosts>

+      </untrustedWebRequest>

+    </messaging>

+    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->

+    <reporting enabled="true" />

+    <openid>

+      <relyingParty>

+        <security requireSsl="false">

+          <!-- Uncomment the trustedProviders tag if your relying party should only accept positive assertions from a closed set of OpenID Providers. -->

+          <!--<trustedProviders rejectAssertionsFromUntrustedProviders="true">

+						<add endpoint="https://www.google.com/accounts/o8/ud" />

+					</trustedProviders>-->

+        </security>

+        <behaviors>

+          <!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible

+					     with OPs that use Attribute Exchange (in various formats). -->

+          <add type="DotNetOpenAuth.OpenId.RelyingParty.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.RelyingParty" />

+        </behaviors>

+      </relyingParty>

+    </openid>

+  </dotNetOpenAuth>

+  <appSettings />

+  <connectionStrings />

+  <system.web>

+    <!-- 

+      Set compilation debug="true" to insert debugging 

+      symbols into the compiled page. Because this 

+      affects performance, set this value to true only 

+      during development.

+    -->

+    <compilation debug="true" targetFramework="4.0">

+      <assemblies>

+        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+        <remove assembly="DotNetOpenAuth.Contracts" />

+        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />

+      </assemblies>

+    </compilation>

+    <!--

+      The <authentication> section enables configuration 

+      of the security authentication mode used by 

+      ASP.NET to identify an incoming user. 

+    -->

+    <authentication mode="Forms">

+      <forms defaultUrl="~/Home" loginUrl="~/User/Login" name="OpenIdRelyingPartyMvcSession" />

+      <!-- named cookie prevents conflicts with other samples -->

+    </authentication>

+    <!--

+          The <customErrors> section enables configuration 

+          of what to do if/when an unhandled error occurs 

+          during the execution of a request. Specifically, 

+          it enables developers to configure html error pages 

+          to be displayed in place of a error stack trace.

+

+      <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">

+        <error statusCode="403" redirect="NoAccess.htm" />

+        <error statusCode="404" redirect="FileNotFound.htm" />

+      </customErrors>

+    -->

+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">

+      <namespaces>

+        <add namespace="System.Web.Mvc" />

+        <add namespace="System.Web.Mvc.Ajax" />

+        <add namespace="System.Web.Mvc.Html" />

+        <add namespace="System.Web.Routing" />

+        <add namespace="System.Linq" />

+        <add namespace="System.Collections.Generic" />

+      </namespaces>

+    </pages>

+    <httpHandlers>

+      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+    </httpHandlers>

+  </system.web>

+  <system.web.extensions />

+  <!-- 

+    The system.webServer section is required for running ASP.NET AJAX under Internet

+    Information Services 7.0.  It is not necessary for previous version of IIS.

+  -->

+  <system.webServer>

+    <validation validateIntegratedModeConfiguration="false" />

+    <modules runAllManagedModulesForAllRequests="true" />

+    <handlers>

+      <remove name="MvcHttpHandler" />

+      <remove name="UrlRoutingHandler" />

+      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+    </handlers>

+  </system.webServer>

+  <system.net>

+    <defaultProxy enabled="true" />

+    <settings>

+      <!-- This setting causes .NET to check certificate revocation lists (CRL) 

+			     before trusting HTTPS certificates.  But this setting tends to not 

+			     be allowed in shared hosting environments. -->

+      <!--<servicePointManager checkCertificateRevocationList="true"/>-->

+    </settings>

+  </system.net>

+  <runtime>

+    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->

+    <legacyHMACWarning enabled="0" />

+  </runtime>

+  <uri>

+    <!-- See an error due to this section?  When targeting .NET 3.5, please add the following line to your <configSections> at the top of this file:

+		<section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+		-->

+    <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+	     which is necessary for OpenID urls with unicode characters in the domain/host name. 

+	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+    <idn enabled="All" />

+    <iriParsing enabled="true" />

+  </uri>

 </configuration>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdRelyingPartyMvc/packages.config b/src/OpenID/OpenIdRelyingPartyMvc/packages.config
index e4866e8..cffb581 100644
--- a/src/OpenID/OpenIdRelyingPartyMvc/packages.config
+++ b/src/OpenID/OpenIdRelyingPartyMvc/packages.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.RelyingParty.UI" version="4.0.0-RC1" />
-  <package id="log4net" version="2.0.0" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.RelyingParty.UI" version="4.0.0.12084" />

+  <package id="log4net" version="2.0.0" />

 </packages>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj b/src/OpenID/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj
index a248d76..2f1460d 100644
--- a/src/OpenID/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj
+++ b/src/OpenID/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj
@@ -1,157 +1,157 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0B4EB2A8-283D-48FB-BCD0-85B8DFFE05E4}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenIdWebRingSsoProvider</RootNamespace>
-    <AssemblyName>OpenIdWebRingSsoProvider</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.Core.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.Provider">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.Provider.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.Provider.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-    <Reference Include="System.Web.ApplicationServices" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">
-      <RequiredTargetFramework>v4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Data\Users.xml" />
-    <Content Include="Default.aspx" />
-    <Content Include="Login.aspx" />
-    <Content Include="op_xrds.aspx" />
-    <Content Include="Server.aspx" />
-    <Content Include="user.aspx" />
-    <Content Include="user_xrds.aspx" />
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Code\ReadOnlyXmlMembershipProvider.cs" />
-    <Compile Include="Code\Util.cs" />
-    <Compile Include="Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Login.aspx.cs">
-      <DependentUpon>Login.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Login.aspx.designer.cs">
-      <DependentUpon>Login.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Server.aspx.cs">
-      <DependentUpon>Server.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Server.aspx.designer.cs">
-      <DependentUpon>Server.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="user.aspx.cs">
-      <DependentUpon>user.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="user.aspx.designer.cs">
-      <DependentUpon>user.aspx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{0B4EB2A8-283D-48FB-BCD0-85B8DFFE05E4}</ProjectGuid>

+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>OpenIdWebRingSsoProvider</RootNamespace>

+    <AssemblyName>OpenIdWebRingSsoProvider</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>3.5</OldToolsVersion>

+    <UpgradeBackupLocation />

+    <TargetFrameworkProfile />

+    <UseIISExpress>false</UseIISExpress>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.Core.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.Provider, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.Provider.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Provider.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.Provider.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Data.DataSetExtensions" />

+    <Reference Include="System.Web.DynamicData" />

+    <Reference Include="System.Web.Entity" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Web" />

+    <Reference Include="System.Web.Extensions" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Web.Services" />

+    <Reference Include="System.EnterpriseServices" />

+    <Reference Include="System.Web.Mobile" />

+    <Reference Include="System.Web.ApplicationServices" Condition=" '$(TargetFrameworkVersion)' != 'v3.5' ">

+      <RequiredTargetFramework>v4.0</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Xml.Linq" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="App_Data\Users.xml" />

+    <Content Include="Default.aspx" />

+    <Content Include="Login.aspx" />

+    <Content Include="op_xrds.aspx" />

+    <Content Include="Server.aspx" />

+    <Content Include="user.aspx" />

+    <Content Include="user_xrds.aspx" />

+    <Content Include="Web.config" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Code\ReadOnlyXmlMembershipProvider.cs" />

+    <Compile Include="Code\Util.cs" />

+    <Compile Include="Default.aspx.cs">

+      <SubType>ASPXCodeBehind</SubType>

+      <DependentUpon>Default.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Default.aspx.designer.cs">

+      <DependentUpon>Default.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Login.aspx.cs">

+      <DependentUpon>Login.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Login.aspx.designer.cs">

+      <DependentUpon>Login.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="Server.aspx.cs">

+      <DependentUpon>Server.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Server.aspx.designer.cs">

+      <DependentUpon>Server.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="user.aspx.cs">

+      <DependentUpon>user.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="user.aspx.designer.cs">

+      <DependentUpon>user.aspx</DependentUpon>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="packages.config" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>39167</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  -->

+  <ProjectExtensions>

+    <VisualStudio>

+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

+        <WebProjectProperties>

+          <UseIIS>False</UseIIS>

+          <AutoAssignPort>False</AutoAssignPort>

+          <DevelopmentServerPort>39167</DevelopmentServerPort>

+          <DevelopmentServerVPath>/</DevelopmentServerVPath>

+          <IISUrl>

+          </IISUrl>

+          <NTLMAuthentication>False</NTLMAuthentication>

+          <UseCustomServer>False</UseCustomServer>

+          <CustomServerUrl>

+          </CustomServerUrl>

+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>

+        </WebProjectProperties>

+      </FlavorProperties>

+    </VisualStudio>

+  </ProjectExtensions>

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdWebRingSsoProvider/Web.config b/src/OpenID/OpenIdWebRingSsoProvider/Web.config
index 13684f0..1c16c9a 100644
--- a/src/OpenID/OpenIdWebRingSsoProvider/Web.config
+++ b/src/OpenID/OpenIdWebRingSsoProvider/Web.config
@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />
-    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
-      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
-      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-    </sectionGroup>
-  </configSections>
-  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-       which is necessary for OpenID urls with unicode characters in the domain/host name. 
-       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-  <uri>
-    <idn enabled="All" />
-    <iriParsing enabled="true" />
-  </uri>
-  <system.net>
-    <defaultProxy enabled="true" />
-    <settings>
-      <!-- This setting causes .NET to check certificate revocation lists (CRL) 
-           before trusting HTTPS certificates.  But this setting tends to not 
-           be allowed in shared hosting environments. -->
-      <!--<servicePointManager checkCertificateRevocationList="true"/>-->
-    </settings>
-  </system.net>
-  <!-- this is an optional configuration section where aspects of DotNetOpenAuth can be customized -->
-  <dotNetOpenAuth>
-    <openid>
-      <provider>
-        <security requireSsl="false" />
-        <behaviors>
-          <!-- Behaviors activate themselves automatically for individual matching requests. 
-               The first one in this list to match an incoming request "owns" the request.  If no
-               profile matches, the default behavior is assumed. -->
-          <!--<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />-->
-        </behaviors>
-      </provider>
-    </openid>
-    <messaging>
-      <untrustedWebRequest>
-        <whitelistHosts>
-          <!-- since this is a sample, and will often be used with localhost -->
-          <add name="localhost" />
-        </whitelistHosts>
-      </untrustedWebRequest>
-    </messaging>
-    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-    <reporting enabled="true" />
-  </dotNetOpenAuth>
-  <appSettings>
-    <add key="whitelistedRealms" value="http://localhost:39165/;http://othertrustedrealm/" />
-    <!-- Set ImplicitAuth to true when using Windows auth, or false for FormsAuthentication -->
-    <add key="ImplicitAuth" value="true" />
-  </appSettings>
-  <connectionStrings />
-  <system.web>
-    <!-- 
-            Set compilation debug="true" to insert debugging 
-            symbols into the compiled page. Because this 
-            affects performance, set this value to true only 
-            during development.
-        -->
-    <compilation debug="false" targetFramework="4.0">
-      <assemblies>
-        <remove assembly="DotNetOpenAuth.Contracts" />
-      </assemblies>
-    </compilation>
-    <!-- this sample-only provider uses the hard-coded list of users in the App_Data\Users.xml file -->
-    <membership defaultProvider="AspNetReadOnlyXmlMembershipProvider">
-      <providers>
-        <clear />
-        <add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdWebRingSsoProvider.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider" xmlFileName="~/App_Data/Users.xml" />
-      </providers>
-    </membership>
-    <!--
-            The <authentication> section enables configuration 
-            of the security authentication mode used by 
-            ASP.NET to identify an incoming user. 
-        -->
-    <authentication mode="Windows" />
-    <!--<authentication mode="Forms">
-      -->
-    <!-- named cookie prevents conflicts with other samples -->
-    <!--
-      <forms name="OpenIDWebRingSsoProvider"/>
-    </authentication>-->
-    <!--
-            The <customErrors> section enables configuration 
-            of what to do if/when an unhandled error occurs 
-            during the execution of a request. Specifically, 
-            it enables developers to configure html error pages 
-            to be displayed in place of a error stack trace.
-
-        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
-            <error statusCode="403" redirect="NoAccess.htm" />
-            <error statusCode="404" redirect="FileNotFound.htm" />
-        </customErrors>
-        -->
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />
-  </system.web>
-  <!-- 
-        The system.webServer section is required for running ASP.NET AJAX under Internet
-        Information Services 7.0.  It is not necessary for previous version of IIS.
-    -->
-  <runtime>
-    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->
-    <legacyHMACWarning enabled="0" />
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <configSections>

+    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />

+    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">

+      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />

+      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />

+      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+    </sectionGroup>

+  </configSections>

+  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+       which is necessary for OpenID urls with unicode characters in the domain/host name. 

+       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+  <uri>

+    <idn enabled="All" />

+    <iriParsing enabled="true" />

+  </uri>

+  <system.net>

+    <defaultProxy enabled="true" />

+    <settings>

+      <!-- This setting causes .NET to check certificate revocation lists (CRL) 

+           before trusting HTTPS certificates.  But this setting tends to not 

+           be allowed in shared hosting environments. -->

+      <!--<servicePointManager checkCertificateRevocationList="true"/>-->

+    </settings>

+  </system.net>

+  <!-- this is an optional configuration section where aspects of DotNetOpenAuth can be customized -->

+  <dotNetOpenAuth>

+    <openid>

+      <provider>

+        <security requireSsl="false" />

+        <behaviors>

+          <!-- Behaviors activate themselves automatically for individual matching requests. 

+               The first one in this list to match an incoming request "owns" the request.  If no

+               profile matches, the default behavior is assumed. -->

+          <!--<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />-->

+        </behaviors>

+      </provider>

+    </openid>

+    <messaging>

+      <untrustedWebRequest>

+        <whitelistHosts>

+          <!-- since this is a sample, and will often be used with localhost -->

+          <add name="localhost" />

+        </whitelistHosts>

+      </untrustedWebRequest>

+    </messaging>

+    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->

+    <reporting enabled="true" />

+  </dotNetOpenAuth>

+  <appSettings>

+    <add key="whitelistedRealms" value="http://localhost:39165/;http://othertrustedrealm/" />

+    <!-- Set ImplicitAuth to true when using Windows auth, or false for FormsAuthentication -->

+    <add key="ImplicitAuth" value="true" />

+  </appSettings>

+  <connectionStrings />

+  <system.web>

+    <!-- 

+            Set compilation debug="true" to insert debugging 

+            symbols into the compiled page. Because this 

+            affects performance, set this value to true only 

+            during development.

+        -->

+    <compilation debug="false" targetFramework="4.0">

+      <assemblies>

+        <remove assembly="DotNetOpenAuth.Contracts" />

+      </assemblies>

+    </compilation>

+    <!-- this sample-only provider uses the hard-coded list of users in the App_Data\Users.xml file -->

+    <membership defaultProvider="AspNetReadOnlyXmlMembershipProvider">

+      <providers>

+        <clear />

+        <add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdWebRingSsoProvider.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider" xmlFileName="~/App_Data/Users.xml" />

+      </providers>

+    </membership>

+    <!--

+            The <authentication> section enables configuration 

+            of the security authentication mode used by 

+            ASP.NET to identify an incoming user. 

+        -->

+    <authentication mode="Windows" />

+    <!--<authentication mode="Forms">

+      -->

+    <!-- named cookie prevents conflicts with other samples -->

+    <!--

+      <forms name="OpenIDWebRingSsoProvider"/>

+    </authentication>-->

+    <!--

+            The <customErrors> section enables configuration 

+            of what to do if/when an unhandled error occurs 

+            during the execution of a request. Specifically, 

+            it enables developers to configure html error pages 

+            to be displayed in place of a error stack trace.

+

+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">

+            <error statusCode="403" redirect="NoAccess.htm" />

+            <error statusCode="404" redirect="FileNotFound.htm" />

+        </customErrors>

+        -->

+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />

+  </system.web>

+  <!-- 

+        The system.webServer section is required for running ASP.NET AJAX under Internet

+        Information Services 7.0.  It is not necessary for previous version of IIS.

+    -->

+  <runtime>

+    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->

+    <legacyHMACWarning enabled="0" />

+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

+      <dependentAssembly>

+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />

+        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />

+      </dependentAssembly>

+    </assemblyBinding>

+  </runtime>

 </configuration>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdWebRingSsoProvider/packages.config b/src/OpenID/OpenIdWebRingSsoProvider/packages.config
index 765974d..cfe9741 100644
--- a/src/OpenID/OpenIdWebRingSsoProvider/packages.config
+++ b/src/OpenID/OpenIdWebRingSsoProvider/packages.config
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Provider.UI" version="4.0.0-RC1" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Provider" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Provider.UI" version="4.0.0.12084" />

 </packages>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdWebRingSsoRelyingParty/OpenIdWebRingSsoRelyingParty.csproj b/src/OpenID/OpenIdWebRingSsoRelyingParty/OpenIdWebRingSsoRelyingParty.csproj
index 42171b4..0fcbf1b 100644
--- a/src/OpenID/OpenIdWebRingSsoRelyingParty/OpenIdWebRingSsoRelyingParty.csproj
+++ b/src/OpenID/OpenIdWebRingSsoRelyingParty/OpenIdWebRingSsoRelyingParty.csproj
@@ -1,150 +1,150 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1229459F-AD2B-471C-897D-A1E7D842C83A}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenIdWebRingSsoRelyingParty</RootNamespace>
-    <AssemblyName>OpenIdWebRingSsoRelyingParty</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <UseIISExpress>false</UseIISExpress>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotNetOpenAuth.Core">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.Core.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetOpenAuth.OpenId.UI">
-      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Default.aspx" />
-    <Content Include="Login.aspx" />
-    <Content Include="Web.config" />
-    <Content Include="xrds.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Admin\Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Admin\Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Login.aspx.cs">
-      <DependentUpon>Login.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Login.aspx.designer.cs">
-      <DependentUpon>Login.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="AuthTicketRoles.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Admin\Default.aspx" />
-    <Content Include="Admin\Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{1229459F-AD2B-471C-897D-A1E7D842C83A}</ProjectGuid>

+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>OpenIdWebRingSsoRelyingParty</RootNamespace>

+    <AssemblyName>OpenIdWebRingSsoRelyingParty</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>3.5</OldToolsVersion>

+    <UpgradeBackupLocation />

+    <TargetFrameworkProfile />

+    <UseIISExpress>false</UseIISExpress>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="DotNetOpenAuth.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.Core.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.Core.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.RelyingParty.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="DotNetOpenAuth.OpenId.UI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.UI.4.0.0.12084\lib\net40-full\DotNetOpenAuth.OpenId.UI.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Data.DataSetExtensions" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Web" />

+    <Reference Include="System.Web.ApplicationServices" />

+    <Reference Include="System.Web.DynamicData" />

+    <Reference Include="System.Web.Entity" />

+    <Reference Include="System.Web.Extensions" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Configuration" />

+    <Reference Include="System.Web.Services" />

+    <Reference Include="System.EnterpriseServices" />

+    <Reference Include="System.Web.Mobile" />

+    <Reference Include="System.Xml.Linq" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="Default.aspx" />

+    <Content Include="Login.aspx" />

+    <Content Include="Web.config" />

+    <Content Include="xrds.aspx" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="Admin\Default.aspx.cs">

+      <DependentUpon>Default.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Admin\Default.aspx.designer.cs">

+      <DependentUpon>Default.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Default.aspx.cs">

+      <SubType>ASPXCodeBehind</SubType>

+      <DependentUpon>Default.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Default.aspx.designer.cs">

+      <DependentUpon>Default.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="Login.aspx.cs">

+      <DependentUpon>Login.aspx</DependentUpon>

+      <SubType>ASPXCodeBehind</SubType>

+    </Compile>

+    <Compile Include="Login.aspx.designer.cs">

+      <DependentUpon>Login.aspx</DependentUpon>

+    </Compile>

+    <Compile Include="AuthTicketRoles.cs" />

+    <Compile Include="Properties\AssemblyInfo.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="Admin\Default.aspx" />

+    <Content Include="Admin\Web.config" />

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="App_Data\" />

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="packages.config" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>39165</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  -->

+  <ProjectExtensions>

+    <VisualStudio>

+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

+        <WebProjectProperties>

+          <UseIIS>False</UseIIS>

+          <AutoAssignPort>False</AutoAssignPort>

+          <DevelopmentServerPort>39165</DevelopmentServerPort>

+          <DevelopmentServerVPath>/</DevelopmentServerVPath>

+          <IISUrl>

+          </IISUrl>

+          <NTLMAuthentication>False</NTLMAuthentication>

+          <UseCustomServer>False</UseCustomServer>

+          <CustomServerUrl>

+          </CustomServerUrl>

+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>

+        </WebProjectProperties>

+      </FlavorProperties>

+    </VisualStudio>

+  </ProjectExtensions>

+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />

+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdWebRingSsoRelyingParty/Web.config b/src/OpenID/OpenIdWebRingSsoRelyingParty/Web.config
index c45cf8a..1fd2d6c 100644
--- a/src/OpenID/OpenIdWebRingSsoRelyingParty/Web.config
+++ b/src/OpenID/OpenIdWebRingSsoRelyingParty/Web.config
@@ -1,133 +1,129 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />
-    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
-      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
-      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
-    </sectionGroup>
-  </configSections>
-  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-       which is necessary for OpenID urls with unicode characters in the domain/host name. 
-       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
-  <uri>
-    <idn enabled="All" />
-    <iriParsing enabled="true" />
-  </uri>
-  <system.net>
-    <defaultProxy enabled="true" />
-    <settings>
-      <!-- This setting causes .NET to check certificate revocation lists (CRL) 
-           before trusting HTTPS certificates.  But this setting tends to not 
-           be allowed in shared hosting environments. -->
-      <!--<servicePointManager checkCertificateRevocationList="true"/>-->
-    </settings>
-  </system.net>
-  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->
-  <dotNetOpenAuth>
-    <openid>
-      <relyingParty>
-        <security requireSsl="false">
-          <!-- Uncomment the trustedProviders tag if your relying party should only accept positive assertions from a closed set of OpenID Providers. -->
-          <!--<trustedProviders rejectAssertionsFromUntrustedProviders="true">
-            <add endpoint="https://www.google.com/accounts/o8/ud" />
-          </trustedProviders>-->
-        </security>
-        <behaviors>
-          <!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
-               with OPs that use Attribute Exchange (in various formats). -->
-          <add type="DotNetOpenAuth.OpenId.RelyingParty.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.RelyingParty" />
-          <!--<add type="DotNetOpenAuth.OpenId.RelyingParty.Behaviors.GsaIcamProfile, DotNetOpenAuth.OpenId.RelyingParty" />-->
-        </behaviors>
-        <!-- Uncomment the following to activate the sample custom store.  -->
-        <!--<store type="OpenIdRelyingPartyWebForms.CustomStore, OpenIdRelyingPartyWebForms" />-->
-      </relyingParty>
-    </openid>
-    <messaging>
-      <untrustedWebRequest>
-        <whitelistHosts>
-          <!-- since this is a sample, and will often be used with localhost -->
-          <add name="localhost" />
-        </whitelistHosts>
-      </untrustedWebRequest>
-    </messaging>
-    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-    <reporting enabled="true" />
-  </dotNetOpenAuth>
-  <appSettings>
-    <add key="SsoProviderOPIdentifier" value="http://localhost:39167/" />
-    <add key="SsoProviderOPEndpoint" value="http://localhost:39167/server.aspx" />
-  </appSettings>
-  <connectionStrings />
-  <system.web>
-    <!-- 
-            Set compilation debug="true" to insert debugging 
-            symbols into the compiled page. Because this 
-            affects performance, set this value to true only 
-            during development.
-        -->
-    <compilation debug="false" targetFramework="4.0">
-      <assemblies>
-        <remove assembly="DotNetOpenAuth.Contracts" />
-      </assemblies>
-    </compilation>
-    <!--
-            The <authentication> section enables configuration 
-            of the security authentication mode used by 
-            ASP.NET to identify an incoming user. 
-        -->
-    <authentication mode="Forms">
-      <forms name="OpenIdWebRingSsoRelyingParty" />
-    </authentication>
-    <authorization>
-      <deny users="?" />
-    </authorization>
-    <!--
-            The <customErrors> section enables configuration 
-            of what to do if/when an unhandled error occurs 
-            during the execution of a request. Specifically, 
-            it enables developers to configure html error pages 
-            to be displayed in place of a error stack trace.
-
-        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
-            <error statusCode="403" redirect="NoAccess.htm" />
-            <error statusCode="404" redirect="FileNotFound.htm" />
-        </customErrors>
-        -->
-    <httpModules>
-      <add name="AuthTicketRoles" type="OpenIdWebRingSsoRelyingParty.AuthTicketRoles, OpenIdWebRingSsoRelyingParty" />
-    </httpModules>
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />
-  </system.web>
-  <!-- 
-        The system.webServer section is required for running ASP.NET AJAX under Internet
-        Information Services 7.0.  It is not necessary for previous version of IIS.
-    -->
-  <location path="xrds.aspx">
-    <system.web>
-      <authorization>
-        <allow users="*" />
-      </authorization>
-    </system.web>
-  </location>
-  <location path="default.aspx">
-    <system.web>
-      <authorization>
-        <allow users="*" />
-      </authorization>
-    </system.web>
-  </location>
-  <runtime>
-    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->
-    <legacyHMACWarning enabled="0" />
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <configSections>

+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />

+    <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">

+      <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />

+      <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />

+      <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />

+    </sectionGroup>

+  </configSections>

+  <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+       which is necessary for OpenID urls with unicode characters in the domain/host name. 

+       It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+  <!-- this is an optional configuration section where aspects of dotnetopenauth can be customized -->

+  <dotNetOpenAuth>

+    <messaging>

+      <untrustedWebRequest>

+        <whitelistHosts>

+          <!-- since this is a sample, and will often be used with localhost -->

+          <add name="localhost" />

+        </whitelistHosts>

+      </untrustedWebRequest>

+    </messaging>

+    <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->

+    <reporting enabled="true" />

+    <openid>

+      <relyingParty>

+        <security requireSsl="false">

+          <!-- Uncomment the trustedProviders tag if your relying party should only accept positive assertions from a closed set of OpenID Providers. -->

+          <!--<trustedProviders rejectAssertionsFromUntrustedProviders="true">

+						<add endpoint="https://www.google.com/accounts/o8/ud" />

+					</trustedProviders>-->

+        </security>

+        <behaviors>

+          <!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible

+					     with OPs that use Attribute Exchange (in various formats). -->

+          <add type="DotNetOpenAuth.OpenId.RelyingParty.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.RelyingParty" />

+        </behaviors>

+      </relyingParty>

+    </openid>

+  </dotNetOpenAuth>

+  <appSettings>

+    <add key="SsoProviderOPIdentifier" value="http://localhost:39167/" />

+    <add key="SsoProviderOPEndpoint" value="http://localhost:39167/server.aspx" />

+  </appSettings>

+  <connectionStrings />

+  <system.web>

+    <!-- 

+            Set compilation debug="true" to insert debugging 

+            symbols into the compiled page. Because this 

+            affects performance, set this value to true only 

+            during development.

+        -->

+    <compilation debug="false" targetFramework="4.0">

+      <assemblies>

+        <remove assembly="DotNetOpenAuth.Contracts" />

+      </assemblies>

+    </compilation>

+    <!--

+            The <authentication> section enables configuration 

+            of the security authentication mode used by 

+            ASP.NET to identify an incoming user. 

+        -->

+    <authentication mode="Forms">

+      <forms name="OpenIdWebRingSsoRelyingParty" />

+    </authentication>

+    <authorization>

+      <deny users="?" />

+    </authorization>

+    <!--

+            The <customErrors> section enables configuration 

+            of what to do if/when an unhandled error occurs 

+            during the execution of a request. Specifically, 

+            it enables developers to configure html error pages 

+            to be displayed in place of a error stack trace.

+

+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">

+            <error statusCode="403" redirect="NoAccess.htm" />

+            <error statusCode="404" redirect="FileNotFound.htm" />

+        </customErrors>

+        -->

+    <httpModules>

+      <add name="AuthTicketRoles" type="OpenIdWebRingSsoRelyingParty.AuthTicketRoles, OpenIdWebRingSsoRelyingParty" />

+    </httpModules>

+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />

+  </system.web>

+  <!-- 

+        The system.webServer section is required for running ASP.NET AJAX under Internet

+        Information Services 7.0.  It is not necessary for previous version of IIS.

+    -->

+  <location path="xrds.aspx">

+    <system.web>

+      <authorization>

+        <allow users="*" />

+      </authorization>

+    </system.web>

+  </location>

+  <location path="default.aspx">

+    <system.web>

+      <authorization>

+        <allow users="*" />

+      </authorization>

+    </system.web>

+  </location>

+  <system.net>

+    <defaultProxy enabled="true" />

+    <settings>

+      <!-- This setting causes .NET to check certificate revocation lists (CRL) 

+			     before trusting HTTPS certificates.  But this setting tends to not 

+			     be allowed in shared hosting environments. -->

+      <!--<servicePointManager checkCertificateRevocationList="true"/>-->

+    </settings>

+  </system.net>

+  <runtime>

+    <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->

+    <legacyHMACWarning enabled="0" />

+  </runtime>

+  <uri>

+    <!-- See an error due to this section?  When targeting .NET 3.5, please add the following line to your <configSections> at the top of this file:

+		<section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+		-->

+    <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),

+	     which is necessary for OpenID urls with unicode characters in the domain/host name. 

+	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->

+    <idn enabled="All" />

+    <iriParsing enabled="true" />

+  </uri>

 </configuration>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdWebRingSsoRelyingParty/packages.config b/src/OpenID/OpenIdWebRingSsoRelyingParty/packages.config
index d980618..7528b62 100644
--- a/src/OpenID/OpenIdWebRingSsoRelyingParty/packages.config
+++ b/src/OpenID/OpenIdWebRingSsoRelyingParty/packages.config
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CodeContracts.Unofficial" version="1.0.0.2" />
-  <package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.0-RC1" />
-  <package id="DotNetOpenAuth.OpenId.RelyingParty.UI" version="4.0.0-RC1" />
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="CodeContracts.Unofficial" version="1.0.0.2" />

+  <package id="DotNetOpenAuth.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.Core.UI" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.0.12084" />

+  <package id="DotNetOpenAuth.OpenId.RelyingParty.UI" version="4.0.0.12084" />

 </packages>
\ No newline at end of file