diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2013-05-27 09:32:17 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2013-05-27 09:32:17 -0700 |
| commit | 5a0a8ee4c55f323a6c1fbdb619cd89b7d28a94ba (patch) | |
| tree | 026bb7a58fc6b80b680f2b5be2a25ddf1efbf0f5 /samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj | |
| parent | e4c746826690259eddba106e8a44d1b52b542faf (diff) | |
| parent | 064220dbab72b00f23abd041bf4a30ea87a00d88 (diff) | |
| download | DotNetOpenAuth-5a0a8ee4c55f323a6c1fbdb619cd89b7d28a94ba.zip DotNetOpenAuth-5a0a8ee4c55f323a6c1fbdb619cd89b7d28a94ba.tar.gz DotNetOpenAuth-5a0a8ee4c55f323a6c1fbdb619cd89b7d28a94ba.tar.bz2 | |
Merge branch 'v4.3'
Conflicts:
samples/OAuthClient/Default.aspx
samples/OAuthClient/Facebook.aspx.cs
samples/OAuthClient/Web.config
samples/OAuthClient/WindowsLive.aspx.cs
samples/OAuthClient/packages.config
src/DotNetOpenAuth.Core/Messaging/OutgoingWebResponse.cs
src/DotNetOpenAuth.Core/Messaging/StandardWebRequestHandler.cs
src/DotNetOpenAuth.OAuth.Consumer/OAuth/ConsumerBase.cs
src/DotNetOpenAuth.OAuth.Consumer/OAuth/OAuth1HmacSha1HttpMessageHandler.cs
src/DotNetOpenAuth.OAuth.Consumer/OAuth/OAuth1HttpMessageHandlerBase.cs
src/DotNetOpenAuth.OAuth.Consumer/OAuth/OAuth1PlainTextMessageHandler.cs
src/DotNetOpenAuth.OAuth.Consumer/OAuth/OAuth1RsaSha1HttpMessageHandler.cs
src/DotNetOpenAuth.OAuth2.Client/OAuth2/WebServerClient.cs
src/packages/repositories.config
src/version.txt
Diffstat (limited to 'samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj')
| -rw-r--r-- | samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj b/samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj index 19f26b5..5f97992 100644 --- a/samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj +++ b/samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj @@ -82,6 +82,7 @@ <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.ServiceModel.Web" /> <Reference Include="System.Web" /> + <Reference Include="System.Web.Extensions" /> <Reference Include="System.Xml.Linq"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> @@ -92,21 +93,28 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="AzureADClaims.cs" /> + <Compile Include="azureadclient.cs" /> + <Compile Include="AzureADGraph.cs" /> + <Compile Include="AzureADHeader.cs" /> <Compile Include="CustomExtensions\Acme.cs" /> <Compile Include="CustomExtensions\AcmeRequest.cs" /> <Compile Include="CustomExtensions\AcmeResponse.cs" /> - <Compile Include="Facebook\FacebookClient.cs" /> - <Compile Include="Facebook\FacebookGraph.cs" /> + <Compile Include="OAuth2\Facebook\FacebookClient.cs" /> + <Compile Include="OAuth2\Facebook\FacebookGraph.cs" /> <Compile Include="CustomExtensions\UIRequestAtRelyingPartyFactory.cs" /> - <Compile Include="GoogleConsumer.cs" /> <Compile Include="HttpAsyncHandlerBase.cs" /> <Compile Include="InMemoryClientAuthorizationTracker.cs" /> + <Compile Include="OAuth1\GoogleConsumer.cs" /> + <Compile Include="OAuth2\Google\GoogleClient.cs" /> + <Compile Include="OAuth2\Google\GoogleGraph.cs" /> + <Compile Include="OAuth2\IOAuth2Graph.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="TwitterConsumer.cs" /> + <Compile Include="OAuth1\TwitterConsumer.cs" /> <Compile Include="Util.cs" /> - <Compile Include="WindowsLiveClient.cs" /> - <Compile Include="WindowsLiveGraph.cs" /> - <Compile Include="YammerConsumer.cs" /> + <Compile Include="OAuth2\WindowsLive\WindowsLiveClient.cs" /> + <Compile Include="OAuth2\WindowsLive\WindowsLiveGraph.cs" /> + <Compile Include="OAuth1\YammerConsumer.cs" /> <Compile Include="YubikeyRelyingParty.cs" /> </ItemGroup> <ItemGroup> |