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/OAuthClient/OAuthClient.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/OAuthClient/OAuthClient.csproj')
| -rw-r--r-- | samples/OAuthClient/OAuthClient.csproj | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/samples/OAuthClient/OAuthClient.csproj b/samples/OAuthClient/OAuthClient.csproj index 3c94f38..1663748 100644 --- a/samples/OAuthClient/OAuthClient.csproj +++ b/samples/OAuthClient/OAuthClient.csproj @@ -73,6 +73,8 @@ <Reference Include="System.Xml.Linq" /> </ItemGroup> <ItemGroup> + <Content Include="AzureAD.aspx" /> + <Content Include="Google.aspx" /> <Content Include="Default.aspx" /> <Content Include="Facebook.aspx" /> <Content Include="favicon.ico" /> @@ -103,6 +105,20 @@ </ItemGroup> <ItemGroup> <Compile Include="Code\Logging.cs" /> + <Compile Include="AzureAD.aspx.cs"> + <DependentUpon>AzureAD.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="AzureAD.aspx.designer.cs"> + <DependentUpon>AzureAD.aspx</DependentUpon> + </Compile> + <Compile Include="Google.aspx.cs"> + <DependentUpon>Google.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Google.aspx.designer.cs"> + <DependentUpon>Google.aspx</DependentUpon> + </Compile> <Compile Include="Facebook.aspx.cs"> <DependentUpon>Facebook.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> |