diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-17 21:44:30 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-17 21:44:30 -0800 |
| commit | a16b9b9222da75b43a44cfde9de912bba4c09670 (patch) | |
| tree | 5429e7a464fa77bf61ce111efe686183745e3537 /src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj | |
| parent | 9a77154c54439bacd06938e2c0624c69d4e48c69 (diff) | |
| parent | cdb850c6cf90381e6db75365272b7d65ef5fe359 (diff) | |
| download | DotNetOpenAuth-a16b9b9222da75b43a44cfde9de912bba4c09670.zip DotNetOpenAuth-a16b9b9222da75b43a44cfde9de912bba4c09670.tar.gz DotNetOpenAuth-a16b9b9222da75b43a44cfde9de912bba4c09670.tar.bz2 | |
Merge branch 'master' into master-Dev10
Conflicts:
build.proj
lib/DotNetOpenAuth.BuildTasks.dll
lib/DotNetOpenAuth.BuildTasks.pdb
src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs
src/DotNetOpenAuth.Test/Messaging/MultiPartPostPartTests.cs
src/DotNetOpenAuth.sln
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/OAuth/OAuthStrings.Designer.cs
Diffstat (limited to 'src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj')
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj index daf6327..3f76f78 100644 --- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj +++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj @@ -80,7 +80,9 @@ <Reference Include="Microsoft.Build.Utilities.v3.5"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> - <Reference Include="Microsoft.Contracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL" /> + <Reference Include="Microsoft.Contracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL"> + <Private>False</Private> + </Reference> <Reference Include="Microsoft.Web.Administration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>$(SystemRoot)\System32\inetsrv\Microsoft.Web.Administration.dll</HintPath> |