diff options
| -rw-r--r-- | lib/System.Web.Mvc.dll (renamed from lib/net-v3.5/System.Web.Mvc.dll) | bin | 186176 -> 186176 bytes | |||
| -rw-r--r-- | lib/System.Web.Mvc.xml (renamed from lib/net-v3.5/System.Web.Mvc.xml) | 0 | ||||
| -rw-r--r-- | tools/Documentation.targets | 2 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.Product.props | 8 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.automated.props | 1 | ||||
| -rw-r--r-- | tools/drop.proj | 1 |
6 files changed, 4 insertions, 8 deletions
diff --git a/lib/net-v3.5/System.Web.Mvc.dll b/lib/System.Web.Mvc.dll Binary files differindex fb88363..fb88363 100644 --- a/lib/net-v3.5/System.Web.Mvc.dll +++ b/lib/System.Web.Mvc.dll diff --git a/lib/net-v3.5/System.Web.Mvc.xml b/lib/System.Web.Mvc.xml index a5885c2..a5885c2 100644 --- a/lib/net-v3.5/System.Web.Mvc.xml +++ b/lib/System.Web.Mvc.xml diff --git a/tools/Documentation.targets b/tools/Documentation.targets index 74efe3d..688e146 100644 --- a/tools/Documentation.targets +++ b/tools/Documentation.targets @@ -11,7 +11,7 @@ <ItemGroup> <MRefDependencies Include="$(ProjectRoot)lib\log4net.dll" /> - <MRefDependencies Include="$(ProjectRoot)lib\net-v3.5\System.Web.Mvc.dll" /> + <MRefDependencies Include="$(ProjectRoot)lib\System.Web.Mvc.dll" /> </ItemGroup> <Import Project="$(ProjectRoot)Tools\sandcastle.targets" /> diff --git a/tools/DotNetOpenAuth.Product.props b/tools/DotNetOpenAuth.Product.props index 0f9cd14..90ece0c 100644 --- a/tools/DotNetOpenAuth.Product.props +++ b/tools/DotNetOpenAuth.Product.props @@ -136,17 +136,15 @@ http://opensource.org/licenses/ms-pl.html <Reference Include="System.ComponentModel.DataAnnotations"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> + <!-- Since MVC 2 and higher apps tend to use type forwarding, + it's a more broadly consumable idea to bind against MVC 1 for the library --> + <Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> </ItemGroup> <ItemGroup Condition=" '$(ClrVersion)' == '4' "> - <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> <Reference Include="System.Xaml" /> </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" /> <Reference Include="System.Web.Mobile" /> <Reference Include="PresentationFramework"> <!-- For XamlReader, but we use System.Xaml.dll in .NET 4.0 --> diff --git a/tools/DotNetOpenAuth.automated.props b/tools/DotNetOpenAuth.automated.props index 5a0986f..a2dbe06 100644 --- a/tools/DotNetOpenAuth.automated.props +++ b/tools/DotNetOpenAuth.automated.props @@ -6,7 +6,6 @@ <AutomatedBuild>true</AutomatedBuild> <SolutionPath>$(ProjectRoot)src\$(ProductName).sln</SolutionPath> <BuildInParallel Condition=" '$(BuildInParallel)' == '' ">true</BuildInParallel> - <DowngradeMvc2ToMvc1 Condition=" '$(DowngradeMvc2ToMvc1)' == '' ">false</DowngradeMvc2ToMvc1> <!-- Validation controls whether extra builds are done in order to fully validate what we're distributing, even if we're not distributing the built bits (as is the case for project templates). --> <Validation Condition=" '$(Validation)' == '' ">Full</Validation> diff --git a/tools/drop.proj b/tools/drop.proj index e49e92b..71d2a02 100644 --- a/tools/drop.proj +++ b/tools/drop.proj @@ -162,7 +162,6 @@ Replacement="%(Replacement)" /> <DowngradeProjects Projects="@(SampleProjectTargets);@(SampleSolutionTargets)" - DowngradeMvc2ToMvc1="$(DowngradeMvc2ToMvc1)" Condition=" '$(DowngradeVS2010ToVS2008)' != 'false' " /> <ItemGroup> |