diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-09-27 17:39:14 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-09-27 17:39:14 -0700 |
| commit | f48c24b3b6abf20b70dfa1ca38e416886d21a5bf (patch) | |
| tree | 9a09930c33c08c2aab497ca07a798b5c5cf7b931 | |
| parent | ba720fb8879cc12fc05319f24c830e29c0512638 (diff) | |
| download | DotNetOpenAuth-f48c24b3b6abf20b70dfa1ca38e416886d21a5bf.zip DotNetOpenAuth-f48c24b3b6abf20b70dfa1ca38e416886d21a5bf.tar.gz DotNetOpenAuth-f48c24b3b6abf20b70dfa1ca38e416886d21a5bf.tar.bz2 | |
Added NuGet package dependency and fixed build breaks in samples.
| -rw-r--r-- | nuget/DotNetOpenAuth.Core.nuspec | 11 | ||||
| -rw-r--r-- | projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj | 4 | ||||
| -rw-r--r-- | samples/OAuthResourceServer/OAuthResourceServer.csproj | 4 | ||||
| -rw-r--r-- | samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj | 4 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.Core/Messaging/HttpRequestInfo.cs | 11 | ||||
| -rw-r--r-- | tools/drop.proj | 5 |
6 files changed, 35 insertions, 4 deletions
diff --git a/nuget/DotNetOpenAuth.Core.nuspec b/nuget/DotNetOpenAuth.Core.nuspec index 989f5bf..c6ab9bf 100644 --- a/nuget/DotNetOpenAuth.Core.nuspec +++ b/nuget/DotNetOpenAuth.Core.nuspec @@ -17,7 +17,16 @@ <frameworkAssembly assemblyName="System.Configuration" targetFramework="net40" /> </frameworkAssemblies> <dependencies> - <dependency id="CodeContracts.Unofficial" /> + <group targetFramework="net35"> + <dependency id="CodeContracts.Unofficial" /> + </group> + <group targetFramework="net40"> + <dependency id="CodeContracts.Unofficial" /> + <dependency id="System.Net.Http" /> + </group> + <group targetFramework="net45"> + <dependency id="CodeContracts.Unofficial" /> + </group> </dependencies> </metadata> <files> diff --git a/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj b/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj index c8c9ab2..2bdf120 100644 --- a/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj +++ b/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj @@ -78,6 +78,10 @@ <Reference Include="System.IdentityModel"> <RequiredTargetFramework>3.0</RequiredTargetFramework> </Reference> + <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.Runtime.Serialization"> <RequiredTargetFramework>3.0</RequiredTargetFramework> </Reference> diff --git a/samples/OAuthResourceServer/OAuthResourceServer.csproj b/samples/OAuthResourceServer/OAuthResourceServer.csproj index c4a8cc7..f02d29e 100644 --- a/samples/OAuthResourceServer/OAuthResourceServer.csproj +++ b/samples/OAuthResourceServer/OAuthResourceServer.csproj @@ -53,6 +53,10 @@ <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.Linq" /> <Reference Include="System.IdentityModel" /> + <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.ServiceModel" /> <Reference Include="System.ServiceModel.Web" /> <Reference Include="System.Web.Abstractions" /> diff --git a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj index c489b0f..c03366e 100644 --- a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj +++ b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj @@ -98,6 +98,10 @@ <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> + <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.Web" /> <Reference Include="System.Xml.Linq"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/src/DotNetOpenAuth.Core/Messaging/HttpRequestInfo.cs b/src/DotNetOpenAuth.Core/Messaging/HttpRequestInfo.cs index 3ec590a..4b4a3fe 100644 --- a/src/DotNetOpenAuth.Core/Messaging/HttpRequestInfo.cs +++ b/src/DotNetOpenAuth.Core/Messaging/HttpRequestInfo.cs @@ -225,6 +225,17 @@ namespace DotNetOpenAuth.Messaging { return new HttpRequestInfo(listenerRequest); } +#if CLR4 + /// <summary> + /// Creates an <see cref="HttpRequestBase"/> instance that describes the specified HTTP request. + /// </summary> + /// <param name="request">The HTTP request.</param> + /// <returns>An instance of <see cref="HttpRequestBase"/>.</returns> + public static HttpRequestBase Create(HttpRequestMessage request) { + return new HttpRequestInfo(request); + } +#endif + /// <summary> /// Creates an <see cref="HttpRequestBase"/> instance that describes the specified HTTP request. /// </summary> diff --git a/tools/drop.proj b/tools/drop.proj index 13b8f68..88a20c9 100644 --- a/tools/drop.proj +++ b/tools/drop.proj @@ -115,9 +115,8 @@ <DropSatelliteSourceFiles> <CultureDir>$([System.IO.Path]::GetDirectoryName('$([System.IO.Path]::GetDirectoryName('%(RecursiveDir)'))'))\</CultureDir> </DropSatelliteSourceFiles> - <DropLibSourceFiles Include=" - $(ProjectRoot)Lib\log4net.*; - " /> + <_DropLibSourceFiles Include="$(ProjectRoot)Lib\**\*" /> + <DropLibSourceFiles Include="@(_DropLibSourceFiles)" Condition=" '%(FileName)' == 'log4net' or '%(FileName)' == 'System.Net.Http' " /> <DropProjectTemplatesSourceFiles Include="@(ProjectTemplatesVsi)" /> <DropVsixSourceFiles Include="@(ExtensionVsix)" Condition=" '%(ExtensionVsix.IncludeInDrop)' == 'true' " /> |