[NAntC-cvs] NAntContrib NAntContrib.build,1.121,1.122

[<dri...@us...>]

Update of /cvsroot/nantcontrib/NAntContrib
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8135

Modified Files:
	NAntContrib.build 
Log Message:
Fixed build for .NET Framework 3.5 / Mono 3.5 Profile.

Index: NAntContrib.build
===================================================================
RCS file: /cvsroot/nantcontrib/NAntContrib/NAntContrib.build,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** NAntContrib.build	8 Dec 2007 11:41:24 -0000	1.121
--- NAntContrib.build	8 Dec 2007 12:02:12 -0000	1.122
***************
*** 191,194 ****
--- 191,195 ----
                  <warning number="1591" />
                  <!-- do not report deprecation warnings -->
+                 <warning number="0612" />
                  <warning number="0618" />
              </nowarn>
***************
*** 253,257 ****
                  <include name="bin/NAnt.Win32Tasks.dll" />
                  <include name="bin/log4net.dll" />
!                 <include name="bin/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/nunit.framework.dll" />
              </fileset>
          </copy>
--- 254,258 ----
                  <include name="bin/NAnt.Win32Tasks.dll" />
                  <include name="bin/log4net.dll" />
!                 <include name="${nunit.dir}/nunit.framework.dll" />
              </fileset>
          </copy>
***************
*** 273,277 ****
              <references>
                  <include name="${nant.dir}/bin/NAnt.Core.dll" />
!                 <include name="${nant.dir}/bin/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/nunit.framework.dll" />
                  <include name="${build.dir}/bin/${project.FormalName}.Tasks.dll" />
                  <include name="${build.dir}/bin/SourceSafe.Interop.dll" />
--- 274,278 ----
              <references>
                  <include name="${nant.dir}/bin/NAnt.Core.dll" />
!                 <include name="${nunit.dir}/nunit.framework.dll" />
                  <include name="${build.dir}/bin/${project.FormalName}.Tasks.dll" />
                  <include name="${build.dir}/bin/SourceSafe.Interop.dll" />
***************
*** 602,605 ****
--- 603,607 ----
          <property name="link.sdkdoc.version" value="SDK_v1_0" />
          <property name="link.sdkdoc.web" value="true" />
+         <property name="nunit.dir" value="${nant.dir}/bin/lib/net/1.0" />
      </target>
      <target name="set-net-1.1-framework-configuration">
***************
*** 608,611 ****
--- 610,614 ----
          <property name="link.sdkdoc.version" value="SDK_v1_1" />
          <property name="link.sdkdoc.web" value="true" />
+         <property name="nunit.dir" value="${nant.dir}/bin/lib/net/1.1" />
      </target>
      <target name="set-net-2.0-framework-configuration">
***************
*** 614,617 ****
--- 617,621 ----
          <property name="link.sdkdoc.version" value="SDK_v1_1" />
          <property name="link.sdkdoc.web" value="true" />
+         <property name="nunit.dir" value="${nant.dir}/bin/lib/net/2.0" />
      </target>
      <target name="set-net-3.5-framework-configuration">
***************
*** 620,629 ****
          <property name="link.sdkdoc.version" value="SDK_v1_1" />
          <property name="link.sdkdoc.web" value="true" />
!     </target>
!     <target name="set-netcf-1.0-framework-configuration">
!         <property name="nant.settings.currentframework" value="netcf-1.0" />
!         <property name="current.build.defines" value="${build.defines}NETCF,NETCF_1_0" dynamic="true" />
!         <property name="link.sdkdoc.version" value="SDK_v1_1" />
!         <property name="link.sdkdoc.web" value="true" />
      </target>
      <target name="set-mono-1.0-framework-configuration">
--- 624,628 ----
          <property name="link.sdkdoc.version" value="SDK_v1_1" />
          <property name="link.sdkdoc.web" value="true" />
!         <property name="nunit.dir" value="${nant.dir}/bin/lib/net/2.0" />
      </target>
      <target name="set-mono-1.0-framework-configuration">
***************
*** 632,635 ****
--- 631,635 ----
          <property name="link.sdkdoc.version" value="SDK_v1_1" />
          <property name="link.sdkdoc.web" value="true" />
+         <property name="nunit.dir" value="${nant.dir}/bin/lib/mono/1.0" />
      </target>
      <target name="set-mono-2.0-framework-configuration">
***************
*** 638,641 ****
--- 638,642 ----
          <property name="link.sdkdoc.version" value="SDK_v1_1" />
          <property name="link.sdkdoc.web" value="true" />
+         <property name="nunit.dir" value="${nant.dir}/bin/lib/mono/2.0" />
      </target>
      <target name="set-mono-3.5-framework-configuration">
***************
*** 644,653 ****
          <property name="link.sdkdoc.version" value="SDK_v1_1" />
          <property name="link.sdkdoc.web" value="true" />
!     </target>
!     <target name="set-sscli-1.0-framework-configuration">
!         <property name="nant.settings.currentframework" value="sscli-1.0" />
!         <property name="current.build.defines" value="${build.defines}SSCLI,SSCLI_1_0" dynamic="true" />
!         <property name="link.sdkdoc.version" value="SDK_v1_0" />
!         <property name="link.sdkdoc.web" value="true" />
      </target>
  </project>
--- 645,649 ----
          <property name="link.sdkdoc.version" value="SDK_v1_1" />
          <property name="link.sdkdoc.web" value="true" />
!         <property name="nunit.dir" value="${nant.dir}/bin/lib/mono/2.0" />
      </target>
  </project>