diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-09-01 17:34:59 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-09-01 17:34:59 -0700 |
| commit | 6e8a6eb02294c28b13bacaa339e58a67fd766f99 (patch) | |
| tree | a1bd58a2a51505ba71b697fb61378e7142df8ef3 /src/DotNetOpenAuth.sln | |
| parent | e36299f39476c56977c39700067ed8f6ae0a4e49 (diff) | |
| parent | 36b1ba3c75d060fa71f6f15582b90e7f70292ddc (diff) | |
| download | DotNetOpenAuth-6e8a6eb02294c28b13bacaa339e58a67fd766f99.zip DotNetOpenAuth-6e8a6eb02294c28b13bacaa339e58a67fd766f99.tar.gz DotNetOpenAuth-6e8a6eb02294c28b13bacaa339e58a67fd766f99.tar.bz2 | |
Merge branch 'master' into contracts
Conflicts:
src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs
src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/DotNetOpenAuth.csproj
src/DotNetOpenAuth/Messaging/MessageReceivingEndpoint.cs
src/DotNetOpenAuth/OAuth/ChannelElements/OAuthServiceProviderMessageFactory.cs
src/DotNetOpenAuth/OAuth/Protocol.cs
src/DotNetOpenAuth/OAuth/ServiceProvider.cs
src/DotNetOpenAuth/OpenId/Association.cs
src/DotNetOpenAuth/OpenId/Behaviors/PpidGeneration.cs
src/DotNetOpenAuth/OpenId/NoDiscoveryIdentifier.cs
src/DotNetOpenAuth/OpenId/Provider/HostProcessedRequest.cs
src/DotNetOpenAuth/OpenId/Provider/IDirectedIdentityIdentifierProvider.cs
src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs
src/DotNetOpenAuth/OpenId/Realm.cs
src/DotNetOpenAuth/OpenId/RelyingParty/AuthenticationRequest.cs
src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdAjaxTextBox.cs
src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdTextBox.cs
src/DotNetOpenAuth/OpenId/RelyingParty/PositiveAuthenticationResponseSnapshot.cs
src/DotNetOpenAuth/OpenId/UriIdentifier.cs
src/DotNetOpenAuth/OpenId/XriIdentifier.cs
src/DotNetOpenAuth/Util.cs
Diffstat (limited to 'src/DotNetOpenAuth.sln')
| -rw-r--r-- | src/DotNetOpenAuth.sln | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/DotNetOpenAuth.sln b/src/DotNetOpenAuth.sln index 0a156c4..f96bf48 100644 --- a/src/DotNetOpenAuth.sln +++ b/src/DotNetOpenAuth.sln @@ -105,6 +105,9 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "OpenIdRelyingPartyClassicAs EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OAuthConsumerWpf", "..\samples\OAuthConsumerWpf\OAuthConsumerWpf.csproj", "{6EC36418-DBC5-4AD1-A402-413604AA7A08}" + ProjectSection(ProjectDependencies) = postProject + {7ADCCD5C-AC2B-4340-9410-FE3A31A48191} = {7ADCCD5C-AC2B-4340-9410-FE3A31A48191} + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenID", "OpenID", "{034D5B5B-7D00-4A9D-8AFE-4A476E0575B1}" EndProject |