summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2010-01-08 19:11:45 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2010-01-08 19:11:45 -0800
commit7d5c7947169aacfa61a7f0f7d8e3a9c0e9b938aa (patch)
tree04eafd4bcfe269b313cb077c11e1b9b58a7456f8 /src
parent5254a599a678e12e18794124c9dc53d34bdc0e99 (diff)
downloadDotNetOpenAuth-7d5c7947169aacfa61a7f0f7d8e3a9c0e9b938aa.zip
DotNetOpenAuth-7d5c7947169aacfa61a7f0f7d8e3a9c0e9b938aa.tar.gz
DotNetOpenAuth-7d5c7947169aacfa61a7f0f7d8e3a9c0e9b938aa.tar.bz2
More care in exactly which ASP.NET MVC assembly we reference in the library.
Diffstat (limited to 'src')
-rw-r--r--src/DotNetOpenAuth/DotNetOpenAuth.csproj17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
index c5660bd..ee271f3 100644
--- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj
+++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
@@ -196,8 +196,7 @@ http://opensource.org/licenses/ms-pl.html
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Web" />
- <Reference Include="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="System.Web.Abstractions">
<HintPath>..\..\lib\System.Web.Abstractions.dll</HintPath>
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
@@ -208,10 +207,7 @@ http://opensource.org/licenses/ms-pl.html
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Web.Mobile" Condition=" '$(ClrVersion)' != '4' " />
- <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- </Reference>
- <Reference Include="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="System.Web.Routing">
<HintPath>..\..\lib\System.Web.Routing.dll</HintPath>
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
@@ -227,6 +223,15 @@ http://opensource.org/licenses/ms-pl.html
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
</ItemGroup>
+ <ItemGroup Condition=" '$(ClrVersion)' == '4' ">
+ <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
+ </ItemGroup>
+ <ItemGroup Condition=" '$(ClrVersion)' != '4' ">
+ <!-- MVC 2 can run on CLR 2 (it doesn't require CLR 4) but since MVC 2 apps tend to use type forwarding,
+ it's a more broadly consumable idea to bind against MVC 1 for the library unless we're building on CLR 4,
+ which will definitely have MVC 2 available. -->
+ <Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
+ </ItemGroup>
<ItemGroup>
<Compile Include="ComponentModel\ClaimTypeSuggestions.cs" />
<Compile Include="ComponentModel\ConverterBase.cs" />