Merge pull request #20 from DavidChristiansen/master

Fixing build

9 files changed, 172 insertions, 68 deletions

diff --git a/src/OpenID/OpenIdProviderMvc/OpenIdProviderMvc.csproj b/src/OpenID/OpenIdProviderMvc/OpenIdProviderMvc.csproj
index 0e28a92..5159940 100644
--- a/src/OpenID/OpenIdProviderMvc/OpenIdProviderMvc.csproj
+++ b/src/OpenID/OpenIdProviderMvc/OpenIdProviderMvc.csproj
@@ -7,11 +7,13 @@
     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <OldToolsVersion>4.0</OldToolsVersion>

-    <UpgradeBackupLocation />

+    <UpgradeBackupLocation>

+    </UpgradeBackupLocation>

     <IISExpressSSLPort />

     <IISExpressAnonymousAuthentication />

     <IISExpressWindowsAuthentication />

     <IISExpressUseClassicPipelineMode />

+    <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>

   </PropertyGroup>

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

   <PropertyGroup>

@@ -145,6 +147,10 @@
     <Reference Include="Microsoft.Contracts">

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

     </Reference>

+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>

+    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Data" />

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

@@ -185,8 +191,31 @@
       <RequiredTargetFramework>v4.0</RequiredTargetFramework>

     </Reference>

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

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

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>

+    </Reference>

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll</HintPath>

+    </Reference>

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>

+    </Reference>

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

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

+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>

+      <Private>True</Private>

+    </Reference>

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>

+    </Reference>

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>

+    </Reference>

     <Reference Include="System.Xml" />

     <Reference Include="System.Configuration" />

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

diff --git a/src/OpenID/OpenIdProviderMvc/Views/Web.config b/src/OpenID/OpenIdProviderMvc/Views/Web.config
index c43d131..07b3061 100644
--- a/src/OpenID/OpenIdProviderMvc/Views/Web.config
+++ b/src/OpenID/OpenIdProviderMvc/Views/Web.config
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<configuration>

-  <configSections>

-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />

-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />

-    </sectionGroup>

-  </configSections>

+<configuration>
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
 
   <system.web>
     <httpHandlers>
@@ -19,9 +19,9 @@
         To change this behavior apply the ValidateInputAttribute to a
         controller or action.
     -->
-    <pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+    <pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <controls>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" namespace="System.Web.Mvc" tagPrefix="mvc" />
+        <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" namespace="System.Web.Mvc" tagPrefix="mvc" />
       </controls>
     </pages>
   </system.web>
@@ -33,21 +33,21 @@
       <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
     </handlers>
   </system.webServer>
-

-

-  <system.web.webPages.razor>

-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

-    <pages pageBaseType="System.Web.Mvc.WebViewPage">

-      <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.webPages.razor>

-

-  <appSettings>

-    <add key="webpages:Enabled" value="false" />

-  </appSettings>

+
+
+  <system.web.webPages.razor>
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+    <pages pageBaseType="System.Web.Mvc.WebViewPage">
+      <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.webPages.razor>
+
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
+  </appSettings>
 </configuration>
diff --git a/src/OpenID/OpenIdProviderMvc/Web.config b/src/OpenID/OpenIdProviderMvc/Web.config
index 1208a4e..5d1981f 100644
--- a/src/OpenID/OpenIdProviderMvc/Web.config
+++ b/src/OpenID/OpenIdProviderMvc/Web.config
@@ -2,16 +2,24 @@
 <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="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" /><section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" /></sectionGroup></configSections>

+

+    <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="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" 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>

-    <!-- This is an optional configuration section where aspects of dotnetopenauth can be customized. --><!-- For a complete set of configuration options see http://www.dotnetopenauth.net/developers/code-snippets/configuration-options/ --><openid>

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

+    <!-- For a complete set of configuration options see http://www.dotnetopenauth.net/developers/code-snippets/configuration-options/ -->

+    <openid>

       <provider>

         <security requireSsl="false" />

         <behaviors>

@@ -25,23 +33,38 @@
         <!-- Uncomment the following to activate the sample custom store.  -->

         <!--<store type="RelyingPartyWebForms.CustomStore, RelyingPartyWebForms" />-->

       </provider>

-      

-    <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">

+

+      <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>

+					</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" />

-        <!-- Uncomment to enable communication with localhost (should generally not activate in production!) --><!--<add name="localhost" />--></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" /></dotNetOpenAuth>

+

+

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

+    <reporting enabled="true" />

+  </dotNetOpenAuth>

   <appSettings>

+

     <add key="ClientValidationEnabled" value="false" />

     <add key="UnobtrusiveJavaScriptEnabled" value="false" />

   </appSettings>

@@ -54,13 +77,13 @@
     -->

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

       <assemblies>

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

+        <add assembly="System.Web.Mvc, Version=4.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" />

-        <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

-        <add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

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

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

       </assemblies>

     </compilation>

     <!--

@@ -116,7 +139,7 @@
       </namespaces>

     </pages>

     <httpHandlers>

-      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

+      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

     </httpHandlers>

   </system.web>

   <system.web.extensions />

@@ -130,19 +153,15 @@
     <handlers>

       <remove name="MvcHttpHandler" />

       <remove name="UrlRoutingHandler" />

-      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

+      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

     </handlers>

   </system.webServer>

   <runtime>

-    

+

     <!-- When targeting ASP.NET MVC 3, this assemblyBinding makes MVC 1 and 2 references relink

          to MVC 3 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-2.0.0.0" newVersion="3.0.0.0" />

-      </dependentAssembly>

-      <dependentAssembly>

         <assemblyIdentity name="DotNetOpenAuth.Core" publicKeyToken="2780ccd10d57b246" culture="neutral" />

         <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />

       </dependentAssembly>

@@ -154,8 +173,14 @@
         <assemblyIdentity name="DotNetOpenAuth.OAuth.Common" publicKeyToken="2780ccd10d57b246" culture="neutral" />

         <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />

       </dependentAssembly>

+      <dependentAssembly>

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

+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />

+      </dependentAssembly>

     </assemblyBinding>

-  <!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). --><legacyHMACWarning enabled="0" /><!-- When targeting ASP.NET MVC 3, this assemblyBinding makes MVC 1 and 2 references relink

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

+    <legacyHMACWarning enabled="0" />

+    <!-- When targeting ASP.NET MVC 3, this assemblyBinding makes MVC 1 and 2 references relink

 		     to MVC 3 so libraries such as DotNetOpenAuth that compile against MVC 1 will work with it.

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

 			<dependentAssembly>

@@ -163,9 +188,22 @@
 				<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />

 			</dependentAssembly>

 		</assemblyBinding>

-		 --></runtime>

-<system.net><defaultProxy enabled="true" /><settings><!-- This setting causes .NET to check certificate revocation lists (CRL) 

+		 -->

+  </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),

+			     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
+		     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 31a8896..93ac15a 100644
--- a/src/OpenID/OpenIdProviderMvc/packages.config
+++ b/src/OpenID/OpenIdProviderMvc/packages.config
@@ -24,7 +24,11 @@
   <package id="DotNetOpenAuth.OpenIdInfoCard.UI" version="4.3.1.13153" targetFramework="net40" />

   <package id="DotNetOpenAuth.OpenIdOAuth" version="4.3.1.13153" targetFramework="net40" />

   <package id="log4net" version="2.0.0" targetFramework="net40" />

+  <package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net40" />

+  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net40" />

+  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />

   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40" />

   <package id="Microsoft.Bcl.Build" version="1.0.8" targetFramework="net40" />

   <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net40" />

+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />

 </packages>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj b/src/OpenID/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
index f5f96ff..5f459e7 100644
--- a/src/OpenID/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
+++ b/src/OpenID/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
@@ -7,11 +7,13 @@
     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <OldToolsVersion>4.0</OldToolsVersion>

-    <UpgradeBackupLocation />

+    <UpgradeBackupLocation>

+    </UpgradeBackupLocation>

     <IISExpressSSLPort />

     <IISExpressAnonymousAuthentication />

     <IISExpressWindowsAuthentication />

     <IISExpressUseClassicPipelineMode />

+    <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>

   </PropertyGroup>

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

   <PropertyGroup>

@@ -78,6 +80,10 @@
     <Reference Include="log4net">

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

     </Reference>

+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>

+    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Data" />

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

@@ -116,8 +122,31 @@
     <Reference Include="System.Web.Extensions" />

     <Reference Include="System.Web" />

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

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

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>

+    </Reference>

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll</HintPath>

+    </Reference>

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>

+    </Reference>

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

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>

+    </Reference>

+    <Reference Include="System.Web.WebPages.Deployment">

+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>

+      <Private>True</Private>

+    </Reference>

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

+      <Private>True</Private>

+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>

+    </Reference>

     <Reference Include="System.Xml" />

     <Reference Include="System.Configuration" />

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

diff --git a/src/OpenID/OpenIdRelyingPartyMvc/Web.config b/src/OpenID/OpenIdRelyingPartyMvc/Web.config
index c3426ab..586d904 100644
--- a/src/OpenID/OpenIdRelyingPartyMvc/Web.config
+++ b/src/OpenID/OpenIdRelyingPartyMvc/Web.config
@@ -106,10 +106,6 @@
     

     

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

-      <dependentAssembly>

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

-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />

-      </dependentAssembly>

            <dependentAssembly>

     

     

@@ -120,6 +116,10 @@
     

     

            </dependentAssembly>

+           <dependentAssembly>

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

+                  <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />

+           </dependentAssembly>

     

     

     </assemblyBinding>

diff --git a/src/OpenID/OpenIdRelyingPartyMvc/packages.config b/src/OpenID/OpenIdRelyingPartyMvc/packages.config
index c3bb08c..c16de9c 100644
--- a/src/OpenID/OpenIdRelyingPartyMvc/packages.config
+++ b/src/OpenID/OpenIdRelyingPartyMvc/packages.config
@@ -7,7 +7,11 @@
   <package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.3.1.13153" targetFramework="net40" />

   <package id="DotNetOpenAuth.OpenId.RelyingParty.UI" version="4.3.1.13153" targetFramework="net40" />

   <package id="log4net" version="2.0.0" targetFramework="net40" />

+  <package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net40" />

+  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net40" />

+  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />

   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40" />

   <package id="Microsoft.Bcl.Build" version="1.0.8" targetFramework="net40" />

   <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net40" />

+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />

 </packages>
\ No newline at end of file
diff --git a/src/OpenID/OpenIdRelyingPartyWebFormsVB/OpenIdRelyingPartyWebFormsVB.vbproj b/src/OpenID/OpenIdRelyingPartyWebFormsVB/OpenIdRelyingPartyWebFormsVB.vbproj
index ada7a25..ea10150 100644
--- a/src/OpenID/OpenIdRelyingPartyWebFormsVB/OpenIdRelyingPartyWebFormsVB.vbproj
+++ b/src/OpenID/OpenIdRelyingPartyWebFormsVB/OpenIdRelyingPartyWebFormsVB.vbproj
@@ -5,9 +5,9 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
+    <IISExpressAnonymousAuthentication>disabled</IISExpressAnonymousAuthentication>
+    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
+    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
   <PropertyGroup>
diff --git a/src/OpenID/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj b/src/OpenID/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj
index 53435fb..562cc5e 100644
--- a/src/OpenID/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj
+++ b/src/OpenID/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj
@@ -5,9 +5,9 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

     <IISExpressSSLPort />

-    <IISExpressAnonymousAuthentication />

-    <IISExpressWindowsAuthentication />

-    <IISExpressUseClassicPipelineMode />

+    <IISExpressAnonymousAuthentication>disabled</IISExpressAnonymousAuthentication>

+    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>

+    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>

   </PropertyGroup>

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

   <PropertyGroup>