diff options
Diffstat (limited to 'src/DotNetOpenAuth.OAuth2.ResourceServer')
3 files changed, 8 insertions, 7 deletions
diff --git a/src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj b/src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj index 567e2ac..2191c16 100644 --- a/src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj +++ b/src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj @@ -52,11 +52,16 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Net.Http.WebRequest" /> <Reference Include="Validation, Version=2.0.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Validation.2.0.0.12319\lib\portable-windows8+net40+sl5+windowsphone8\Validation.dll</HintPath> </Reference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " /> diff --git a/src/DotNetOpenAuth.OAuth2.ResourceServer/OAuth2/ResourceServer.cs b/src/DotNetOpenAuth.OAuth2.ResourceServer/OAuth2/ResourceServer.cs index 540773f..bd129c0 100644 --- a/src/DotNetOpenAuth.OAuth2.ResourceServer/OAuth2/ResourceServer.cs +++ b/src/DotNetOpenAuth.OAuth2.ResourceServer/OAuth2/ResourceServer.cs @@ -10,9 +10,7 @@ namespace DotNetOpenAuth.OAuth2 { using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Net; -#if CLR4 using System.Net.Http; -#endif using System.Security.Principal; using System.ServiceModel.Channels; using System.Text; @@ -129,7 +127,6 @@ namespace DotNetOpenAuth.OAuth2 { } } -#if CLR4 /// <summary> /// Discovers what access the client should have considering the access token in the current request. /// </summary> @@ -146,7 +143,6 @@ namespace DotNetOpenAuth.OAuth2 { Requires.NotNull(request, "request"); return this.GetAccessToken(new HttpRequestInfo(request), requiredScopes); } -#endif /// <summary> /// Discovers what access the client should have considering the access token in the current request. @@ -197,7 +193,6 @@ namespace DotNetOpenAuth.OAuth2 { return this.GetPrincipal(new HttpRequestInfo(request, requestUri), requiredScopes); } -#if CLR4 /// <summary> /// Discovers what access the client should have considering the access token in the current request. /// </summary> @@ -214,6 +209,5 @@ namespace DotNetOpenAuth.OAuth2 { Requires.NotNull(request, "request"); return this.GetPrincipal(new HttpRequestInfo(request), requiredScopes); } -#endif } } diff --git a/src/DotNetOpenAuth.OAuth2.ResourceServer/packages.config b/src/DotNetOpenAuth.OAuth2.ResourceServer/packages.config index 67054af..544825c 100644 --- a/src/DotNetOpenAuth.OAuth2.ResourceServer/packages.config +++ b/src/DotNetOpenAuth.OAuth2.ResourceServer/packages.config @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.IdentityModel" version="6.1.7600.16394" targetFramework="net40" /> + <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" /> + <package id="Microsoft.IdentityModel" version="6.1.7600.16394" targetFramework="net45" /> + <package id="Validation" version="2.0.1.12362" targetFramework="net45" /> </packages>
\ No newline at end of file |