Skip to content

Commit

Permalink
update to nunit 2.5.7.10213
Browse files Browse the repository at this point in the history 
initial pass at compilation using .net 4.0 (not just side-by-side support)
  • Loading branch information
markpollack committed Sep 21, 2010
1 parent 11e5ab1 commit 139ce90
Show file tree
Hide file tree
Showing 92 changed files with 22,840 additions and 22,185 deletions.
58 changes: 56 additions & 2 deletions Spring.build
View file
Expand Up @@ -8,7 +8,7 @@ Main build targets:
builds debug builds for all projects for all available target platforms
"compile-build-<framework id>":
builds all projects for a specific platform, e.g. compile-build-net-2.0 for net-2.0
builds all projects for a specific platform, e.g. compile-build-2.0 for net-2.0
"doc":
builds the reference and sdk documentation
Expand Down Expand Up @@ -317,7 +317,9 @@ Commandline Examples:
<call target="compile-build-2.0"/>
<call target="compile-build-3.0"/>
<call target="compile-build-3.5"/>

<!--
<call target="compile-build-4.0"/>
-->
<!-- Ignore Compact Framework 1.0 for now -->
<!-- call target="compile-build-netcf-1.0"/ -->
<call target="compile-build-mono-2.0"/>
Expand Down Expand Up @@ -394,6 +396,26 @@ Commandline Examples:
</target>


<target name="compile-build-4.0" description="Builds for .NET 4.0 if available">

<if test="${net-4.0.installed}">
<call target="compile-net-4.0"/>
</if>

<if test="${not net-4.0.installed}">
<if test="${property::exists('project.build.package') and project.build.package}">
.NET 4.0 Build Skipped for Package
<fail message="The .NET Framework 4.0 is not available."/>
<echo message="The .NET Framework 4.0 is not available. Build skipped during package."/>
</if>
<if test="${not(property::exists('project.build.package') and project.build.package)}">
<echo message="The .NET Framework 4.0 is not available. Build skipped."/>
</if>
</if>
</target>



<!-- Targets for other .NET frameworks -->

<target name="compile-build-netcf-1.0" description="Builds for .NET 1.0 Compact Framework if available">
Expand Down Expand Up @@ -449,6 +471,7 @@ Commandline Examples:
<nant buildfile="src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0')}"/>
<nant buildfile="src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0')}"/>
<nant buildfile="src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'mono-2.0')}"/>
<nant buildfile="src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
<nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services and not net-3.5}"/>
<nant buildfile="src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build" target="build" if="${build-testing-nunit}"/>
<nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-microsoft and (nant.settings.currentframework == 'net-2.0')}"/>
Expand Down Expand Up @@ -555,6 +578,19 @@ Commandline Examples:
<call target="compile-test" />
</target>

<target name="compile-net-4.0" description="Builds .NET Framework 4.0 version"
depends="set-net-4.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
<call target="copykeys" if="${project.build.sign}"/>
<call target="common.generate-assemblyinfo"/>
<property name="build-ems" value="true" overwrite="true" />
<property name="build-nms" value="true" overwrite="true" />
<property name="build-quartz" value="true" overwrite="true" />
<property name="build-msmq" value="true" overwrite="true" />
<property name="build-msmq-tests" value="true" overwrite="true" />
<property name="build-velocity" value="true" overwrite="true" />
<call target="compile-test" />
</target>

<target name="compile-mono-2.0" description="Builds MONO Framework 2.0 version"
depends="set-mono-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
<call target="copykeys" if="${project.build.sign}"/>
Expand Down Expand Up @@ -683,6 +719,24 @@ Commandline Examples:
</if>
</target>

<target name="build-4.0">
<call target="set-build-namespaces-release"/>
<echo message="------------------------"/>
<echo message="Building .NET 4.0 DEBUG "/>
<echo message="------------------------"/>
<call target="set-debug-build-configuration"/>
<call target="compile-build-4.0"/>


<if test="${property::exists('project.build.package') and project.build.package}">
<echo message="--------------------------"/>
<echo message="Building .NET 4.0 RELEASE "/>
<echo message="--------------------------"/>
<call target="set-release-build-configuration"/>
<call target="compile-build-4.0"/>
</if>
</target>

<target name="build-mono-2.0">

<if test="${property::exists('project.build.package') and project.build.package}">
Expand Down
76 changes: 57 additions & 19 deletions Spring.include
View file
Expand Up @@ -17,29 +17,32 @@
value="${spring.basedir}/bin/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
dynamic="true"/>

<property name="net-3.0" value="false"/>
<property name="registry.net-3.0.installed" value="0" overwrite="false"/>

<readregistry property="registry.net-3.0.installed"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Install"
hive="LocalMachine"
failonerror="false" />
<!-- detect if .net 3.0 is installed -->
<property name="net-3.0" value="false"/>
<property name="registry.net-3.0.installed" value="0" overwrite="false"/>

<readregistry property="registry.dotnet.v3.0.Installed"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Setup\InstallSuccess"
hive="LocalMachine"
unless="${property::exists('registry.net-3.0.installed')}"
failonerror="false" />
<readregistry property="registry.net-3.0.installed"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Install"
hive="LocalMachine"
failonerror="false" />

<property name="net-3.0.installed" value="${registry.net-3.0.installed == '1'}" />
<readregistry property="registry.dotnet.v3.0.Installed"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Setup\InstallSuccess"
hive="LocalMachine"
unless="${property::exists('registry.net-3.0.installed')}"
failonerror="false" />

<if test="${net-3.0.installed}">
<readregistry property="net-3.0.ReferenceInstallPath"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Setup\Windows Communication Foundation\ReferenceInstallPath"
hive="LocalMachine"
if="${net-3.0.installed}" />
</if>
<property name="net-3.0.installed" value="${registry.net-3.0.installed == '1'}" />

<if test="${net-3.0.installed}">
<readregistry property="net-3.0.ReferenceInstallPath"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Setup\Windows Communication Foundation\ReferenceInstallPath"
hive="LocalMachine"
if="${net-3.0.installed}" />
</if>

<!-- detect if .net 3.5 is installed -->
<property name="net-3.5" value="false"/>
<property name="registry.net-3.5.installed" value="0" overwrite="false"/>

Expand All @@ -50,6 +53,19 @@

<property name="net-3.5.installed" value="${registry.net-3.5.installed == '1'}" />

<!-- detect if .net 4.0 is installed -->
<property name="net-4.0" value="false"/>
<property name="registry.net-4.0.installed" value="0" overwrite="false"/>

<readregistry property="registry.net-4.0.installed"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Install"
hive="LocalMachine"
failonerror="false" />

<property name="net-4.0.installed" value="${registry.net-4.0.installed == '1'}" />



<readregistry property="vs-net90.dir" key="SOFTWARE\Microsoft\VisualStudio\9.0\InstallDir" hive="LocalMachine" failonerror="false"/>

<!-- default location of mstest executable and reference assemblies -->
Expand Down Expand Up @@ -213,7 +229,7 @@
</imports>

<code>
<!-- format for assembly revision is RRXXX where RR = framework number (1.0=10; 1.1=11; 2.0=20, 3.0=30, 3.5=35, etc.) and
<!-- format for assembly revision is RRXXX where RR = framework number (1.0=10; 1.1=11; 2.0=20, 3.0=30, 3.5=35, 4.0=40 etc.) and
XXX is the number of days from the year the project 'started', property project.year. -->
<![CDATA[
public static void ScriptMain(Project project) {
Expand Down Expand Up @@ -427,6 +443,28 @@
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
<property name="nowarn.numbers.test" value="${nowarn.numbers.test.default},1701"/>
</target>

<target name="set-net-4.0-runtime-configuration"
depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
<property name="nant.settings.currentframework" value="net-4.0"/>
<property name="nant.settings.currentframework.number" value="4.0"/>
<!-- revision number used when generating assembly info -->
<property name="nant.settings.currentframework.revisionnumber" value="40"/>
<property name="net-2.0" value="true"/>
<property name="net-3.0" value="true"/>
<property name="net-3.5" value="true"/>
<property name="net-4.0" value="true"/>
<property name="current.build.debug" value="${build.debug}" dynamic="true"/>
<property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_3_0,NET_3_5,NET_4_0" dynamic="true"/>
<property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_3_0 /D NET_3_5 /D NET_4_0" dynamic="true"/>
<property name="current.bin.dir"
value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/4.0/${current.build.config}"/>
<property name="current.sdkdoc.dir"
value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/4.0"/>
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
<property name="nowarn.numbers.test" value="${nowarn.numbers.test.default},1701"/>
</target>

<target name="set-netcf-1.0-runtime-configuration"
depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
<property name="nant.settings.currentframework" value="netcf-1.0"/>
Expand Down
18 changes: 18 additions & 0 deletions build-support/tools/nunit/net-1.1/agent.log.conf
View file
@@ -0,0 +1,18 @@
<log4net>
<!-- A1 is set to be a ConsoleAppender -->
<appender name="A1" type="log4net.Appender.ConsoleAppender">

<!-- A1 uses PatternLayout -->
<layout type="log4net.Layout.PatternLayout">
<!-- Print the date in ISO 8601 format -->
<conversionPattern value="%-5level %logger - %message%newline" />
</layout>
</appender>

<!-- Set root logger level to DEBUG and its only appender to A1 -->
<root>
<level value="DEBUG" />
<appender-ref ref="A1" />
</root>

</log4net>
Binary file modified build-support/tools/nunit/net-1.1/framework/nunit.framework.dll
View file
Binary file not shown.

0 comments on commit 139ce90

Please sign in to comment.