Author: gert
Date: 2007-08-28 13:52:22 -0400 (Tue, 28 Aug 2007)
New Revision: 84967

Added:
   trunk/gert/standalone/bug82498/test.cs
   trunk/gert/standalone/bug82616/
   trunk/gert/standalone/bug82616/default.build
   trunk/gert/standalone/bug82616/test.cs
Removed:
   trunk/gert/standalone/bug82498/test1.cs
Modified:
   trunk/gert/standalone/bug82498/default.build
   trunk/gert/standalone/known-issues
Log:
Moved part of test for bug #82498 to separate bug (#82616).


Modified: trunk/gert/standalone/bug82498/default.build
===================================================================
--- trunk/gert/standalone/bug82498/default.build        2007-08-28 17:49:33 UTC 
(rev 84966)
+++ trunk/gert/standalone/bug82498/default.build        2007-08-28 17:52:22 UTC 
(rev 84967)
@@ -13,8 +13,7 @@
                <delete>
                        <fileset>
                                <include name="out" />
-                               <include name="test1.exe" />
-                               <include name="test2.exe" />
+                               <include name="test.exe" />
                        </fileset>
                </delete>
        </target>
@@ -35,23 +34,16 @@
        </target>
 
        <target name="compile">
-               <csc target="exe" define="${csc.defines}" output="test1.exe" 
warnaserror="true" warninglevel="4">
+               <csc target="exe" define="${csc.defines}" output="test.exe" 
warnaserror="true" warninglevel="4">
                        <sources>
-                               <include name="test1.cs" />
+                               <include name="test.cs" />
                        </sources>
                </csc>
-               <csc target="exe" define="${csc.defines}" output="test2.exe" 
warnaserror="true" warninglevel="4">
-                       <sources>
-                               <include name="test2.cs" />
-                       </sources>
-               </csc>
        </target>
 
        <target name="run" depends="compile">
-               <exec program="test1.exe" managed="true" output="out" />
-               <fail if="${file::exists('out')}">#1</fail>
-               <exec program="test2.exe" managed="true" output="out" />
-               <fail if="${file::exists('out')}">#2</fail>
+               <exec program="test.exe" managed="true" output="out" />
+               <fail if="${file::exists('out')}" />
        </target>
 
        <target name="rebuild" depends="clean, build" />

Copied: trunk/gert/standalone/bug82498/test.cs (from rev 84965, 
trunk/gert/standalone/bug82498/test1.cs)

Deleted: trunk/gert/standalone/bug82498/test1.cs
===================================================================
--- trunk/gert/standalone/bug82498/test1.cs     2007-08-28 17:49:33 UTC (rev 
84966)
+++ trunk/gert/standalone/bug82498/test1.cs     2007-08-28 17:52:22 UTC (rev 
84967)
@@ -1,28 +0,0 @@
-using System;
-
-public abstract class BusinessBase<TYPE, KEY> where TYPE : BusinessBase<TYPE, 
KEY>, new ()
-{
-       public static void Load (KEY id)
-       {
-               TYPE instance = new TYPE ();
-               instance = instance.DataSelect (id);
-       }
-
-       protected abstract TYPE DataSelect (KEY id);
-}
-
-public class Page : BusinessBase<Page, Guid>
-{
-       protected override Page DataSelect (Guid k)
-       {
-               return new Page ();
-       }
-}
-
-class D
-{
-       static void Main ()
-       {
-               Page.Load (new Guid ());
-       }
-}

Added: trunk/gert/standalone/bug82616/default.build
===================================================================
--- trunk/gert/standalone/bug82616/default.build        2007-08-28 17:49:33 UTC 
(rev 84966)
+++ trunk/gert/standalone/bug82616/default.build        2007-08-28 17:52:22 UTC 
(rev 84967)
@@ -0,0 +1,50 @@
+<project name="bug82616" default="rebuild">
+       <target name="mono-2.0">
+               <property name="csc.defines" 
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0,MONO" />
+       </target>
+
+       <target name="net-2.0">
+               <property name="csc.defines" 
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0" />
+       </target>
+
+       <property name="frameworks" value="mono-2.0,net-2.0" />
+
+       <target name="clean">
+               <delete>
+                       <fileset>
+                               <include name="out" />
+                               <include name="test.exe" />
+                       </fileset>
+               </delete>
+       </target>
+
+       <target name="build">
+               <property name="original.targetframework" 
value="${nant.settings.currentframework}" />
+
+               <foreach property="framework" item="String" in="${frameworks}" 
delim=",">
+                       <if test="${framework::exists(framework)}">
+                               <property name="nant.settings.currentframework" 
value="${framework}" />
+                               <call 
target="${nant.settings.currentframework}" />
+                               <call target="run" />
+                               <call target="clean" />
+                       </if>
+               </foreach>
+
+               <property name="nant.settings.currentframework" 
value="${original.targetframework}" />
+       </target>
+
+       <target name="compile">
+               <csc target="exe" define="${csc.defines}" output="test.exe" 
warnaserror="true" warninglevel="4">
+                       <sources>
+                               <include name="test.cs" />
+                       </sources>
+               </csc>
+       </target>
+
+       <target name="run" depends="compile">
+               <exec program="test.exe" managed="true" output="out" />
+               <fail if="${file::exists('out')}" />
+       </target>
+
+       <target name="rebuild" depends="clean, build" />
+</project>


Property changes on: trunk/gert/standalone/bug82616/default.build
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/gert/standalone/bug82616/test.cs
===================================================================
--- trunk/gert/standalone/bug82616/test.cs      2007-08-28 17:49:33 UTC (rev 
84966)
+++ trunk/gert/standalone/bug82616/test.cs      2007-08-28 17:52:22 UTC (rev 
84967)
@@ -0,0 +1,28 @@
+using System;
+
+public abstract class BusinessBase<TYPE> where TYPE : BusinessBase<TYPE>, new 
()
+{
+       public static void Load<KEY> (KEY id)
+       {
+               TYPE instance = new TYPE ();
+               instance = instance.DataSelect<KEY> (id);
+       }
+
+       protected abstract TYPE DataSelect<KEY> (KEY id);
+}
+
+public class Page : BusinessBase<Page>
+{
+       protected override Page DataSelect<Guid> (Guid k)
+       {
+               return new Page ();
+       }
+}
+
+class D
+{
+       static void Main ()
+       {
+               Page.Load<Guid> (new Guid ());
+       }
+}


Property changes on: trunk/gert/standalone/bug82616/test.cs
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/gert/standalone/known-issues
===================================================================
--- trunk/gert/standalone/known-issues  2007-08-28 17:49:33 UTC (rev 84966)
+++ trunk/gert/standalone/known-issues  2007-08-28 17:52:22 UTC (rev 84967)
@@ -74,7 +74,7 @@
 bug82443/**
 bug82461/**
 bug82465/**
-bug82498/**
 bug82545/**
 bug82550/**
 bug82595/**
+bug82616/**

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to