diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-01 19:38:01 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-01 19:38:01 -0800 |
| commit | bbebfbf5009526501d4a432c0ce7b0f8d325818c (patch) | |
| tree | a77971c8ced99bac678e5f520780284aa5d337ef /src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj | |
| parent | 9ffd411fa2115f5cdc4d2c0a473e55b0c82f7dc1 (diff) | |
| parent | 3ed1a19d2ba373869e5d1aa285726f3b5b99d0c2 (diff) | |
| download | DotNetOpenAuth-bbebfbf5009526501d4a432c0ce7b0f8d325818c.zip DotNetOpenAuth-bbebfbf5009526501d4a432c0ce7b0f8d325818c.tar.gz DotNetOpenAuth-bbebfbf5009526501d4a432c0ce7b0f8d325818c.tar.bz2 | |
Merge branch 'master' into webpages
Conflicts:
src/DotNetOpenAuth.sln
Diffstat (limited to 'src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj')
| -rw-r--r-- | src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj b/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj index 5fbd0f3..f669731 100644 --- a/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj +++ b/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj @@ -121,7 +121,6 @@ <Compile Include="Configuration\HostNameOrRegexCollection.cs" /> <Compile Include="Configuration\HostNameElement.cs" /> <Compile Include="IEmbeddedResourceRetrieval.cs" /> - <Compile Include="GlobalSuppressions.cs" /> <Compile Include="Logger.cs" /> <Compile Include="Loggers\ILog.cs" /> <Compile Include="Loggers\Log4NetLogger.cs" /> @@ -141,7 +140,6 @@ </ItemGroup> <ItemGroup> <None Include="Configuration\DotNetOpenAuth.xsd" /> - <None Include="Migrated rules for DotNetOpenAuth.ruleset" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Strings.resx"> @@ -163,6 +161,11 @@ <ItemGroup> <EmbeddedResource Include="Messaging\MessagingStrings.sr.resx" /> </ItemGroup> + <ItemGroup> + <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + </Reference> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " /> |