summaryrefslogtreecommitdiffstats
path: root/src/OAuth
diff options
context:
space:
mode:
Diffstat (limited to 'src/OAuth')
-rw-r--r--src/OAuth/OAuthClient/OAuthClient.csproj16
-rw-r--r--src/OAuth/OAuthClient/packages.config3
-rw-r--r--src/OAuth/OAuthConsumer/OAuthConsumer.csproj16
-rw-r--r--src/OAuth/OAuthConsumer/packages.config3
-rw-r--r--src/OAuth/OAuthConsumerWpf/Authorize2.xaml.cs19
5 files changed, 27 insertions, 30 deletions
diff --git a/src/OAuth/OAuthClient/OAuthClient.csproj b/src/OAuth/OAuthClient/OAuthClient.csproj
index 4aba0b6..c1890f3 100644
--- a/src/OAuth/OAuthClient/OAuthClient.csproj
+++ b/src/OAuth/OAuthClient/OAuthClient.csproj
@@ -46,9 +46,15 @@
<Reference Include="DotNetOpenAuth.OAuth">
<HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.OAuth.dll</HintPath>
</Reference>
+ <Reference Include="DotNetOpenAuth.OAuth.Common">
+ <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>
+ </Reference>
<Reference Include="DotNetOpenAuth.OAuth.Consumer">
<HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>
</Reference>
+ <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider">
+ <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>
+ </Reference>
<Reference Include="DotNetOpenAuth.OAuth2">
<HintPath>..\..\..\packages\DotNetOpenAuth.OAuth2.Core.0.23.0-draft\lib\net35-full\DotNetOpenAuth.OAuth2.dll</HintPath>
</Reference>
@@ -58,6 +64,9 @@
<Reference Include="DotNetOpenAuth.OpenId">
<HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net35-full\DotNetOpenAuth.OpenId.dll</HintPath>
</Reference>
+ <Reference Include="DotNetOpenAuth.OpenIdOAuth">
+ <HintPath>..\..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>
+ </Reference>
<Reference Include="log4net">
<HintPath>..\..\..\packages\log4net.2.0.0\lib\net35-full\log4net.dll</HintPath>
</Reference>
@@ -117,9 +126,6 @@
</None>
</ItemGroup>
<ItemGroup>
- <Compile Include="..\DotNetOpenAuth.ApplicationBlock\InMemoryTokenManager.cs">
- <Link>Code\InMemoryTokenManager.cs</Link>
- </Compile>
<Compile Include="Facebook.aspx.cs">
<DependentUpon>Facebook.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -207,10 +213,6 @@
<None Include="Settings.StyleCop" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\src\DotNetOpenAuth.OpenIdOAuth\DotNetOpenAuth.OpenIdOAuth.csproj">
- <Project>{4BFAA336-5DF3-4F27-82D3-06D13240E8AB}</Project>
- <Name>DotNetOpenAuth.OpenIdOAuth</Name>
- </ProjectReference>
<ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">
<Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>
<Name>DotNetOpenAuth.ApplicationBlock</Name>
diff --git a/src/OAuth/OAuthClient/packages.config b/src/OAuth/OAuthClient/packages.config
index ce62375..01cb536 100644
--- a/src/OAuth/OAuthClient/packages.config
+++ b/src/OAuth/OAuthClient/packages.config
@@ -2,10 +2,13 @@
<packages>
<package id="CodeContracts.Unofficial" version="1.0.0.2" />
<package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
+ <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0-RC1" />
<package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0-RC1" />
<package id="DotNetOpenAuth.OAuth.Core" version="4.0.0-RC1" />
+ <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0-RC1" />
<package id="DotNetOpenAuth.OAuth2.Client" version="0.23.0-draft" />
<package id="DotNetOpenAuth.OAuth2.Core" version="0.23.0-draft" />
<package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
+ <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0-RC1" />
<package id="log4net" version="2.0.0" />
</packages> \ No newline at end of file
diff --git a/src/OAuth/OAuthConsumer/OAuthConsumer.csproj b/src/OAuth/OAuthConsumer/OAuthConsumer.csproj
index 8d5a025..705b797 100644
--- a/src/OAuth/OAuthConsumer/OAuthConsumer.csproj
+++ b/src/OAuth/OAuthConsumer/OAuthConsumer.csproj
@@ -46,12 +46,21 @@
<Reference Include="DotNetOpenAuth.OAuth">
<HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>
</Reference>
+ <Reference Include="DotNetOpenAuth.OAuth.Common">
+ <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Common.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Common.dll</HintPath>
+ </Reference>
<Reference Include="DotNetOpenAuth.OAuth.Consumer">
<HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>
</Reference>
+ <Reference Include="DotNetOpenAuth.OAuth.ServiceProvider">
+ <HintPath>..\..\..\packages\DotNetOpenAuth.OAuth.ServiceProvider.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll</HintPath>
+ </Reference>
<Reference Include="DotNetOpenAuth.OpenId">
<HintPath>..\..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
</Reference>
+ <Reference Include="DotNetOpenAuth.OpenIdOAuth">
+ <HintPath>..\..\..\packages\DotNetOpenAuth.OpenIdOAuth.4.0.0-RC1\lib\net40-full\DotNetOpenAuth.OpenIdOAuth.dll</HintPath>
+ </Reference>
<Reference Include="log4net">
<HintPath>..\..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
</Reference>
@@ -101,9 +110,6 @@
</None>
</ItemGroup>
<ItemGroup>
- <Compile Include="..\DotNetOpenAuth.ApplicationBlock\InMemoryTokenManager.cs">
- <Link>Code\InMemoryTokenManager.cs</Link>
- </Compile>
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
@@ -177,10 +183,6 @@
<None Include="Settings.StyleCop" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\src\DotNetOpenAuth.OpenIdOAuth\DotNetOpenAuth.OpenIdOAuth.csproj">
- <Project>{4BFAA336-5DF3-4F27-82D3-06D13240E8AB}</Project>
- <Name>DotNetOpenAuth.OpenIdOAuth</Name>
- </ProjectReference>
<ProjectReference Include="..\..\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj">
<Project>{AA78D112-D889-414B-A7D4-467B34C7B663}</Project>
<Name>DotNetOpenAuth.ApplicationBlock</Name>
diff --git a/src/OAuth/OAuthConsumer/packages.config b/src/OAuth/OAuthConsumer/packages.config
index 9304f8f..85688d9 100644
--- a/src/OAuth/OAuthConsumer/packages.config
+++ b/src/OAuth/OAuthConsumer/packages.config
@@ -2,8 +2,11 @@
<packages>
<package id="CodeContracts.Unofficial" version="1.0.0.2" />
<package id="DotNetOpenAuth.Core" version="4.0.0-RC1" />
+ <package id="DotNetOpenAuth.OAuth.Common" version="4.0.0-RC1" />
<package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.0-RC1" />
<package id="DotNetOpenAuth.OAuth.Core" version="4.0.0-RC1" />
+ <package id="DotNetOpenAuth.OAuth.ServiceProvider" version="4.0.0-RC1" />
<package id="DotNetOpenAuth.OpenId.Core" version="4.0.0-RC1" />
+ <package id="DotNetOpenAuth.OpenIdOAuth" version="4.0.0-RC1" />
<package id="log4net" version="2.0.0" />
</packages> \ No newline at end of file
diff --git a/src/OAuth/OAuthConsumerWpf/Authorize2.xaml.cs b/src/OAuth/OAuthConsumerWpf/Authorize2.xaml.cs
index 5785a6e..64a10e2 100644
--- a/src/OAuth/OAuthConsumerWpf/Authorize2.xaml.cs
+++ b/src/OAuth/OAuthConsumerWpf/Authorize2.xaml.cs
@@ -1,19 +1,6 @@
namespace DotNetOpenAuth.Samples.OAuthConsumerWpf {
- using System;
- using System.Collections.Generic;
- using System.Diagnostics.Contracts;
- using System.Linq;
- using System.Text;
- using System.Windows;
- using System.Windows.Controls;
- using System.Windows.Data;
- using System.Windows.Documents;
- using System.Windows.Input;
- using System.Windows.Media;
- using System.Windows.Media.Imaging;
- using System.Windows.Navigation;
- using System.Windows.Shapes;
- using DotNetOpenAuth.Messaging;
+
+ using System.Windows;
using DotNetOpenAuth.OAuth2;
/// <summary>
@@ -21,7 +8,7 @@
/// </summary>
public partial class Authorize2 : Window {
internal Authorize2(UserAgentClient client) {
- Contract.Requires(client != null, "client");
+ //System.Diagnostics.Contracts.Contract.Requires(client != null, "client");
this.InitializeComponent();
this.clientAuthorizationView.Client = client;