From: Andrew Skiba <andrews@mono-cvs.ximian.com>
Date: Wed, 16 Aug 2006 13:20:41 +0000 (-0000)
Subject: run xml standalone tests on GH 2.0
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=4d5a8ec003ebfb68218082eb11c5b8a64eec869a;p=mono.git

run xml standalone tests on GH 2.0

svn path=/trunk/mcs/; revision=63811
---

diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.sln b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.sln
new file mode 100644
index 00000000000..44045511adf
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.sln
@@ -0,0 +1,31 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "xslt20.J2EE", "xslt20.J2EE.vmwcsproj", "{52564015-7939-46EF-B930-BB017FB6D26A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_Java|Any CPU = Debug_Java|Any CPU
+		Debug_Java20|Any CPU = Debug_Java20|Any CPU
+		Debug|Any CPU = Debug|Any CPU
+		Debug-Strong|Any CPU = Debug-Strong|Any CPU
+		Release_Java|Any CPU = Release_Java|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Debug|Any CPU.ActiveCfg = Debug_Java|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Debug|Any CPU.Build.0 = Debug_Java|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Debug-Strong|Any CPU.ActiveCfg = Debug_Java|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Debug-Strong|Any CPU.Build.0 = Debug_Java|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Release|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{52564015-7939-46EF-B930-BB017FB6D26A}.Release|Any CPU.Build.0 = Release_Java|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.vmwcsproj b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.vmwcsproj
new file mode 100644
index 00000000000..2abcdb2e434
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.vmwcsproj
@@ -0,0 +1,105 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<ProductVersion>8.0.50727</ProductVersion>
+		<SchemaVersion>2.0</SchemaVersion>
+		<ProjectGuid>{52564015-7939-46EF-B930-BB017FB6D26A}</ProjectGuid>
+		<OutputType>Library</OutputType>
+		<AppDesignerFolder>Properties</AppDesignerFolder>
+		<RootNamespace>xslt</RootNamespace>
+		<AssemblyName>xslt</AssemblyName>
+		<JDKName>1.5.0_05</JDKName>
+		<GHProjectType>1</GHProjectType>
+		<Version>2.0</Version>
+		<jarserver>iap2</jarserver>
+		<StartupObject>
+		</StartupObject>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>full</DebugType>
+		<Optimize>false</Optimize>
+		<OutputPath>.\</OutputPath>
+		<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<BaseAddress>285212672</BaseAddress>
+		<SkipValidation>false</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<TargetPlatform>0</TargetPlatform>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
+		<DebugType>pdbonly</DebugType>
+		<Optimize>true</Optimize>
+		<OutputPath>bin\Release_Java\</OutputPath>
+		<DefineConstants>TRACE;JAVA</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<BaseAddress>285212672</BaseAddress>
+		<SkipValidation>false</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<TargetPlatform>0</TargetPlatform>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<OutputPath>.\</OutputPath>
+		<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_2_0;NET_1_1</DefineConstants>
+		<BaseAddress>285212672</BaseAddress>
+		<DebugType>full</DebugType>
+		<PlatformTarget>AnyCPU</PlatformTarget>
+		<ErrorReport>prompt</ErrorReport>
+		<SkipValidation>false</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<GHProjectType>1</GHProjectType>
+		<PreCompile>false</PreCompile>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+		<ApplicationServerType>
+		</ApplicationServerType>
+		<Version>2.0</Version>
+		<JDKName>1.5.0_05</JDKName>
+		<jarserver>iap2</jarserver>
+		<TargetPlatform>0</TargetPlatform>
+	</PropertyGroup>
+	<Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>
+	<Import Project="$(GHROOT)\bin\Mainsoft.Common.targets"/>
+	<!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.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-rt="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar"/>
+		</VisualStudio>
+	</ProjectExtensions>
+	<ItemGroup>
+		<Reference Include="nunit.core, Version=0.0.0.0, Culture=neutral">
+			<SpecificVersion>False</SpecificVersion>
+			<HintPath>..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.dll</HintPath>
+			<Private>True</Private>
+		</Reference>
+		<Reference Include="nunit.framework, Version=0.0.0.0, Culture=neutral">
+			<SpecificVersion>False</SpecificVersion>
+			<HintPath>..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.framework.dll</HintPath>
+			<Private>True</Private>
+		</Reference>
+		<Reference Include="rt, Version=0.0.0.0, Culture=neutral">
+			<Private>False</Private>
+		</Reference>
+		<Reference Include="System"/>
+		<Reference Include="System.Xml"/>
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Include="XmlCompare.cs"/>
+		<Compile Include="xslttest.cs"/>
+		<Compile Include="XsltTestUtils.cs"/>
+	</ItemGroup>
+</Project>
diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.csproj b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.csproj
new file mode 100644
index 00000000000..e3d6bb246e3
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.csproj
@@ -0,0 +1,130 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>xslt</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>xslt</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
+    <OutputPath>.\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE;TARGET_JVM</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>1595</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
+    <OutputPath>bin\Release_Java\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;TARGET_JVM</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>1595</NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>.\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>1595</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="XmlCompare.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="xslttest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XsltTestUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\nunit20\core\nunit.core.dll20.csproj">
+      <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>
+      <Name>nunit.core.dll20</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj">
+      <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
+      <Name>nunit.framework.dll20</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.sln b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.sln
new file mode 100644
index 00000000000..f0b0a8ce9ba
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.sln
@@ -0,0 +1,64 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xslt20", "xslt20.csproj", "{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll20", "..\..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll20", "..\..\..\..\..\nunit20\core\nunit.core.dll20.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console20", "..\..\..\..\..\nunit20\nunit-console\nunit-console20.csproj", "{9367EC89-6A38-42BA-9607-0DC288E4BC3A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_Java|Any CPU = Debug_Java|Any CPU
+		Debug|Any CPU = Debug|Any CPU
+		Debug-Strong|Any CPU = Debug-Strong|Any CPU
+		Release_Java|Any CPU = Release_Java|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug-Strong|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug-Strong|Any CPU.Build.0 = Debug|Any CPU
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release|Any CPU.Build.0 = Release_Java|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug_Java|Any CPU.ActiveCfg = Debug-Strong|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug_Java|Any CPU.Build.0 = Debug-Strong|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug-Strong|Any CPU.ActiveCfg = Debug-Strong|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug-Strong|Any CPU.Build.0 = Debug-Strong|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release_Java|Any CPU.ActiveCfg = Release|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release_Java|Any CPU.Build.0 = Release|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug_Java|Any CPU.ActiveCfg = Debug-Strong|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug_Java|Any CPU.Build.0 = Debug-Strong|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug-Strong|Any CPU.ActiveCfg = Debug-Strong|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug-Strong|Any CPU.Build.0 = Debug-Strong|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release_Java|Any CPU.ActiveCfg = Release|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release_Java|Any CPU.Build.0 = Release|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug_Java|Any CPU.ActiveCfg = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug_Java|Any CPU.Build.0 = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug-Strong|Any CPU.ActiveCfg = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug-Strong|Any CPU.Build.0 = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release_Java|Any CPU.ActiveCfg = Release|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release_Java|Any CPU.Build.0 = Release|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.vmwcsproj b/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.vmwcsproj
new file mode 100644
index 00000000000..d6b4ffbf36c
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.vmwcsproj
@@ -0,0 +1,78 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<ProductVersion>8.0.50727</ProductVersion>
+		<SchemaVersion>2.0</SchemaVersion>
+		<ProjectGuid>{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}</ProjectGuid>
+		<OutputType>Library</OutputType>
+		<AppDesignerFolder>Properties</AppDesignerFolder>
+		<RootNamespace>W3C</RootNamespace>
+		<AssemblyName>W3C</AssemblyName>
+		<JDKName>1.5.0_05</JDKName>
+		<GHProjectType>1</GHProjectType>
+		<Version>2.0</Version>
+		<jarserver>iap2</jarserver>
+		<StartupObject>
+		</StartupObject>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>full</DebugType>
+		<Optimize>false</Optimize>
+		<OutputPath>bin\Debug_Java\</OutputPath>
+		<DefineConstants>TRACE;DEBUG;TARGET_JVM</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<BaseAddress>285212672</BaseAddress>
+		<NoStdLib>false</NoStdLib>
+		<SkipValidation>false</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<TargetPlatform>0</TargetPlatform>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
+		<DebugType>pdbonly</DebugType>
+		<Optimize>true</Optimize>
+		<OutputPath>bin\Release_Java\</OutputPath>
+		<DefineConstants>TRACE;JAVA</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<NoStdLib>true</NoStdLib>
+		<BaseAddress>285212672</BaseAddress>
+		<SkipValidation>false</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<TargetPlatform>0</TargetPlatform>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+	</PropertyGroup>
+	<Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>
+	<Import Project="$(GHROOT)\bin\Mainsoft.Common.targets"/>
+	<!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.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-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"/>
+		</VisualStudio>
+	</ProjectExtensions>
+	<ItemGroup>
+		<Reference Include="nunit.core, Version=2.3.6162.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"/>
+		<Reference Include="nunit.framework, Version=2.3.6162.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"/>
+		<Reference Include="rt, Version=0.0.0.0, Culture=neutral">
+			<SpecificVersion>False</SpecificVersion>
+			<HintPath>..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\jre5\rt.dll</HintPath>
+			<Private>False</Private>
+		</Reference>
+		<Reference Include="System"/>
+		<Reference Include="System.XML"/>
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Include="xmlconf.cs"/>
+	</ItemGroup>
+</Project>
diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.sln b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.sln
new file mode 100644
index 00000000000..c0beb6b5f53
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.sln
@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "W3C20.J2EE", "W3C20.J2EE.vmwcsproj", "{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_Java|Any CPU = Debug_Java|Any CPU
+		Debug_Java20|Any CPU = Debug_Java20|Any CPU
+		Release_Java|Any CPU = Release_Java|Any CPU
+		Release_Java20|Any CPU = Release_Java20|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Debug_Java|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Debug_Java|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
+		{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Release_Java20|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Release_Java20|Any CPU.Build.0 = Release_Java|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.vmwcsproj b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.vmwcsproj
new file mode 100644
index 00000000000..9c4c54460a2
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.vmwcsproj
@@ -0,0 +1,103 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<ProductVersion>8.0.50727</ProductVersion>
+		<SchemaVersion>2.0</SchemaVersion>
+		<ProjectGuid>{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}</ProjectGuid>
+		<OutputType>Library</OutputType>
+		<AppDesignerFolder>Properties</AppDesignerFolder>
+		<RootNamespace>W3C</RootNamespace>
+		<AssemblyName>W3C</AssemblyName>
+		<JDKName>1.5.0_05</JDKName>
+		<GHProjectType>1</GHProjectType>
+		<Version>2.0</Version>
+		<jarserver>iap2</jarserver>
+		<StartupObject>
+		</StartupObject>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>full</DebugType>
+		<Optimize>false</Optimize>
+		<OutputPath>bin\Debug_Java\</OutputPath>
+		<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<BaseAddress>285212672</BaseAddress>
+		<SkipValidation>false</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<TargetPlatform>0</TargetPlatform>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
+		<DebugType>pdbonly</DebugType>
+		<Optimize>true</Optimize>
+		<OutputPath>bin\Release_Java\</OutputPath>
+		<DefineConstants>TRACE;JAVA</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<BaseAddress>285212672</BaseAddress>
+		<SkipValidation>false</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<TargetPlatform>0</TargetPlatform>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<OutputPath>.\</OutputPath>
+		<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
+		<BaseAddress>285212672</BaseAddress>
+		<DebugType>full</DebugType>
+		<PlatformTarget>AnyCPU</PlatformTarget>
+		<ErrorReport>prompt</ErrorReport>
+		<SkipValidation>false</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<GHProjectType>1</GHProjectType>
+		<PreCompile>false</PreCompile>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+		<ApplicationServerType>
+		</ApplicationServerType>
+		<Version>2.0</Version>
+		<JDKName>1.5.0_05</JDKName>
+		<jarserver>iap2</jarserver>
+		<TargetPlatform>0</TargetPlatform>
+	</PropertyGroup>
+	<Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>
+	<Import Project="$(GHROOT)\bin\Mainsoft.Common.targets"/>
+	<!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties REFS-JarPath-system-xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.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-rt="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.core.jar" REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar"/>
+		</VisualStudio>
+	</ProjectExtensions>
+	<ItemGroup>
+		<Reference Include="nunit.core, Version=0.0.0.0, Culture=neutral">
+			<SpecificVersion>False</SpecificVersion>
+			<HintPath>..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.core.dll</HintPath>
+			<Private>True</Private>
+		</Reference>
+		<Reference Include="nunit.framework, Version=0.0.0.0, Culture=neutral">
+			<SpecificVersion>False</SpecificVersion>
+			<HintPath>..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.dll</HintPath>
+			<Private>True</Private>
+		</Reference>
+		<Reference Include="rt, Version=0.0.0.0, Culture=neutral">
+			<Private>False</Private>
+		</Reference>
+		<Reference Include="System"/>
+		<Reference Include="System.Xml"/>
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Include="xmlconf.cs"/>
+	</ItemGroup>
+</Project>
diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.sln b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.sln
new file mode 100644
index 00000000000..cf9dea67f35
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.sln
@@ -0,0 +1,44 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W3C20", "W3C20.csproj", "{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console20", "..\..\..\..\..\nunit20\nunit-console\nunit-console20.csproj", "{9367EC89-6A38-42BA-9607-0DC288E4BC3A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll20", "..\..\..\..\..\nunit20\core\nunit.core.dll20.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll20", "..\..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll20", "..\..\..\..\..\nunit20\util\nunit.util.dll20.csproj", "{61CE9CE5-943E-44D4-A381-814DC1406767}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61CE9CE5-943E-44D4-A381-814DC1406767}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61CE9CE5-943E-44D4-A381-814DC1406767}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/xmlconf.cs b/mcs/class/System.XML/Test/System.Xml/W3C/xmlconf.cs
index 1f14e97466a..2cc6390cffb 100644
--- a/mcs/class/System.XML/Test/System.Xml/W3C/xmlconf.cs
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/xmlconf.cs
@@ -6,12 +6,11 @@ using System.Text;
 
 namespace MonoTests.W3C_xmlconf {
 	using NUnit.Core;
-	using NUnit.Framework;
-
-	abstract class BaseTests
+	using NUnit.Framework;
+
+	public abstract class BaseTests
 	{
-		TestSuite _suite;
-
+		TestSuite _suite;
 
 		#region test list fields
 		protected readonly ArrayList ignoredTests = new ArrayList ();
@@ -78,7 +77,7 @@ namespace MonoTests.W3C_xmlconf {
 		}
 	}
 
-	class AllTests: BaseTests
+	public class AllTests: BaseTests
 	{
 		[Suite]
 		static public TestSuite Suite{
@@ -94,9 +93,10 @@ namespace MonoTests.W3C_xmlconf {
 			: base (suite)
 		{
 		}
-	}
-
-	class CleanTests: BaseTests {
+	}
+
+	public class CleanTests : BaseTests
+	{
 		[Suite]
 		static public TestSuite Suite{
 			get {
@@ -119,9 +119,10 @@ namespace MonoTests.W3C_xmlconf {
 
 			base.ProcessTest (testId, test);
 		}
-	}
-
-	class KnownFailureTests: BaseTests {
+	}
+
+	public class KnownFailureTests : BaseTests
+	{
 		[Suite]
 		static public TestSuite Suite{
 			get {
@@ -148,9 +149,9 @@ namespace MonoTests.W3C_xmlconf {
 
 			base.ProcessTest (testId, test);
 		}
-	}
-
-	class TestFromCatalog: NUnit.Core.TestCase
+	}
+
+	public class TestFromCatalog : NUnit.Core.TestCase
 	{
 		XmlElement _test;
 		string _errorString;
diff --git a/mcs/class/System.XML/run-W3C-tests.bat b/mcs/class/System.XML/run-W3C-tests.bat
index 0b2b7858f4f..8a063f5771b 100644
--- a/mcs/class/System.XML/run-W3C-tests.bat
+++ b/mcs/class/System.XML/run-W3C-tests.bat
@@ -1,4 +1,4 @@
-@echo off
+rem @echo off
 REM ********************************************************
 REM This batch file receives the follwing parameters:
 REM build/rebuild (optional): should the solution file be rebuilded 
@@ -10,6 +10,7 @@ REM ********************************************************
 IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
 
 IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+IF "%GHROOT%"=="" set GHROOT=%GH_HOME%
 
 REM ********************************************************
 REM Set parameters
@@ -28,16 +29,13 @@ REM @echo Set environment
 REM ********************************************************
 
 set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\
-
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%J2SE.Helpers.jar;
 set NUNIT_OPTIONS=/fixture=MonoTests.W3C_xmlconf.CleanTests
-
+set PROJECT_CONFIGURATION=Debug_Java20
 set GH_OUTPUT_XML=W3C_nunit_results.xml
-
-set NUNIT_PATH=..\..\..\..\..\nunit20\
-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
+set NUNIT_PATH=..\..\..\..\..\nunit20
+set NUNIT_CLASSPATH=%NUNIT_PATH%\nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar;%NUNIT_PATH%\nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar;%NUNIT_PATH%\nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar;%NUNIT_PATH%\nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar
 set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
-
 set W3C_DIR=Test\System.Xml\W3C\
 
 pushd %W3C_DIR%
@@ -47,7 +45,7 @@ REM ********************************************************
 REM ********************************************************
 
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
-devenv %NUNIT_PATH%nunit.java.sln /%BUILD_OPTION% Debug_Java >build.log.txt 2<&1
+msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >build.log.txt 2<&1
 
 goto NUNITREADY
 
@@ -63,21 +61,22 @@ REM ********************************************************
 @echo Build XmlTool
 REM ********************************************************
 set XML_TOOL_PATH=..\..\..\..\..\tools\mono-xmltool
-devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.sln /p:configuration=Debug >>build.log.txt 2<&1
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe ..\..\..
+copy %XML_TOOL_PATH%\bin\Debug\xmltool.exe ..\..\..
 copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..
 
 REM ********************************************************
 @echo Building GH solution...
 REM ********************************************************
-devenv W3c.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1
+del W3C.jar
+msbuild W3c20.J2EE.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
 REM ********************************************************
 @echo Building test catalog...
 REM ********************************************************
-
+del xmlts20031210.zip
 wget http://www.w3.org/XML/Test/xmlts20031210.zip
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
@@ -89,9 +88,8 @@ IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 REM ********************************************************
 @echo Running GH tests...
 REM ********************************************************
-
 @echo on
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi W3C.jar  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%  >run.log.txt 2<&1
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi W3C.jar %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%  >run.log.txt 2<&1
 @echo off
 
 popd
diff --git a/mcs/class/System.XML/run-XSLT-tests.bat b/mcs/class/System.XML/run-XSLT-tests.bat
index b01cfd81611..cf92d0fa824 100644
--- a/mcs/class/System.XML/run-XSLT-tests.bat
+++ b/mcs/class/System.XML/run-XSLT-tests.bat
@@ -1,4 +1,4 @@
-@echo off
+rem @echo off
 REM ********************************************************
 REM This batch file receives the follwing parameters:
 REM build/rebuild (optional): should the solution file be rebuilded 
@@ -10,6 +10,7 @@ REM ********************************************************
 IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
 
 IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+IF "%GHROOT%"=="" set GHROOT=%GH_HOME%
 
 REM ********************************************************
 REM Set parameters
@@ -28,16 +29,13 @@ REM @echo Set environment
 REM ********************************************************
 
 set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\
-
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%J2SE.Helpers.jar;
 set NUNIT_OPTIONS=/fixture=MonoTests.oasis_xslt.SuiteBuilder /include=Clean
-
+set PROJECT_CONFIGURATION=Debug_Java20
 set GH_OUTPUT_XML=XSLT_nunit_results.xml
-
 set NUNIT_PATH=..\..\..\..\..\nunit20\
 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
 set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
-
 set XSLT_DIR=Test\System.Xml.XSL\standalone_tests\
 
 pushd %XSLT_DIR%
@@ -46,8 +44,10 @@ IF "%BUILD_OPTION%"=="nobuild" GOTO RUN
 REM ********************************************************
 @echo Building NUnit solution...
 REM ********************************************************
+
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
-devenv %NUNIT_PATH%nunit.java.sln /%BUILD_OPTION% Debug_Java >build.log.txt 2<&1
+msbuild %NUNIT_PATH%nunit.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >build.log.txt 2<&1
+
 goto NUNITREADY
 
 :NUNITSKIP
@@ -62,16 +62,15 @@ REM ********************************************************
 @echo Build XmlTool
 REM ********************************************************
 set XML_TOOL_PATH=..\..\..\..\..\tools\mono-xmltool
-devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.sln /p:configuration=Debug >>build.log.txt 2<&1
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe ..\..\..
 copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..
 
-
 REM ********************************************************
 @echo Building GH solution...
 REM ********************************************************
-devenv xslt.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1
+msbuild xslt20.J2EE.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
 REM ********************************************************
@@ -97,12 +96,14 @@ REM ********************************************************
 @echo Running GH tests...
 REM ********************************************************
 
+del %GH_OUTPUT_XML%
 @echo on
 "%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi xslt.jar  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%  >run.log.txt 2<&1
 @echo off
 
 popd
 
+del %GH_OUTPUT_XML%
 copy %XSLT_DIR%\%GH_OUTPUT_XML% .
 
 REM ********************************************************