diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-12-02 15:57:23 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-12-02 15:57:23 -0800 |
| commit | c7509b6d29ffe07098d0c2b81acbd1af34e1c076 (patch) | |
| tree | 058db773e244038713f121b9381a962eca327ce3 /samples | |
| parent | 67f3936edd8ed795f16e596f349a2f12712810e9 (diff) | |
| parent | 84ef4b74365fe78156792cf17bb945a9ace4e03f (diff) | |
| download | DotNetOpenAuth-c7509b6d29ffe07098d0c2b81acbd1af34e1c076.zip DotNetOpenAuth-c7509b6d29ffe07098d0c2b81acbd1af34e1c076.tar.gz DotNetOpenAuth-c7509b6d29ffe07098d0c2b81acbd1af34e1c076.tar.bz2 | |
Merge branch 'v4.1'
Conflicts:
src/DotNetOpenAuth.OAuth2.ResourceServer/OAuth2/StandardAccessTokenAnalyzer.cs
src/DotNetOpenAuth.Test/OAuth2/OAuth2TestBase.cs
src/version.txt
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj index 9f810bb..8c7fd08 100644 --- a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj +++ b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj @@ -63,6 +63,10 @@ <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> + <Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\lib\net-v4.0\System.Net.Http.dll</HintPath> + </Reference> <Reference Include="System.Xml.Linq"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> |