3 files changed, 404 insertions, 402 deletions
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