summaryrefslogtreecommitdiffstats
path: root/samples/OAuthClient/OAuthClient.csproj
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2013-05-31 08:56:40 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2013-05-31 08:56:40 -0700
commitacdf7421c0e51a2c7cb50ae3278769e4c295783d (patch)
treec16be1dc23d2938df927811bad274dab86323fb8 /samples/OAuthClient/OAuthClient.csproj
parentd8a034db629baa0e2a86528eac5d0ab49d9bb984 (diff)
parent3858496786be3349e5c7958e3d22766e4883e488 (diff)
downloadDotNetOpenAuth-acdf7421c0e51a2c7cb50ae3278769e4c295783d.zip
DotNetOpenAuth-acdf7421c0e51a2c7cb50ae3278769e4c295783d.tar.gz
DotNetOpenAuth-acdf7421c0e51a2c7cb50ae3278769e4c295783d.tar.bz2
Merge branch 'v4.3' of https://github.com/DotNetOpenAuth/DotNetOpenAuth into v4.3
Diffstat (limited to 'samples/OAuthClient/OAuthClient.csproj')
-rw-r--r--samples/OAuthClient/OAuthClient.csproj15
1 files changed, 13 insertions, 2 deletions
diff --git a/samples/OAuthClient/OAuthClient.csproj b/samples/OAuthClient/OAuthClient.csproj
index 9fbcc5d..3172562 100644
--- a/samples/OAuthClient/OAuthClient.csproj
+++ b/samples/OAuthClient/OAuthClient.csproj
@@ -10,6 +10,7 @@
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -23,7 +24,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OAuthClient</RootNamespace>
<AssemblyName>OAuthClient</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseIISExpress>true</UseIISExpress>
</PropertyGroup>
@@ -49,7 +50,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net">
- <HintPath>..\..\lib\log4net.dll</HintPath>
+ <HintPath>..\..\src\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -71,6 +72,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="AzureAD.aspx" />
+ <Content Include="Google.aspx" />
<Content Include="Default.aspx" />
<Content Include="Facebook.aspx" />
<Content Include="favicon.ico" />
@@ -84,6 +86,7 @@
<Content Include="Scripts\jquery-1.6.1.min.js" />
<Content Include="WindowsLive.aspx" />
<Content Include="Yammer.aspx" />
+ <Content Include="packages.config" />
<None Include="Service References\SampleResourceServer\DataApi.disco" />
<None Include="Service References\SampleResourceServer\configuration91.svcinfo" />
<None Include="Service References\SampleResourceServer\configuration.svcinfo" />
@@ -114,6 +117,13 @@
<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>
@@ -262,4 +272,5 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
+ <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
</Project> \ No newline at end of file