Enable NET_2_0 tests run for TARGET_JVM.
authorBoris Kirzner <borisk@mono-cvs.ximian.com>
Mon, 28 Aug 2006 12:20:11 +0000 (12:20 -0000)
committerBoris Kirzner <borisk@mono-cvs.ximian.com>
Mon, 28 Aug 2006 12:20:11 +0000 (12:20 -0000)
svn path=/trunk/mcs/; revision=64471

12 files changed:
mcs/class/System.Drawing/ChangeLog
mcs/class/System.Drawing/Test/ChangeLog
mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog
mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj [new file with mode: 0644]
mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj [new file with mode: 0644]
mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj [new file with mode: 0644]
mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj [new file with mode: 0644]
mcs/class/System.Drawing/Test/System.Drawing.Test20.J2EE.sln [new file with mode: 0644]
mcs/class/System.Drawing/Test/System.Drawing.Test20.sln [new file with mode: 0644]
mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj [new file with mode: 0644]
mcs/class/System.Drawing/Test/Test20.csproj [new file with mode: 0644]
mcs/class/System.Drawing/run-tests.test.bat

index db1c0571f2d9863975822aa89b645a460018e3b3..db59a98bb21ac7d60953eeb2b18ef28e022cb4e7 100644 (file)
-2006-08-24  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added unit tests for TextureBrush.
-
-2006-08-12  Duncan Mak  <duncan@novell.com>
-
-       * GDIPlusTest.csproj: New MSBuild project file for building
-       GDIPlusTest on Windows.
-
-       * System.Drawing_test.dll.sources: Add gdipEnums.cs,
-       gdipFunctions.cs and gdipStructs.cs.
-
-       * Makefile (TEST_MCS_FLAGS): Add new #define 'TEST'. This is used
-       to exclude parts of gdipFunctions so that it could be reused as
-       part of the NUnit tests.
-
-2006-08-02  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * Makefile: Add the test bitmaps to EXTRA_DISTFILES so monobuild has
-       them available when running the unit tests.
-
-2006-07-06  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added unit tests for direct GDI+ 
-       function calls.
-
-2006-06-30  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added unit tests for SolidBrush.
-
-2006-05-30  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added unit tests for FontFamily.
-
-2006-05-17  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added unit tests for Pen.
-
-2006-05-16  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-       * run-tests.test.bat: skip nunit build if already done
-
-2006-05-09  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added unit tests for 
-       PathGradientBrush.
-
-2006-01-30 Boris Kirzner <borisk@mainsoft.com>
-       * run-tests.test.bat: changed location of xmltool.
-
-2006-01-29 Boris Kirzner <borisk@mainsoft.com>
-       * run-tests.bat, run-tests.test.bat, runtestfixture.bat, 
-       runmonotestfixture.bat : added batch files for automatic 
-       testing for TARGET_JVM.
-
-2006-01-18  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added unit tests for RegionData and
-       non-rectangular Region.
-
-2006-01-12  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added unit tests for GraphicsPath 
-       and PathData.
-
-2006-01-11  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added CAS unit tests for Region to 
-       the build.
-
-2005-12-05 Jordi Mas i Hernandez <jordimash@gmail.com>
-
+2006-08-28     Boris Kirzner <borisk@mainsoft.com>\r
+\r
+       * run-tests.test.bat: chnged script for tests NET_2_0 run.\r
+\r
+2006-08-24  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added unit tests for TextureBrush.\r
+\r
+2006-08-12  Duncan Mak  <duncan@novell.com>\r
+\r
+       * GDIPlusTest.csproj: New MSBuild project file for building\r
+       GDIPlusTest on Windows.\r
+\r
+       * System.Drawing_test.dll.sources: Add gdipEnums.cs,\r
+       gdipFunctions.cs and gdipStructs.cs.\r
+\r
+       * Makefile (TEST_MCS_FLAGS): Add new #define 'TEST'. This is used\r
+       to exclude parts of gdipFunctions so that it could be reused as\r
+       part of the NUnit tests.\r
+\r
+2006-08-02  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * Makefile: Add the test bitmaps to EXTRA_DISTFILES so monobuild has\r
+       them available when running the unit tests.\r
+\r
+2006-07-06  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added unit tests for direct GDI+ \r
+       function calls.\r
+\r
+2006-06-30  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added unit tests for SolidBrush.\r
+\r
+2006-05-30  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added unit tests for FontFamily.\r
+\r
+2006-05-17  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added unit tests for Pen.\r
+\r
+2006-05-16  Vladimir Krasnov  <vladimirk@mainsoft.com>\r
+\r
+       * run-tests.test.bat: skip nunit build if already done\r
+\r
+2006-05-09  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added unit tests for \r
+       PathGradientBrush.\r
+\r
+2006-01-30 Boris Kirzner <borisk@mainsoft.com>\r
+       * run-tests.test.bat: changed location of xmltool.\r
+\r
+2006-01-29 Boris Kirzner <borisk@mainsoft.com>\r
+       * run-tests.bat, run-tests.test.bat, runtestfixture.bat, \r
+       runmonotestfixture.bat : added batch files for automatic \r
+       testing for TARGET_JVM.\r
+\r
+2006-01-18  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added unit tests for RegionData and\r
+       non-rectangular Region.\r
+\r
+2006-01-12  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added unit tests for GraphicsPath \r
+       and PathData.\r
+\r
+2006-01-11  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added CAS unit tests for Region to \r
+       the build.\r
+\r
+2005-12-05 Jordi Mas i Hernandez <jordimash@gmail.com>\r
+\r
        * MetaHeader.cs: Classes need to specify StructLayout attribute\r
        * EncoderParameter.cs: Classes need to specify StructLayout attribute\r
        * ImageAttributes.cs: Classes need to specify StructLayout attribute\r
        * WmfPlaceableFileHeader.cs: Classes need to specify StructLayout attribute\r
-       * MetafileHeader.cs: Classes need to specify StructLayout attribute
-
-2005-12-04 Konstantin Triger <kostat@mainsoft.com>
-
-        * net_1_1_java_System.Drawing.dll.exclude.sources,
-               net_1_1_java_System.Drawing.dll.sources:
-               correcting SystemIcons.cs reference.
-
-2005-11-28 Konstantin Triger <kostat@mainsoft.com>
-
-       * System.Drawing.vmwcsproj: Added System icons; changed to mono icon implementation.
-
-2005-11-14  Andrew Skiba  <andrews@mainsoft.com>
-
-       * net_1_1_java_System.Drawing.dll.sources,
-       net_1_1_java_System.Drawing.dll.exclude.sources: added java profile
-       sources lists
-       * Makefile: add java profile section
-
-2005-11-13 Konstantin Triger <kostat@mainsoft.com>
-
-       * System.Drawing.vmwcsproj: Added System.Drawing.Text/LineLayout.jvm.cs,
-               System.Drawing.Text/LineLayout.jvm.cs
-
-2005-09-27  Kornél Pál  <kornelpal@hotmail.com>
-
-       * Makefile: Removed /codepage:28591 as it is the default.
-
-2005-09-19  Miguel de Icaza  <miguel@novell.com>
-
-       * Makefile (EXTRA_DISTFILES): Distribute indexed.png, add resource
-       to build.
-
-2005-09-14 Vladimir Krasnov <vladimirk@mainsoft.com>
-
-       * System.Drawing.vmwcsproj: Added PlainImage.jvm.cs, PlainImageCollection.jvm.cs
-
-2005-09-07 Vladimir Krasnov <vladimirk@mainsoft.com>
-
-       * System.Drawing.vmwcsproj: ImageCodec.jvm.cs
-       Added Mainsoft.Drawing.Configuration.jvm folder with
-       ResolutionConfiguration.cs, ResolutionConfigurationCollection.cs, 
-       ResolutionConfigurationHandler.cs
-
-2005-08-28 Vladimir Krasnov <vladimirk@mainsoft.com>
-
-       * System.Drawing.vmwcsproj: Added GraphicsContainer.jvm.cs, GraphicsState.jvm.cs
-       Excluded: GraphicsContainer.cs, GraphicsState.cs
-       Fixed: const.cs.in
-
-2005-08-25 Atsushi Enomoto <atsushi@ximian.com>
-
-       * Makefile: build fix for some utf8-defaulted environment.
-
-2005-08-24 Marek Safar <marek.safar@seznam.cz>
-
-       * SD.csproj: Updated.
-
-2005-08-23 Eyal Alalyf <eyala@mainsoft.com>
-       * System.Drawing.vmwcsproj: Change it to be developer edition project file
-
-2005-08-23 Boris Kirzner <borisk@mainsoft.com>
-       * System.Drawing.vmwcsproj: Changed reference to Consts.cs.
-
-2005-08-16 Andrew Skiba <andrews@mainsoft.com>
-
-       * System.Drawing.vmwcsproj: use ImageFormat.cs instead of jvm.cs
-
-2005-08-14 Gert Driesen <drieseng@users.sourceforge.net>
-       
-       * System.Drawing.dll.sources: Removed TestColorConverter again, as 
-       there was already a test class for ColorConverter.
-
-2005-08-14 Gert Driesen <drieseng@users.sourceforge.net>
-
-       * System.Drawing.dll.sources: Added TestColorConverter.cs.
-
-2005-08-14 Vladimir Krasnov <vladimirk@mainsoft.com>
-
-       * System.Drawing.vmwcsproj: Added SystemIcons.jvm.cs, excluded SystemIcons.cs
-       
-2005-08-11 Konstantin Triger <kostat@mainsoft.com>
-
-        * System.Drawing.vmwcsproj: changing JAVA to TARGET_JVM in release builds
-
-2005-08-10 Boris Kirzner <borisk@mainsoft.com>
-       * System.Drawing.vmwcsproj: Added ExtendedGeneralPath.jvm.cs and GeneralPathIterator.jvm.cs.
-
-2005-08-09 Konstantin Triger <kostat@mainsoft.com>
-
-       * System.Drawing.vmwcsproj: Added AdvancedStoke.jvm.cs and StrokeFactory.jvm.cs
-
-2005-08-09 Andrew Skiba <andrews@mainsoft.com>
-
-       * System.Drawing_test.dll.sources: add ColorConverter.cs and ColorTranslator.cs
-
-2005-08-07 Konstantin Triger <kostat@mainsoft.com>
-
-       * System.Drawing.vmwcsproj: removed source control dependency
-
-2005-08-03  Andrew Skiba  <andrews@mainsoft.com>
-
-       * System.Drawing.vmwcsproj, System.Drawing.sln: add a project file and solution for building System.Drawing for Grasshopper
-
-2004-12-09  Geoff Norton  <gnorton@customerdna.com>
-
-       * System.Drawing.dll.sources: Add System.Drawing/carbonFunctions.cs to the build
-
-2004-11-22  Ravindra  <rkumar@novell.com>
-
-       * SD.csproj: Removed a wrong entry from files list.
-
-2004-09-16  Ravindra <rkumar@novell.com>
-
-       * SD.csproj: Added a VS.NET project file. It can be used to build
-       System.Drawing library on MS.
-
-2004-09-09  Sebastien Pouliot  <sebastien@ximian.com>
-
-       * System.Drawing_test.dll.sources: Added unit tests for 
-       PrintingPermission and it's attribute class.
-
-2004-06-10  Ravindra <rkumar@novell.com>
-
-       * Makefile: Suppress compiler warning cs:618 for test dll.
-
-2004-06-03  Ravindra <rkumar@novell.com>
-
-       * Makefile: Updated. We don't need to define the flag
-       DECLARE_CDECL_DELEGATES anymore. As we have moved all the
-       codecs to libgdiplus.
-
-2004-05-26  Ravindra <rkumar@novell.com>
-
-       * System.Drawing_test.dll.sources: Added TestColor.cs to the test sources list.
-
-2004-05-20  Sanjay Gupta <gsanjay@novell.com>
-
-       * System.Drawing_test.dll.sources: Added TestIcon.cs to the test sources list.
-
-2004-05-18  Ravindra <rkumar@novell.com>
-
-       * System.Drawing_test.dll.sources: Added TestHatchBrush.cs to the
-       test sources list.
-       * README: Added some guidelines for writing tests/samples.
-
-2004-05-17  Sanjay Gupta <gsanjay@novell.com>
-
-       * System.Drawing_test.dll.sources: Added TestIconConverter.cs to the test sources list.
-
-2004-05-14  Sanjay Gupta <gsanjay@novell.com>
-
-       * System.Drawing_test.dll.sources: Added TestImageConverter.cs and 
-       TestImageFormatConverter.cs to the test sources list.
-
-2004-04-22  Ravindra <rkumar@novell.com>
-
-       * System.Drawing_test.dll.sources: Added TestPointConverter.cs,
-       TestRectangleConverter.cs and TestSizeConverter.cs to the test
-       sources list.
-
-2004-04-21  Ravindra <rkumar@novell.com>
-
-       * System.Drawing_test.dll.sources: Added TestPens.cs and
-       TestBrushes.cs to the test sources list.
-
-2004-04-16  Ravindra <rkumar@novell.com>
-
-       * System.Drawing_test.dll.sources: Added TestSystemPens.cs
-       to the test sources list.
-
-2004-04-12  Ravindra <rkumar@novell.com>
-
-       * System.Drawing_test.dll.sources: Added TestSystemBrushes.cs
-       to the test sources list.
-
-2004-03-18  Ravindra <rkumar@novell.com>
-       * System.Drawing_test.dll.sources: Added TestBitmap.cs,
-       TestBlend.cs and TestColorBlend.cs to test sources list.
-
-2004-03-17  Ravindra <rkumar@novell.com>
-       * Samples: Created directory for samples.
-       * README: Created README that tells about the directory
-       structure for samples and tests.
-
-2004-02-11  Ravindra <rkumar@novell.com>
-       * System.Drawing.dll.sources: Added EncoderParameter.cs
-       and EncoderParameters.cs.
-
-2004-02-07  Andreas Nahr <ClassDevelopment@A-SoftTech.com>
-
-       * System.Drawing.dll.sources:
-         SRDescriptionAttribute.cs, Locale.cs added
-
-2004-01-26  Ravindra <rkumar@novell.com>
-       * System.Drawing.dll.sources: Added TextureBrush.cs.
-
-2004-01-26  Ravindra <rkumar@novell.com>
-       * System.Drawing_test.dll.sources: Added to create 
-       System.Drawing_test.dll.
-
-2004-01-23  Ravindra <rkumar@novell.com>
-       * System.Drawing.dll.sources: Removed TextureBrush.cs. 
-       Was added by mistake during last check-in.
-
-2004-01-19  Ravindra <rkumar@novell.com>
-       * System.Drawing.dll.sources: Added Encoder.cs.
-
-2003-11-13  Andreas Nahr <ClassDevelopment@A-SoftTech.com>
-       * System.Drawing.dll.sources: MetafileHeader added (was missing), Consts.cs added
-
-2003-10-14  Bernie Solomon  <bernard@ugsolutions.com>
-       * Makefile                      do not build gdiplus on Windows
-
-2003-10-12  Alexandre Pigolkine <pigolkine@gmx.de>
-       * Makefile                      gdiplus added to subdirs
-
-2003-10-12  Alexandre Pigolkine <pigolkine@gmx.de>
-       * System.Drawing.dll.sources:   Remove cairo,win32,gtk implementations
-                                                                       Add gdi+ implementation
-
-2003-09-21  Miguel de Icaza  <miguel@ximian.com>
-       * System.Drawing.dll.sources: Remove xr implementation. 
-
-2003-09-21  Alexandre Pigolkine <pigolkine@gmx.de>
-       * System.Drawing.dll.sources    removed 2 files from Printing namespace
-
-2003-08-31  Jerome Laban <jlaban@wanadoo.fr>
-       * Graphics.cs:
-       * win32functions.cs: Added Win32 Ellipse implementation. 
-
-2003-08-24  Duncan Mak  <duncan@ximian.com>
-
-       * System.Drawing.dll.sources: Add Cairo implementation.
-
-2003-07-23  Peter Williams  <peter@newton.cx>
-
-       * System.Drawing.dll.sources: Add Pens.cs
-
-2003-07-17  Andreas Nahr <ClassDevelopment@A-SoftTech.com>
-
-       * System.Drawing.dll.sources:
-       * list.unix: AssemblyInfo.cs added
-
-2003-06-27 Alexandre Pigolkine <pigolkine@gmx.de>
-       * list.unix             
-               new file added
-
-2003-06-22 Alexandre Pigolkine <pigolkine@gmx.de>
-       * list.unix             
-               reordered by folder names
-               few new files added
-               System.Drawing.Design/IDesignerHost.cs removed
-
-2003-06-18 Alexandre Pigolkine <pigolkine@gmx.de>
-       * list.unix             changed
-
-2003-06-15 Alexandre Pigolkine <pigolkine@gmx.de>
-       * list.unix             files added
-       * makefile.gnu  --unsafe flag, cdecl delegates
-       
-2003-06-06 Alexandre Pigolkine <pigolkine@gmx.de>
-       * list.unix             changed
-
-2003-04-26 Alexandre Pigolkine <pigolkine@gmx.de>
-       * list.unix             changed
-
-2003-03-31  Martin Willemoes Hansen <mwh@sysrq.dk>
-
-       * System.Drawing.Printing/PrinterUnitConvert.cs stubed
-
-2003-03-31  Martin Willemoes Hansen <mwh@sysrq.dk>
-
-        * System.Drawing.Design/ToolboxItemCollection.cs stubed
-
-2003-03-31  Alan Tam <Tam@SiuLung.com>
-
-       * list.unix: Added UITypeEditor.cs.
-
-2003-02-08  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * list.unix: added ImageAttributes.cs.
-
-2003-02-07 Alexandre Pigolkine <pigolkine@gmx.de>
-       * list.unix             changed
-
-2002-12-1  Alejandro Sánchez Acosta  <raciel@es.gnu.org>
-
-       * list.unix: Changed
-
-
-2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * ChangeLog: new file.
-
-       * System.Drawing.build: added System.dll dependency
-       
+       * MetafileHeader.cs: Classes need to specify StructLayout attribute\r
+\r
+2005-12-04 Konstantin Triger <kostat@mainsoft.com>\r
+\r
+        * net_1_1_java_System.Drawing.dll.exclude.sources,\r
+               net_1_1_java_System.Drawing.dll.sources:\r
+               correcting SystemIcons.cs reference.\r
+\r
+2005-11-28 Konstantin Triger <kostat@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj: Added System icons; changed to mono icon implementation.\r
+\r
+2005-11-14  Andrew Skiba  <andrews@mainsoft.com>\r
+\r
+       * net_1_1_java_System.Drawing.dll.sources,\r
+       net_1_1_java_System.Drawing.dll.exclude.sources: added java profile\r
+       sources lists\r
+       * Makefile: add java profile section\r
+\r
+2005-11-13 Konstantin Triger <kostat@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj: Added System.Drawing.Text/LineLayout.jvm.cs,\r
+               System.Drawing.Text/LineLayout.jvm.cs\r
+\r
+2005-09-27  Kornél Pál  <kornelpal@hotmail.com>\r
+\r
+       * Makefile: Removed /codepage:28591 as it is the default.\r
+\r
+2005-09-19  Miguel de Icaza  <miguel@novell.com>\r
+\r
+       * Makefile (EXTRA_DISTFILES): Distribute indexed.png, add resource\r
+       to build.\r
+\r
+2005-09-14 Vladimir Krasnov <vladimirk@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj: Added PlainImage.jvm.cs, PlainImageCollection.jvm.cs\r
+\r
+2005-09-07 Vladimir Krasnov <vladimirk@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj: ImageCodec.jvm.cs\r
+       Added Mainsoft.Drawing.Configuration.jvm folder with\r
+       ResolutionConfiguration.cs, ResolutionConfigurationCollection.cs, \r
+       ResolutionConfigurationHandler.cs\r
+\r
+2005-08-28 Vladimir Krasnov <vladimirk@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj: Added GraphicsContainer.jvm.cs, GraphicsState.jvm.cs\r
+       Excluded: GraphicsContainer.cs, GraphicsState.cs\r
+       Fixed: const.cs.in\r
+\r
+2005-08-25 Atsushi Enomoto <atsushi@ximian.com>\r
+\r
+       * Makefile: build fix for some utf8-defaulted environment.\r
+\r
+2005-08-24 Marek Safar <marek.safar@seznam.cz>\r
+\r
+       * SD.csproj: Updated.\r
+\r
+2005-08-23 Eyal Alalyf <eyala@mainsoft.com>\r
+       * System.Drawing.vmwcsproj: Change it to be developer edition project file\r
+\r
+2005-08-23 Boris Kirzner <borisk@mainsoft.com>\r
+       * System.Drawing.vmwcsproj: Changed reference to Consts.cs.\r
+\r
+2005-08-16 Andrew Skiba <andrews@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj: use ImageFormat.cs instead of jvm.cs\r
+\r
+2005-08-14 Gert Driesen <drieseng@users.sourceforge.net>\r
+       \r
+       * System.Drawing.dll.sources: Removed TestColorConverter again, as \r
+       there was already a test class for ColorConverter.\r
+\r
+2005-08-14 Gert Driesen <drieseng@users.sourceforge.net>\r
+\r
+       * System.Drawing.dll.sources: Added TestColorConverter.cs.\r
+\r
+2005-08-14 Vladimir Krasnov <vladimirk@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj: Added SystemIcons.jvm.cs, excluded SystemIcons.cs\r
+       \r
+2005-08-11 Konstantin Triger <kostat@mainsoft.com>\r
+\r
+        * System.Drawing.vmwcsproj: changing JAVA to TARGET_JVM in release builds\r
+\r
+2005-08-10 Boris Kirzner <borisk@mainsoft.com>\r
+       * System.Drawing.vmwcsproj: Added ExtendedGeneralPath.jvm.cs and GeneralPathIterator.jvm.cs.\r
+\r
+2005-08-09 Konstantin Triger <kostat@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj: Added AdvancedStoke.jvm.cs and StrokeFactory.jvm.cs\r
+\r
+2005-08-09 Andrew Skiba <andrews@mainsoft.com>\r
+\r
+       * System.Drawing_test.dll.sources: add ColorConverter.cs and ColorTranslator.cs\r
+\r
+2005-08-07 Konstantin Triger <kostat@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj: removed source control dependency\r
+\r
+2005-08-03  Andrew Skiba  <andrews@mainsoft.com>\r
+\r
+       * System.Drawing.vmwcsproj, System.Drawing.sln: add a project file and solution for building System.Drawing for Grasshopper\r
+\r
+2004-12-09  Geoff Norton  <gnorton@customerdna.com>\r
+\r
+       * System.Drawing.dll.sources: Add System.Drawing/carbonFunctions.cs to the build\r
+\r
+2004-11-22  Ravindra  <rkumar@novell.com>\r
+\r
+       * SD.csproj: Removed a wrong entry from files list.\r
+\r
+2004-09-16  Ravindra <rkumar@novell.com>\r
+\r
+       * SD.csproj: Added a VS.NET project file. It can be used to build\r
+       System.Drawing library on MS.\r
+\r
+2004-09-09  Sebastien Pouliot  <sebastien@ximian.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added unit tests for \r
+       PrintingPermission and it's attribute class.\r
+\r
+2004-06-10  Ravindra <rkumar@novell.com>\r
+\r
+       * Makefile: Suppress compiler warning cs:618 for test dll.\r
+\r
+2004-06-03  Ravindra <rkumar@novell.com>\r
+\r
+       * Makefile: Updated. We don't need to define the flag\r
+       DECLARE_CDECL_DELEGATES anymore. As we have moved all the\r
+       codecs to libgdiplus.\r
+\r
+2004-05-26  Ravindra <rkumar@novell.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added TestColor.cs to the test sources list.\r
+\r
+2004-05-20  Sanjay Gupta <gsanjay@novell.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added TestIcon.cs to the test sources list.\r
+\r
+2004-05-18  Ravindra <rkumar@novell.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added TestHatchBrush.cs to the\r
+       test sources list.\r
+       * README: Added some guidelines for writing tests/samples.\r
+\r
+2004-05-17  Sanjay Gupta <gsanjay@novell.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added TestIconConverter.cs to the test sources list.\r
+\r
+2004-05-14  Sanjay Gupta <gsanjay@novell.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added TestImageConverter.cs and \r
+       TestImageFormatConverter.cs to the test sources list.\r
+\r
+2004-04-22  Ravindra <rkumar@novell.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added TestPointConverter.cs,\r
+       TestRectangleConverter.cs and TestSizeConverter.cs to the test\r
+       sources list.\r
+\r
+2004-04-21  Ravindra <rkumar@novell.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added TestPens.cs and\r
+       TestBrushes.cs to the test sources list.\r
+\r
+2004-04-16  Ravindra <rkumar@novell.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added TestSystemPens.cs\r
+       to the test sources list.\r
+\r
+2004-04-12  Ravindra <rkumar@novell.com>\r
+\r
+       * System.Drawing_test.dll.sources: Added TestSystemBrushes.cs\r
+       to the test sources list.\r
+\r
+2004-03-18  Ravindra <rkumar@novell.com>\r
+       * System.Drawing_test.dll.sources: Added TestBitmap.cs,\r
+       TestBlend.cs and TestColorBlend.cs to test sources list.\r
+\r
+2004-03-17  Ravindra <rkumar@novell.com>\r
+       * Samples: Created directory for samples.\r
+       * README: Created README that tells about the directory\r
+       structure for samples and tests.\r
+\r
+2004-02-11  Ravindra <rkumar@novell.com>\r
+       * System.Drawing.dll.sources: Added EncoderParameter.cs\r
+       and EncoderParameters.cs.\r
+\r
+2004-02-07  Andreas Nahr <ClassDevelopment@A-SoftTech.com>\r
+\r
+       * System.Drawing.dll.sources:\r
+         SRDescriptionAttribute.cs, Locale.cs added\r
+\r
+2004-01-26  Ravindra <rkumar@novell.com>\r
+       * System.Drawing.dll.sources: Added TextureBrush.cs.\r
+\r
+2004-01-26  Ravindra <rkumar@novell.com>\r
+       * System.Drawing_test.dll.sources: Added to create \r
+       System.Drawing_test.dll.\r
+\r
+2004-01-23  Ravindra <rkumar@novell.com>\r
+       * System.Drawing.dll.sources: Removed TextureBrush.cs. \r
+       Was added by mistake during last check-in.\r
+\r
+2004-01-19  Ravindra <rkumar@novell.com>\r
+       * System.Drawing.dll.sources: Added Encoder.cs.\r
+\r
+2003-11-13  Andreas Nahr <ClassDevelopment@A-SoftTech.com>\r
+       * System.Drawing.dll.sources: MetafileHeader added (was missing), Consts.cs added\r
+\r
+2003-10-14  Bernie Solomon  <bernard@ugsolutions.com>\r
+       * Makefile                      do not build gdiplus on Windows\r
+\r
+2003-10-12  Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * Makefile                      gdiplus added to subdirs\r
+\r
+2003-10-12  Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * System.Drawing.dll.sources:   Remove cairo,win32,gtk implementations\r
+                                                                       Add gdi+ implementation\r
+\r
+2003-09-21  Miguel de Icaza  <miguel@ximian.com>\r
+       * System.Drawing.dll.sources: Remove xr implementation. \r
+\r
+2003-09-21  Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * System.Drawing.dll.sources    removed 2 files from Printing namespace\r
+\r
+2003-08-31  Jerome Laban <jlaban@wanadoo.fr>\r
+       * Graphics.cs:\r
+       * win32functions.cs: Added Win32 Ellipse implementation. \r
+\r
+2003-08-24  Duncan Mak  <duncan@ximian.com>\r
+\r
+       * System.Drawing.dll.sources: Add Cairo implementation.\r
+\r
+2003-07-23  Peter Williams  <peter@newton.cx>\r
+\r
+       * System.Drawing.dll.sources: Add Pens.cs\r
+\r
+2003-07-17  Andreas Nahr <ClassDevelopment@A-SoftTech.com>\r
+\r
+       * System.Drawing.dll.sources:\r
+       * list.unix: AssemblyInfo.cs added\r
+\r
+2003-06-27 Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * list.unix             \r
+               new file added\r
+\r
+2003-06-22 Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * list.unix             \r
+               reordered by folder names\r
+               few new files added\r
+               System.Drawing.Design/IDesignerHost.cs removed\r
+\r
+2003-06-18 Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * list.unix             changed\r
+\r
+2003-06-15 Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * list.unix             files added\r
+       * makefile.gnu  --unsafe flag, cdecl delegates\r
+       \r
+2003-06-06 Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * list.unix             changed\r
+\r
+2003-04-26 Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * list.unix             changed\r
+\r
+2003-03-31  Martin Willemoes Hansen <mwh@sysrq.dk>\r
+\r
+       * System.Drawing.Printing/PrinterUnitConvert.cs stubed\r
+\r
+2003-03-31  Martin Willemoes Hansen <mwh@sysrq.dk>\r
+\r
+        * System.Drawing.Design/ToolboxItemCollection.cs stubed\r
+\r
+2003-03-31  Alan Tam <Tam@SiuLung.com>\r
+\r
+       * list.unix: Added UITypeEditor.cs.\r
+\r
+2003-02-08  Gonzalo Paniagua Javier <gonzalo@ximian.com>\r
+\r
+       * list.unix: added ImageAttributes.cs.\r
+\r
+2003-02-07 Alexandre Pigolkine <pigolkine@gmx.de>\r
+       * list.unix             changed\r
+\r
+2002-12-1  Alejandro Sánchez Acosta  <raciel@es.gnu.org>\r
+\r
+       * list.unix: Changed\r
+\r
+\r
+2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>\r
+\r
+       * ChangeLog: new file.\r
+\r
+       * System.Drawing.build: added System.dll dependency\r
+       \r
index 83d66580ac218a2b06b8e1006579130a397da9a0..555c26f7937ccc01c9501369368c1bca7f2f1cdb 100644 (file)
@@ -1,3 +1,8 @@
+2006-08-28     Boris Kirzner <borisk@mainsoft.com>
+       * System.Drawing.Test20.J2EE.sln, System.Drawing.Test20.sln,
+       Test20.csproj, Test20.J2EE.vmwcsproj: added solution 
+       and project files for NET_2_0 tests.
+
 2006-01-25 Boris Kirzner <borisk@mainsoft.com>
        * Test.vmwcsproj,Test.dotnet.csproj: added reference to NUnit projects.
 
index 6520cf2fe719db3ab746d1aac1f7f84be21c78c1..f1950dd1cdba943d19c623312f65a4839f4c975d 100644 (file)
@@ -1,3 +1,7 @@
+2006-08-28     Boris Kirzner <borisk@mainsoft.com>\r
+       * DrawingTestHelper20.csproj, DrawingTestHelper20.J2EE.vmwcsproj :\r
+       added project files for NET_2_0 tests.\r
+\r
 2006-01-25 Boris Kirzner <borisk@mainsoft.com>\r
        * DrawingTestHelper_java.vmwcsproj, DrawingTestHelper.csproj: \r
        projects updates for TARGET_JVM.\r
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj
new file mode 100644 (file)
index 0000000..e7161f7
--- /dev/null
@@ -0,0 +1,131 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">\r
+               <OutputPath>bin\Release_Java20\</OutputPath>\r
+               <DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <Optimize>true</Optimize>\r
+               <DebugType>pdbonly</DebugType>\r
+               <PlatformTarget>AnyCPU</PlatformTarget>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <SkipValidation>false</SkipValidation>\r
+               <KeepIntermediate>false</KeepIntermediate>\r
+               <GHProjectType>1</GHProjectType>\r
+               <PreCompile>false</PreCompile>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+               <ApplicationServerType>\r
+               </ApplicationServerType>\r
+               <Version>2.0</Version>\r
+               <JDKName>1.5.0_05</JDKName>\r
+               <TargetPlatform>0</TargetPlatform>\r
+       </PropertyGroup>\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">\r
+               <DebugSymbols>true</DebugSymbols>\r
+               <OutputPath>bin\Debug_Java20\</OutputPath>\r
+               <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <DebugType>full</DebugType>\r
+               <PlatformTarget>AnyCPU</PlatformTarget>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <SkipValidation>True</SkipValidation>\r
+               <KeepIntermediate>False</KeepIntermediate>\r
+               <GHProjectType>1</GHProjectType>\r
+               <PreCompile>false</PreCompile>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+               <ApplicationServerType>\r
+               </ApplicationServerType>\r
+               <Version>2.0</Version>\r
+               <JDKName>1.5.0_05</JDKName>\r
+               <TargetPlatform>0</TargetPlatform>\r
+       </PropertyGroup>\r
+       <PropertyGroup>\r
+               <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>\r
+               <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+               <ProductVersion>8.0.50727</ProductVersion>\r
+               <SchemaVersion>2.0</SchemaVersion>\r
+               <ProjectGuid>{C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}</ProjectGuid>\r
+               <OutputType>Library</OutputType>\r
+               <AppDesignerFolder>Properties</AppDesignerFolder>\r
+               <RootNamespace>DrawingTest</RootNamespace>\r
+               <AssemblyName>DrawingTest</AssemblyName>\r
+               <JDKName>1.5.0_05</JDKName>\r
+               <GHProjectType>1</GHProjectType>\r
+               <Version>2.0</Version>\r
+       </PropertyGroup>\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">\r
+               <DebugSymbols>true</DebugSymbols>\r
+               <DebugType>full</DebugType>\r
+               <Optimize>false</Optimize>\r
+               <OutputPath>bin\Debug_Java\</OutputPath>\r
+               <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <WarningLevel>4</WarningLevel>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <NoStdLib>false</NoStdLib>\r
+               <SkipValidation>True</SkipValidation>\r
+               <KeepIntermediate>False</KeepIntermediate>\r
+               <TargetPlatform>0</TargetPlatform>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+       </PropertyGroup>\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">\r
+               <DebugType>pdbonly</DebugType>\r
+               <Optimize>true</Optimize>\r
+               <OutputPath>bin\Release_Java\</OutputPath>\r
+               <DefineConstants>TRACE;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <WarningLevel>4</WarningLevel>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <NoStdLib>false</NoStdLib>\r
+               <SkipValidation>false</SkipValidation>\r
+               <KeepIntermediate>false</KeepIntermediate>\r
+               <TargetPlatform>0</TargetPlatform>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+       </PropertyGroup>\r
+       <ItemGroup>\r
+               <Reference Include="J2SE.Helpers, Version=0.0.0.0, Culture=neutral">\r
+                       <Private>False</Private>\r
+                       <HintPath>..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\J2SE.Helpers.dll</HintPath>\r
+               </Reference>\r
+               <Reference Include="nunit.framework, Version=0.0.0.0, Culture=neutral">\r
+                       <SpecificVersion>False</SpecificVersion>\r
+                       <HintPath>c:\cygwin\monobuild\mcs\nunit20\framework\bin\Debug_Java20\nunit.framework.dll</HintPath>\r
+                       <Private>True</Private>\r
+               </Reference>\r
+               <Reference Include="rt, Version=0.0.0.0, Culture=neutral">\r
+                       <SpecificVersion>False</SpecificVersion>\r
+                       <HintPath>..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\jre5\rt.dll</HintPath>\r
+                       <Private>True</Private>\r
+               </Reference>\r
+               <Reference Include="System"/>\r
+               <Reference Include="System.Drawing"/>\r
+               <Reference Include="System.Xml"/>\r
+       </ItemGroup>\r
+       <ItemGroup>\r
+               <Compile Include="AssemblyInfo.cs"/>\r
+               <Compile Include="DrawingTest.cs"/>\r
+               <Compile Include="PDComparer.cs"/>\r
+       </ItemGroup>\r
+       <ItemGroup>\r
+               <ProjectReference Include="c:\cygwin\monobuild\mcs\class\System.Drawing\Test\DrawingTest\Exocortex.DSP\src\Exocortex.DSP20.v1.J2EE.vmwcsproj">\r
+                       <Project>{995DE32D-06AB-4926-97FF-565B9205D5F8}</Project>\r
+                       <Name>Exocortex.DSP20.v1.J2EE</Name>\r
+               </ProjectReference>\r
+       </ItemGroup>\r
+       <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>\r
+       <Import Project="$(GHROOT)\bin\Mainsoft.Common.targets"/>\r
+       <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+       <ProjectExtensions>\r
+               <VisualStudio>\r
+                       <UserProperties REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar" REFS-JarPath-j2se-helpers="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\J2SE.Helpers.jar" REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar" REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-nunit-util="..\..\..\..\..\nunit20\util\bin\Debug_Java20\nunit.util.jar" REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\util\bin\Debug_Java20\nunit.core.jar"/>\r
+               </VisualStudio>\r
+       </ProjectExtensions>\r
+</Project>\r
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj
new file mode 100644 (file)
index 0000000..b32803c
--- /dev/null
@@ -0,0 +1,61 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>8.0.50727</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{0E97F734-51B9-497B-9259-B6999FD87BDF}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>DrawingTest</RootNamespace>\r
+    <AssemblyName>DrawingTest</AssemblyName>\r
+    <StartupObject>\r
+    </StartupObject>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">\r
+      <SpecificVersion>False</SpecificVersion>\r
+      <HintPath>..\..\..\..\..\nunit20\framework\bin\Debug\nunit.framework.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Drawing" />\r
+    <Reference Include="System.Windows.Forms" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="AssemblyInfo.cs" />\r
+    <Compile Include="DrawingTest.cs" />\r
+    <Compile Include="PDComparer.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\Exocortex.DSP\src\Exocortex.DSP20.v1.csproj">\r
+      <Project>{A9553E24-D07E-44FE-92FB-8C1D3D3C744E}</Project>\r
+      <Name>Exocortex.DSP20.v1</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+</Project>
\ No newline at end of file
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj b/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj
new file mode 100644 (file)
index 0000000..55c87ed
--- /dev/null
@@ -0,0 +1,122 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">\r
+               <OutputPath>bin\Release_Java20\</OutputPath>\r
+               <DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <Optimize>true</Optimize>\r
+               <DebugType>pdbonly</DebugType>\r
+               <PlatformTarget>AnyCPU</PlatformTarget>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <SkipValidation>false</SkipValidation>\r
+               <KeepIntermediate>false</KeepIntermediate>\r
+               <GHProjectType>1</GHProjectType>\r
+               <PreCompile>false</PreCompile>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+               <ApplicationServerType>\r
+               </ApplicationServerType>\r
+               <Version>2.0</Version>\r
+               <JDKName>1.5.0_05</JDKName>\r
+               <TargetPlatform>0</TargetPlatform>\r
+       </PropertyGroup>\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">\r
+               <DebugSymbols>true</DebugSymbols>\r
+               <OutputPath>bin\Debug_Java20\</OutputPath>\r
+               <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <DebugType>full</DebugType>\r
+               <PlatformTarget>AnyCPU</PlatformTarget>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <SkipValidation>True</SkipValidation>\r
+               <KeepIntermediate>False</KeepIntermediate>\r
+               <GHProjectType>1</GHProjectType>\r
+               <PreCompile>false</PreCompile>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+               <ApplicationServerType>\r
+               </ApplicationServerType>\r
+               <Version>2.0</Version>\r
+               <JDKName>1.5.0_05</JDKName>\r
+               <TargetPlatform>0</TargetPlatform>\r
+       </PropertyGroup>\r
+       <PropertyGroup>\r
+               <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>\r
+               <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+               <ProductVersion>8.0.50727</ProductVersion>\r
+               <SchemaVersion>2.0</SchemaVersion>\r
+               <ProjectGuid>{995DE32D-06AB-4926-97FF-565B9205D5F8}</ProjectGuid>\r
+               <OutputType>Library</OutputType>\r
+               <AppDesignerFolder>Properties</AppDesignerFolder>\r
+               <RootNamespace>Exocortex.DSP</RootNamespace>\r
+               <AssemblyName>Exocortex.DSP.v1</AssemblyName>\r
+               <JDKName>1.5.0_05</JDKName>\r
+               <GHProjectType>1</GHProjectType>\r
+               <Version>2.0</Version>\r
+       </PropertyGroup>\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">\r
+               <DebugSymbols>true</DebugSymbols>\r
+               <DebugType>full</DebugType>\r
+               <Optimize>false</Optimize>\r
+               <OutputPath>bin\Debug_Java\</OutputPath>\r
+               <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <WarningLevel>4</WarningLevel>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <NoStdLib>false</NoStdLib>\r
+               <SkipValidation>True</SkipValidation>\r
+               <KeepIntermediate>False</KeepIntermediate>\r
+               <TargetPlatform>0</TargetPlatform>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+       </PropertyGroup>\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">\r
+               <DebugType>pdbonly</DebugType>\r
+               <Optimize>true</Optimize>\r
+               <OutputPath>bin\Release_Java\</OutputPath>\r
+               <DefineConstants>TRACE;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <WarningLevel>4</WarningLevel>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <NoStdLib>false</NoStdLib>\r
+               <SkipValidation>false</SkipValidation>\r
+               <KeepIntermediate>false</KeepIntermediate>\r
+               <TargetPlatform>0</TargetPlatform>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+       </PropertyGroup>\r
+       <ItemGroup>\r
+               <Reference Include="J2SE.Helpers, Version=0.0.0.0, Culture=neutral">\r
+                       <Private>False</Private>\r
+               </Reference>\r
+               <Reference Include="rt, Version=0.0.0.0, Culture=neutral">\r
+                       <Private>False</Private>\r
+               </Reference>\r
+               <Reference Include="System"/>\r
+               <Reference Include="System.Drawing"/>\r
+               <Reference Include="System.Xml"/>\r
+       </ItemGroup>\r
+       <ItemGroup>\r
+               <Compile Include="AssemblyInfo.cs"/>\r
+               <Compile Include="Complex.cs"/>\r
+               <Compile Include="ComplexArray.cs"/>\r
+               <Compile Include="ComplexF.cs"/>\r
+               <Compile Include="ComplexMath.cs"/>\r
+               <Compile Include="ComplexStats.cs"/>\r
+               <Compile Include="Fourier.cs"/>\r
+               <Compile Include="FourierDirection.cs"/>\r
+       </ItemGroup>\r
+       <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>\r
+       <Import Project="$(GHROOT)\bin\Mainsoft.Common.targets"/>\r
+       <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+       <ProjectExtensions>\r
+               <VisualStudio>\r
+                       <UserProperties REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.jar" REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar" REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" REFS-JarPath-j2se-helpers="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\J2SE.Helpers.jar" REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar"/>\r
+               </VisualStudio>\r
+       </ProjectExtensions>\r
+</Project>\r
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj b/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj
new file mode 100644 (file)
index 0000000..f595cfb
--- /dev/null
@@ -0,0 +1,55 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>8.0.50727</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{A9553E24-D07E-44FE-92FB-8C1D3D3C744E}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>Exocortex.DSP</RootNamespace>\r
+    <AssemblyName>Exocortex.DSP.v1</AssemblyName>\r
+    <StartupObject>\r
+    </StartupObject>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="AssemblyInfo.cs" />\r
+    <Compile Include="Complex.cs" />\r
+    <Compile Include="ComplexArray.cs" />\r
+    <Compile Include="ComplexF.cs" />\r
+    <Compile Include="ComplexMath.cs" />\r
+    <Compile Include="ComplexStats.cs" />\r
+    <Compile Include="Fourier.cs" />\r
+    <Compile Include="FourierDirection.cs" />\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+</Project>
\ No newline at end of file
diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Test20.J2EE.sln b/mcs/class/System.Drawing/Test/System.Drawing.Test20.J2EE.sln
new file mode 100644 (file)
index 0000000..cb10c01
--- /dev/null
@@ -0,0 +1,46 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 9.00\r
+# Visual Studio 2005\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "Exocortex.DSP20.v1.J2EE", "DrawingTest\Exocortex.DSP\src\Exocortex.DSP20.v1.J2EE.vmwcsproj", "{995DE32D-06AB-4926-97FF-565B9205D5F8}"\r
+EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "DrawingTestHelper20.J2EE", "DrawingTest\DrawingTestHelper\DrawingTestHelper20.J2EE.vmwcsproj", "{C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}"\r
+EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "Test20.J2EE", "Test20.J2EE.vmwcsproj", "{FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug_Java|Any CPU = Debug_Java|Any CPU\r
+               Debug_Java20|Any CPU = Debug_Java20|Any CPU\r
+               Release_Java|Any CPU = Release_Java|Any CPU\r
+               Release_Java20|Any CPU = Release_Java20|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {995DE32D-06AB-4926-97FF-565B9205D5F8}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU\r
+               {995DE32D-06AB-4926-97FF-565B9205D5F8}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU\r
+               {995DE32D-06AB-4926-97FF-565B9205D5F8}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU\r
+               {995DE32D-06AB-4926-97FF-565B9205D5F8}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU\r
+               {995DE32D-06AB-4926-97FF-565B9205D5F8}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {995DE32D-06AB-4926-97FF-565B9205D5F8}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU\r
+               {995DE32D-06AB-4926-97FF-565B9205D5F8}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU\r
+               {995DE32D-06AB-4926-97FF-565B9205D5F8}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU\r
+               {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU\r
+               {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU\r
+               {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU\r
+               {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU\r
+               {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU\r
+               {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU\r
+               {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU\r
+               {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU\r
+               {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU\r
+               {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU\r
+               {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU\r
+               {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU\r
+               {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU\r
+               {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Test20.sln b/mcs/class/System.Drawing/Test/System.Drawing.Test20.sln
new file mode 100644 (file)
index 0000000..56541f7
--- /dev/null
@@ -0,0 +1,32 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 9.00\r
+# Visual Studio 2005\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test20", "Test20.csproj", "{0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawingTestHelper20", "DrawingTest\DrawingTestHelper\DrawingTestHelper20.csproj", "{0E97F734-51B9-497B-9259-B6999FD87BDF}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exocortex.DSP20.v1", "DrawingTest\Exocortex.DSP\src\Exocortex.DSP20.v1.csproj", "{A9553E24-D07E-44FE-92FB-8C1D3D3C744E}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {0E97F734-51B9-497B-9259-B6999FD87BDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {0E97F734-51B9-497B-9259-B6999FD87BDF}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {0E97F734-51B9-497B-9259-B6999FD87BDF}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {0E97F734-51B9-497B-9259-B6999FD87BDF}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {A9553E24-D07E-44FE-92FB-8C1D3D3C744E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {A9553E24-D07E-44FE-92FB-8C1D3D3C744E}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {A9553E24-D07E-44FE-92FB-8C1D3D3C744E}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {A9553E24-D07E-44FE-92FB-8C1D3D3C744E}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj b/mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj
new file mode 100644 (file)
index 0000000..3c4fc82
--- /dev/null
@@ -0,0 +1,171 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">\r
+    <OutputPath>DrawingTest\Test\bin\Debug_Java20\</OutputPath>\r
+    <DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>AnyCPU</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <SkipValidation>false</SkipValidation>\r
+    <KeepIntermediate>false</KeepIntermediate>\r
+    <GHProjectType>1</GHProjectType>\r
+    <PreCompile>false</PreCompile>\r
+    <AdditionalClassPath>\r
+    </AdditionalClassPath>\r
+    <ApplicationServerType>\r
+    </ApplicationServerType>\r
+    <Version>2.0</Version>\r
+    <JDKName>1.5.0_05</JDKName>\r
+    <TargetPlatform>0</TargetPlatform>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>DrawingTest\Test\bin\Debug_Java20\</OutputPath>\r
+    <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>AnyCPU</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <SkipValidation>True</SkipValidation>\r
+    <KeepIntermediate>False</KeepIntermediate>\r
+    <GHProjectType>1</GHProjectType>\r
+    <PreCompile>false</PreCompile>\r
+    <AdditionalClassPath>\r
+    </AdditionalClassPath>\r
+    <ApplicationServerType>\r
+    </ApplicationServerType>\r
+    <Version>2.0</Version>\r
+    <JDKName>1.5.0_05</JDKName>\r
+    <TargetPlatform>0</TargetPlatform>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>8.0.50727</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>System.Drawing.Test</RootNamespace>\r
+    <AssemblyName>System.Drawing.Test20.J2EE</AssemblyName>\r
+    <JDKName>1.5.0_05</JDKName>\r
+    <GHProjectType>1</GHProjectType>\r
+    <Version>2.0</Version>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug_Java\</OutputPath>\r
+    <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <NoStdLib>false</NoStdLib>\r
+    <SkipValidation>True</SkipValidation>\r
+    <KeepIntermediate>False</KeepIntermediate>\r
+    <TargetPlatform>0</TargetPlatform>\r
+    <AdditionalClassPath>\r
+    </AdditionalClassPath>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release_Java\</OutputPath>\r
+    <DefineConstants>TRACE;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <NoStdLib>false</NoStdLib>\r
+    <SkipValidation>false</SkipValidation>\r
+    <KeepIntermediate>false</KeepIntermediate>\r
+    <TargetPlatform>0</TargetPlatform>\r
+    <AdditionalClassPath>\r
+    </AdditionalClassPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="J2SE.Helpers, Version=0.0.0.0, Culture=neutral">\r
+      <Private>False</Private>\r
+    </Reference>\r
+    <Reference Include="nunit.framework, Version=0.0.0.0, Culture=neutral">\r
+      <SpecificVersion>False</SpecificVersion>\r
+      <HintPath>c:\cygwin\monobuild\mcs\nunit20\framework\bin\Debug_Java20\nunit.framework.dll</HintPath>\r
+      <Private>True</Private>\r
+    </Reference>\r
+    <Reference Include="rt, Version=0.0.0.0, Culture=neutral">\r
+      <Private>False</Private>\r
+    </Reference>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Drawing" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="DrawingTest\Test\Bitmap.cs" />\r
+    <Compile Include="DrawingTest\Test\Brush.cs" />\r
+    <Compile Include="DrawingTest\Test\Graphics.cs" />\r
+    <Compile Include="DrawingTest\Test\GraphicsPath.cs" />\r
+    <Compile Include="DrawingTest\Test\GraphicsPathIterator.cs" />\r
+    <Compile Include="DrawingTest\Test\Image.cs" />\r
+    <Compile Include="DrawingTest\Test\Pen.cs" />\r
+    <Compile Include="DrawingTest\Test\Region.cs" />\r
+    <Compile Include="System.Drawing.Drawing2D\TestBlend.cs" />\r
+    <Compile Include="System.Drawing.Drawing2D\TestColorBlend.cs" />\r
+    <Compile Include="System.Drawing.Drawing2D\TestHatchBrush.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestBmpCodec.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestColorMatrix.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestImageAttributes.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestImageCodecInfo.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestJpegCodec.cs" />\r
+    <Compile Include="System.Drawing\ColorConverter.cs" />\r
+    <Compile Include="System.Drawing\ColorTranslator.cs" />\r
+    <Compile Include="System.Drawing\TestBitmap.cs" />\r
+    <Compile Include="System.Drawing\TestBrushes.cs" />\r
+    <Compile Include="System.Drawing\TestColor.cs" />\r
+    <Compile Include="System.Drawing\TestFont.cs" />\r
+    <Compile Include="System.Drawing\TestIcon.cs" />\r
+    <Compile Include="System.Drawing\TestIconConverter.cs" />\r
+    <Compile Include="System.Drawing\TestImageConverter.cs" />\r
+    <Compile Include="System.Drawing\TestImageFormatConverter.cs" />\r
+    <Compile Include="System.Drawing\TestPens.cs" />\r
+    <Compile Include="System.Drawing\TestPoint.cs" />\r
+    <Compile Include="System.Drawing\TestPointConverter.cs" />\r
+    <Compile Include="System.Drawing\TestPointF.cs" />\r
+    <Compile Include="System.Drawing\TestRectangle.cs" />\r
+    <Compile Include="System.Drawing\TestRectangleConverter.cs" />\r
+    <Compile Include="System.Drawing\TestRectangleF.cs" />\r
+    <Compile Include="System.Drawing\TestRegion.cs" />\r
+    <Compile Include="System.Drawing\TestSize.cs" />\r
+    <Compile Include="System.Drawing\TestSizeConverter.cs" />\r
+    <Compile Include="System.Drawing\TestSizeF.cs" />\r
+    <Compile Include="System.Drawing\TestSizeFConverter.cs" />\r
+    <Compile Include="System.Drawing\TestStringFormat.cs" />\r
+    <Compile Include="System.Drawing\TestSystemBrushes.cs" />\r
+    <Compile Include="System.Drawing\TestSystemPens.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Content Include="DrawingTest\Test\Bitmap1.bmp" />\r
+    <Content Include="DrawingTest\Test\Bitmap1.png" />\r
+    <Content Include="DrawingTest\Test\SampIcon.ico" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="DrawingTest\DrawingTestHelper\DrawingTestHelper20.J2EE.vmwcsproj">\r
+      <Project>{C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}</Project>\r
+      <Name>DrawingTestHelper20.J2EE</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />\r
+  <Import Project="$(GHROOT)\bin\Mainsoft.Common.targets" />\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+  <ProjectExtensions>\r
+    <VisualStudio>\r
+      <UserProperties REFS-JarPath-nunit-framework="..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.jar" REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar" REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" REFS-JarPath-j2se-helpers="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\J2SE.Helpers.jar" REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar" />\r
+    </VisualStudio>\r
+  </ProjectExtensions>\r
+</Project>
\ No newline at end of file
diff --git a/mcs/class/System.Drawing/Test/Test20.csproj b/mcs/class/System.Drawing/Test/Test20.csproj
new file mode 100644 (file)
index 0000000..fba47bc
--- /dev/null
@@ -0,0 +1,117 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>8.0.50727</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>System.Drawing.Test</RootNamespace>\r
+    <AssemblyName>System.Drawing.Test</AssemblyName>\r
+    <StartupObject>\r
+    </StartupObject>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>DrawingTest\Test\</OutputPath>\r
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>DrawingTest\Test\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">\r
+      <SpecificVersion>False</SpecificVersion>\r
+      <HintPath>..\..\..\nunit20\framework\bin\Debug\nunit.framework.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Drawing" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="DrawingTest\Test\AssemblyInfo.cs" />\r
+    <Compile Include="DrawingTest\Test\Bitmap.cs" />\r
+    <Compile Include="DrawingTest\Test\Brush.cs" />\r
+    <Compile Include="DrawingTest\Test\Graphics.cs" />\r
+    <Compile Include="DrawingTest\Test\GraphicsPath.cs" />\r
+    <Compile Include="DrawingTest\Test\GraphicsPathIterator.cs" />\r
+    <Compile Include="DrawingTest\Test\Image.cs" />\r
+    <Compile Include="DrawingTest\Test\Pen.cs" />\r
+    <Compile Include="DrawingTest\Test\Region.cs" />\r
+    <Compile Include="System.Drawing.Drawing2D\TestBlend.cs" />\r
+    <Compile Include="System.Drawing.Drawing2D\TestColorBlend.cs" />\r
+    <Compile Include="System.Drawing.Drawing2D\TestHatchBrush.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestBmpCodec.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestColorMatrix.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestImageAttributes.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestImageCodecInfo.cs" />\r
+    <Compile Include="System.Drawing.Imaging\TestJpegCodec.cs" />\r
+    <Compile Include="System.Drawing\ColorConverter.cs" />\r
+    <Compile Include="System.Drawing\ColorTranslator.cs" />\r
+    <Compile Include="System.Drawing\TestBitmap.cs" />\r
+    <Compile Include="System.Drawing\TestBrushes.cs" />\r
+    <Compile Include="System.Drawing\TestColor.cs" />\r
+    <Compile Include="System.Drawing\TestFont.cs" />\r
+    <Compile Include="System.Drawing\TestIcon.cs" />\r
+    <Compile Include="System.Drawing\TestIconConverter.cs" />\r
+    <Compile Include="System.Drawing\TestImageConverter.cs" />\r
+    <Compile Include="System.Drawing\TestImageFormatConverter.cs" />\r
+    <Compile Include="System.Drawing\TestPens.cs" />\r
+    <Compile Include="System.Drawing\TestPoint.cs" />\r
+    <Compile Include="System.Drawing\TestPointConverter.cs" />\r
+    <Compile Include="System.Drawing\TestPointF.cs" />\r
+    <Compile Include="System.Drawing\TestRectangle.cs" />\r
+    <Compile Include="System.Drawing\TestRectangleConverter.cs" />\r
+    <Compile Include="System.Drawing\TestRectangleF.cs" />\r
+    <Compile Include="System.Drawing\TestRegion.cs" />\r
+    <Compile Include="System.Drawing\TestSize.cs" />\r
+    <Compile Include="System.Drawing\TestSizeConverter.cs" />\r
+    <Compile Include="System.Drawing\TestSizeF.cs" />\r
+    <Compile Include="System.Drawing\TestStringFormat.cs" />\r
+    <Compile Include="System.Drawing\TestSystemBrushes.cs" />\r
+    <Compile Include="System.Drawing\TestSystemPens.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Content Include="DrawingTest\Test\Bitmap1.png" />\r
+    <Content Include="DrawingTest\Test\SampIcon.ico" />\r
+    <Content Include="System.Drawing\bitmaps\1bit.png" />\r
+    <Content Include="System.Drawing\bitmaps\4bit.png" />\r
+    <Content Include="System.Drawing\bitmaps\almogaver-os2.bmp" />\r
+    <Content Include="System.Drawing\bitmaps\almogaver1bit.bmp" />\r
+    <Content Include="System.Drawing\bitmaps\almogaver24bits.bmp" />\r
+    <Content Include="System.Drawing\bitmaps\almogaver24bits1.bmp" />\r
+    <Content Include="System.Drawing\bitmaps\almogaver32bits.bmp" />\r
+    <Content Include="System.Drawing\bitmaps\almogaver8bits.bmp" />\r
+    <Content Include="System.Drawing\bitmaps\maketransparent.bmp" />\r
+    <Content Include="System.Drawing\bitmaps\nature24bits.gif" />\r
+    <Content Include="System.Drawing\bitmaps\nature24bits.jpg" />\r
+    <Content Include="System.Drawing\bitmaps\smiley.ico" />\r
+    <Content Include="System.Drawing\bitmaps\VisualPng.ico" />\r
+    <Content Include="System.Drawing\bitmaps\VisualPng1.ico" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="DrawingTest\DrawingTestHelper\DrawingTestHelper20.csproj">\r
+      <Project>{0E97F734-51B9-497B-9259-B6999FD87BDF}</Project>\r
+      <Name>DrawingTestHelper20</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+</Project>
\ No newline at end of file
index aff33a105ed05f4876f33c476c473261aeff5079..eb3c39dacaa4ffbf87eebc6320f89688375ced42 100644 (file)
@@ -15,9 +15,7 @@ REM ********************************************************
 \r
 IF "%1"=="" GOTO USAGE\r
 \r
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
-\r
-IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
 REM ********************************************************\r
 REM Set parameters\r
@@ -29,12 +27,21 @@ set RUNNING_FIXTURE=%3
 set RUNNING_DIR=%~4\r
 set BACK_TO_ROOT_DIR=%~5\r
 \r
+set TEST_J2EE_SOLUTION=Test\System.Drawing.Test20.J2EE.sln\r
+set TEST_NET_SOLUTION=Test\System.Drawing.Test20.sln\r
+set TEST_J2EE_ASSEMBLY=System.Drawing.Test20.J2EE.jar\r
+set TEST_NET_ASSEMBLY=System.Drawing.Test.dll\r
+set PROJECT_J2EE_CONFIGURATION=Debug_Java20\r
+set PROJECT_NET_CONFIGURATION=Debug\r
+set NUNIT_CONSOLE_PATH="C:\Program Files\NUnit-Net-2.0 2.2.8\bin"\r
+set JAVA_HOME=%VMW_HOME%\jre5\r
+\r
 \r
 REM ********************************************************\r
 REM @echo Set environment\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%System.Drawing.jar;%JGAC_PATH%J2SE.Helpers.jar;%JGAC_PATH%jai_imageio.jar\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
@@ -43,7 +50,7 @@ set NET_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.Net.xml
 set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml\r
 \r
 set NUNIT_PATH=%BACK_TO_ROOT_DIR%..\..\nunit20\\r
-set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.jar\r
+set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit-console.jar\r
 set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
 \r
 \r
@@ -51,9 +58,23 @@ REM ********************************************************
 @echo Building .Net solution...\r
 REM ********************************************************\r
 \r
+REM devenv Test\DrawingTest\System.Drawing.Test.dotnet.sln /%BUILD_OPTION% Debug >%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild %TEST_NET_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_NET_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+\r
+\r
+\r
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
 \r
-devenv Test\DrawingTest\System.Drawing.Test.dotnet.sln /%BUILD_OPTION% Debug >%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+REM ********************************************************\r
+@echo Building NUnit solution...\r
+REM ********************************************************\r
+\r
+REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 goto NUNITREADY\r
 \r
@@ -69,15 +90,8 @@ REM ********************************************************
 @echo Building GH solution...\r
 REM ********************************************************\r
 \r
-devenv Test\DrawingTest\System.Drawing.Test.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
-\r
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
-\r
-REM ********************************************************\r
-@echo Building NUnit solution...\r
-REM ********************************************************\r
-\r
-devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+REM devenv Test\DrawingTest\System.Drawing.Test.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild %TEST_J2EE_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
@@ -98,14 +112,14 @@ if not exist Exocortex.DSP.v1.dll (
 if not exist DrawingTest.dll (\r
        copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\DrawingTest.dll . )\r
 \r
-if not exist Test.dotnet.dll (\r
-       copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\Test.dotnet.dll . )\r
+if not exist %TEST_NET_ASSEMBLY% (\r
+       copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\%TEST_NET_ASSEMBLY% . )\r
 \r
-copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.exe" .\r
-copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.dll" .\r
-copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.dll" .\r
-copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.dll" .\r
-nunit-console.exe /fixture:%RUNNING_FIXTURE% Test.dotnet.dll %NUNIT_OPTIONS% /xml=%NET_OUTPUT_XML% >%RUNNING_FIXTURE%_run.log.txt 2<&1\r
+copy "%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit-console.exe" .\r
+copy "%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.util.dll" .\r
+copy "%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.core.dll" .\r
+copy "%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.framework.dll" .\r
+%NUNIT_CONSOLE_PATH%\nunit-console.exe /fixture:%RUNNING_FIXTURE% %TEST_NET_ASSEMBLY% %NUNIT_OPTIONS% /xml=%NET_OUTPUT_XML% >%RUNNING_FIXTURE%_run.log.txt 2<&1\r
 \r
 \r
 REM ********************************************************\r
@@ -116,13 +130,13 @@ REM ********************************************************
 @echo Running fixture "%RUNNING_FIXTURE%"\r
 REM ********************************************************\r
 \r
-copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\Debug_Java\Exocortex.DSP.v1.jar .\r
-copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\Debug_Java\DrawingTest.jar .\r
-copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\Debug_Java\Test.jar .\r
+copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\%PROJECT_J2EE_CONFIGURATION%\Exocortex.DSP.v1.jar .\r
+copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\%PROJECT_J2EE_CONFIGURATION%\DrawingTest.jar .\r
+copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\%PROJECT_J2EE_CONFIGURATION%\%TEST_J2EE_ASSEMBLY% .\r
 \r
 \r
 REM @echo on\r
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi Test.jar /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.log.txt 2<&1\r
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_J2EE_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.log.txt 2<&1\r
 REM @echo off\r
 \r
 if "%RUNNING_DIR%" NEQ "" (\r
@@ -134,11 +148,12 @@ REM ********************************************************
 @echo Build XmlTool\r
 REM ********************************************************\r
 set XML_TOOL_PATH=..\..\tools\mono-xmltool\r
-devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe .\r
+copy %XML_TOOL_PATH%\bin\%PROJECT_J2EE_CONFIGURATION%\xmltool.exe .\r
 copy %XML_TOOL_PATH%\nunit_transform.xslt .\r
 \r
 REM ********************************************************\r
@@ -152,7 +167,7 @@ xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
 GOTO END\r
 \r
 :ENVIRONMENT_EXCEPTION\r
-@echo This test requires environment variables JAVA_HOME and GH_HOME to be defined\r
+@echo This test requires environment variable VMW_HOME to be defined\r
 GOTO END\r
 \r
 :BUILD_EXCEPTION\r