Permalink
Browse files

fixing up build script

  • Loading branch information...
sbohlen committed Jan 25, 2011
1 parent 72fe12b commit 3d243f7b9cf794ec4de644c6801c6621886aab5b

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -66,9 +66,11 @@
<property name="nant.settings.currentframework" value="net-3.5"/>
<property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}" />
<call target="TestAllAssemblies" />
- <property name="nant.settings.currentframework" value="net-4.0"/>
+ <!--
+ <property name="nant.settings.currentframework" value="net-4.0"/>
<property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}" />
<call target="TestAllAssemblies" />
+ -->
</target>
<target name="test-integration" depends="test">
@@ -291,14 +293,26 @@ ${tool.dir} : dir for tools
</target>
<target name="TestAllAssemblies">
+
+ <!-- have to delete the INVALID test ass'y otherwise the VALID tests will find the INVALID config types that support the INVALID tests -->
+ <delete>
+ <fileset basedir="${build.dir}">
+ <include name="**\*Invalid*.*" />
+ </fileset>
+ </delete>
+
<foreach item="File" property="filename">
<in>
<items basedir="${build.dir}">
<include name="**\*.Tests.dll" />
+ <exclude name="**\Spring.Core.Tests.dll" /> <!--have to exclude this b/c it contains all the CORE tests (that we don't want to run here! -->
</items>
</in>
<do>
<property name="test.assemblyname" value="${path::get-file-name-without-extension(filename)}" />
+
+
+
<property name="test.bin.dir" value="${build.dir}\${nant.settings.currentframework}"/>
<call target="common.run-tests" />
</do>
@@ -347,6 +361,10 @@ ${tool.dir} : dir for tools
<in>
<items basedir="${root.dir}">
<exclude name="tools/**" />
+
+ <!-- TODO: update this 2008 sln so it actually *builds* then remove this EXCLUDE -->
+ <exclude name="examples/**/Spring.IocQuickStart.MovieFinder.2008.sln" />
+
<include name="**/*.sln" />
</items>
</in>
View
@@ -7,7 +7,7 @@ REM 'test-integration'
cls
@ECHO building...
-tools\nant\bin\nant.exe daily -f:Spring.Config.build > buildlog.txt
+tools\nant\bin\nant.exe test -f:Spring.Config.build > buildlog.txt
@ECHO displaying log file...
start "ignored but required placeholder window title argument" buildlog.txt
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -22,8 +22,8 @@
[assembly: AssemblyCopyrightAttribute("Copyright 2010 SpringSource.")]
[assembly: AssemblyTrademarkAttribute("Apache License, Version 2.0")]
[assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("1.0.0.3989")]
+[assembly: AssemblyVersionAttribute("1.0.0.4042")]
[assembly: AssemblyConfigurationAttribute("net-4.0.win32; dev")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0.3989; net-4.0.win32; dev")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0.4042; net-4.0.win32; dev")]
[assembly: AssemblyDelaySignAttribute(false)]
@@ -24,7 +24,7 @@
namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
- public class ExtensionAttribute : Attribute
+ internal class ExtensionAttribute : Attribute
{
}
}
@@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\..\build\net-2.0\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -10,14 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring</RootNamespace>
<AssemblyName>Spring.Core.Configuration.Invalid.Tests</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\..\build\net-3.5\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -46,7 +47,6 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
@@ -10,15 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring</RootNamespace>
<AssemblyName>Spring.Core.Configuration.Tests</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\..\build\net-3.5\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

0 comments on commit 3d243f7

Please sign in to comment.