diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-21 22:58:36 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-21 22:58:36 -0700 |
| commit | 80028b1c5442c85909b889b3c52cfbd0c0121437 (patch) | |
| tree | b1b651c08a349957bb3d26ad5234a266d8d3e42e /samples/OAuthClient/OAuthClient.csproj | |
| parent | f02ccf1e93367b7ab8bece3a2c53e960e98d221d (diff) | |
| parent | e1455ee979b150d1ea4afdf1bc82a9e5cbc5b2ba (diff) | |
| download | DotNetOpenAuth-80028b1c5442c85909b889b3c52cfbd0c0121437.zip DotNetOpenAuth-80028b1c5442c85909b889b3c52cfbd0c0121437.tar.gz DotNetOpenAuth-80028b1c5442c85909b889b3c52cfbd0c0121437.tar.bz2 | |
Merge branch 'v4.0' into dev11
Conflicts:
src/DotNetOpenAuth.sln
Diffstat (limited to 'samples/OAuthClient/OAuthClient.csproj')
| -rw-r--r-- | samples/OAuthClient/OAuthClient.csproj | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/samples/OAuthClient/OAuthClient.csproj b/samples/OAuthClient/OAuthClient.csproj index 9c0b57a..65af47d 100644 --- a/samples/OAuthClient/OAuthClient.csproj +++ b/samples/OAuthClient/OAuthClient.csproj @@ -52,6 +52,7 @@ <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.ServiceModel" /> + <Reference Include="System.Web.Abstractions" /> <Reference Include="System.Web.Extensions" /> <Reference Include="System.Drawing" /> <Reference Include="System.Web" /> @@ -75,6 +76,7 @@ <Content Include="SampleWcf2Javascript.js" /> <Content Include="Scripts\jquery-1.6.1.js" /> <Content Include="Scripts\jquery-1.6.1.min.js" /> + <Content Include="WindowsLive.aspx" /> <Content Include="Yammer.aspx" /> <None Include="Service References\SampleResourceServer\DataApi.disco" /> <None Include="Service References\SampleResourceServer\configuration91.svcinfo" /> @@ -159,6 +161,13 @@ <Compile Include="Twitter.aspx.designer.cs"> <DependentUpon>Twitter.aspx</DependentUpon> </Compile> + <Compile Include="WindowsLive.aspx.cs"> + <DependentUpon>WindowsLive.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="WindowsLive.aspx.designer.cs"> + <DependentUpon>WindowsLive.aspx</DependentUpon> + </Compile> <Compile Include="Yammer.aspx.cs"> <DependentUpon>Yammer.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> |