Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mods to reflect need to support both /program files/ and /program files (x86)/ paths for certain .NET framework references (MVC-related)

Browse Source
This commit is contained in:
sbohlen
2010-12-09 18:10:44 +00:00
parent 91549d3d36
commit 6159e65a4e
4 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Spring.build
View File

@@ -1798,7 +1798,8 @@ Commandline Examples:
<include name="examples/Spring/Spring.Calculator/**"/>
<include name="examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/*.refresh"/>
<include name="examples/Spring/Spring.WebQuickStart/**"/>
<include name="examples/Spring/Spring.Web.Extensions.Example/**"/>
<include name="examples/Spring/Spring.MvcQuickStart/**"/>
<include name="examples/Spring/Spring.Web.Extensions.Example/**"/>
<include name="examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/*.refresh"/>
<include name="examples/Spring/SpringAir/**"/>
<include name="examples/SpringAir/src/SpringAir.Web.2005/bin/*.refresh"/>

9
src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
View File

@@ -34,12 +34,15 @@
<include name="Spring.Aop.dll" />
<include name="System.Configuration.dll" />
<include name="System.Web.dll" />
<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll" if="${nant.settings.currentframework=='net-3.5'}" />
<include name="System.Web.Abstractions.dll" if="${nant.settings.currentframework=='net-4.0'}" />
<include name="System.Web.Services.dll" />
<include name="C:\Program Files\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
<include name="C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
<include name="C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll" if="${nant.settings.currentframework=='net-3.5'}" />
<include if="${net-4.0.installed and net-4.0}" name="System.Web.ApplicationServices.dll" />
</references>
</csc>

1
test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj
View File

@@ -39,6 +39,7 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Routing" />

31
test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
View File

@@ -35,19 +35,26 @@
</resources>
<references basedir="${current.bin.dir}">
<include name="*.dll" />
<include name="System.Configuration.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Drawing.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Web.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Web.Services.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll" if="${nant.settings.currentframework=='net-3.5'}" />
<include name="System.Web.Abstractions.dll" if="${nant.settings.currentframework=='net-4.0'}" />
<include name="System.Configuration.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Drawing.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Web.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Web.Services.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Web.Abstractions.dll" if="${nant.settings.currentframework=='net-4.0'}" />
<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
<include name="C:\Program Files\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
<include name="C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
<include name="C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll" if="${nant.settings.currentframework=='net-3.5'}" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<include name="${lib.dir}/nunit.core.interfaces.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>