Package update

3 files changed, 63 insertions, 40 deletions

diff --git a/src/OAuth/OAuthResourceServer/OAuthResourceServer.csproj b/src/OAuth/OAuthResourceServer/OAuthResourceServer.csproj
index 80de421..1ed1df6 100644
--- a/src/OAuth/OAuthResourceServer/OAuthResourceServer.csproj
+++ b/src/OAuth/OAuthResourceServer/OAuthResourceServer.csproj
@@ -47,17 +47,21 @@
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="DotNetOpenAuth.Core">

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

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

+      <SpecificVersion>False</SpecificVersion>

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

     </Reference>

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

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

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

+      <SpecificVersion>False</SpecificVersion>

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

     </Reference>

-    <Reference Include="DotNetOpenAuth.OAuth2">

-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.25.0-draft1\lib\net40-full\DotNetOpenAuth.OAuth2.dll</HintPath>

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

+      <SpecificVersion>False</SpecificVersion>

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

     </Reference>

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

-      <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.ResourceServer.0.25.0-draft1\lib\net40-full\DotNetOpenAuth.OAuth2.ResourceServer.dll</HintPath>

+    <Reference Include="DotNetOpenAuth.OAuth2.ResourceServer, Version=4.3.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

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

     </Reference>

     <Reference Include="log4net">

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

@@ -67,8 +71,31 @@
     <Reference Include="System.Data.DataSetExtensions" />

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

     <Reference Include="System.IdentityModel" />

+    <Reference Include="System.IO">

+      <HintPath>..\..\..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.IO.dll</HintPath>

+    </Reference>

+    <Reference Include="System.Net.Http, Version=2.2.13.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.dll</HintPath>

+    </Reference>

+    <Reference Include="System.Net.Http.Extensions">

+      <HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.Extensions.dll</HintPath>

+    </Reference>

+    <Reference Include="System.Net.Http.Primitives">

+      <HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.Primitives.dll</HintPath>

+    </Reference>

+    <Reference Include="System.Net.Http.WebRequest, Version=2.2.13.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.WebRequest.dll</HintPath>

+    </Reference>

+    <Reference Include="System.Runtime">

+      <HintPath>..\..\..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Runtime.dll</HintPath>

+    </Reference>

     <Reference Include="System.ServiceModel" />

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

+    <Reference Include="System.Threading.Tasks">

+      <HintPath>..\..\..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Threading.Tasks.dll</HintPath>

+    </Reference>

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

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

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

@@ -163,4 +190,5 @@
   -->

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

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

+  <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.8\tools\Microsoft.Bcl.Build.targets" />

 </Project>
\ No newline at end of file
diff --git a/src/OAuth/OAuthResourceServer/Web.config b/src/OAuth/OAuthResourceServer/Web.config
index 74b01eb..bc9f2e8 100644
--- a/src/OAuth/OAuthResourceServer/Web.config
+++ b/src/OAuth/OAuthResourceServer/Web.config
@@ -5,9 +5,9 @@
     <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>

+      

+      

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

@@ -16,29 +16,16 @@
     <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>

+      

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

   <appSettings />

   <connectionStrings>

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

@@ -112,8 +99,14 @@
   <system.webServer>

     <modules runAllManagedModulesForAllRequests="true" />

   </system.webServer>

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

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

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

+   <dependentAssembly>

+    <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

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

+   </dependentAssembly>

+  </assemblyBinding>

+</runtime></configuration>
\ No newline at end of file
diff --git a/src/OAuth/OAuthResourceServer/packages.config b/src/OAuth/OAuthResourceServer/packages.config
index 4e51419..6ac5369 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" targetFramework="net40" />

-  <package id="DotNetOpenAuth.Core" version="4.1.0.12182" targetFramework="net40" />

-  <package id="DotNetOpenAuth.OAuth.Common" version="4.1.0.12182" targetFramework="net40" />

-  <package id="DotNetOpenAuth.OAuth2.Core" version="0.25.0-draft1" targetFramework="net40" />

-  <package id="DotNetOpenAuth.OAuth2.ResourceServer" version="0.25.0-draft1" targetFramework="net40" />

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

+  <package id="DotNetOpenAuth.OAuth.Common" version="4.3.1.13153" targetFramework="net40" />

+  <package id="DotNetOpenAuth.OAuth2.Core" version="4.3.1.13153" targetFramework="net40" />

+  <package id="DotNetOpenAuth.OAuth2.ResourceServer" version="4.3.1.13153" targetFramework="net40" />

   <package id="log4net" version="2.0.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" />

 </packages>
\ No newline at end of file