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 (file)
index 0000000..4404551
--- /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\r
+# Visual Studio 2005\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "xslt20.J2EE", "xslt20.J2EE.vmwcsproj", "{52564015-7939-46EF-B930-BB017FB6D26A}"\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
+               Debug|Any CPU = Debug|Any CPU\r
+               Debug-Strong|Any CPU = Debug-Strong|Any CPU\r
+               Release_Java|Any CPU = Release_Java|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Debug|Any CPU.ActiveCfg = Debug_Java|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Debug|Any CPU.Build.0 = Debug_Java|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Debug-Strong|Any CPU.ActiveCfg = Debug_Java|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Debug-Strong|Any CPU.Build.0 = Debug_Java|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Release|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {52564015-7939-46EF-B930-BB017FB6D26A}.Release|Any CPU.Build.0 = Release_Java|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

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 (file)
index 0000000..2abcdb2
--- /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">\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>{52564015-7939-46EF-B930-BB017FB6D26A}</ProjectGuid>\r
+               <OutputType>Library</OutputType>\r
+               <AppDesignerFolder>Properties</AppDesignerFolder>\r
+               <RootNamespace>xslt</RootNamespace>\r
+               <AssemblyName>xslt</AssemblyName>\r
+               <JDKName>1.5.0_05</JDKName>\r
+               <GHProjectType>1</GHProjectType>\r
+               <Version>2.0</Version>\r
+               <jarserver>iap2</jarserver>\r
+               <StartupObject>\r
+               </StartupObject>\r
+       </PropertyGroup>\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">\r
+               <DebugSymbols>true</DebugSymbols>\r
+               <DebugType>full</DebugType>\r
+               <Optimize>false</Optimize>\r
+               <OutputPath>.\</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
+               <SkipValidation>false</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;JAVA</DefineConstants>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <WarningLevel>4</WarningLevel>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <SkipValidation>false</SkipValidation>\r
+               <KeepIntermediate>false</KeepIntermediate>\r
+               <TargetPlatform>0</TargetPlatform>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+       </PropertyGroup>\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">\r
+               <DebugSymbols>true</DebugSymbols>\r
+               <OutputPath>.\</OutputPath>\r
+               <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_2_0;NET_1_1</DefineConstants>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <DebugType>full</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
+               <jarserver>iap2</jarserver>\r
+               <TargetPlatform>0</TargetPlatform>\r
+       </PropertyGroup>\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\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"/>\r
+               </VisualStudio>\r
+       </ProjectExtensions>\r
+       <ItemGroup>\r
+               <Reference Include="nunit.core, Version=0.0.0.0, Culture=neutral">\r
+                       <SpecificVersion>False</SpecificVersion>\r
+                       <HintPath>..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.dll</HintPath>\r
+                       <Private>True</Private>\r
+               </Reference>\r
+               <Reference Include="nunit.framework, Version=0.0.0.0, Culture=neutral">\r
+                       <SpecificVersion>False</SpecificVersion>\r
+                       <HintPath>..\..\..\..\..\nunit20\core\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.Xml"/>\r
+       </ItemGroup>\r
+       <ItemGroup>\r
+               <Compile Include="XmlCompare.cs"/>\r
+               <Compile Include="xslttest.cs"/>\r
+               <Compile Include="XsltTestUtils.cs"/>\r
+       </ItemGroup>\r
+</Project>\r

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 (file)
index 0000000..e3d6bb2
--- /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">\r
+  <PropertyGroup>\r
+    <ProjectType>Local</ProjectType>\r
+    <ProductVersion>8.0.50727</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}</ProjectGuid>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ApplicationIcon>\r
+    </ApplicationIcon>\r
+    <AssemblyKeyContainerName>\r
+    </AssemblyKeyContainerName>\r
+    <AssemblyName>xslt</AssemblyName>\r
+    <AssemblyOriginatorKeyFile>\r
+    </AssemblyOriginatorKeyFile>\r
+    <DefaultClientScript>JScript</DefaultClientScript>\r
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>\r
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>\r
+    <DelaySign>false</DelaySign>\r
+    <OutputType>Library</OutputType>\r
+    <RootNamespace>xslt</RootNamespace>\r
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>\r
+    <StartupObject>\r
+    </StartupObject>\r
+    <FileUpgradeFlags>\r
+    </FileUpgradeFlags>\r
+    <UpgradeBackupLocation>\r
+    </UpgradeBackupLocation>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">\r
+    <OutputPath>.\</OutputPath>\r
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>\r
+    <ConfigurationOverrideFile>\r
+    </ConfigurationOverrideFile>\r
+    <DefineConstants>DEBUG;TRACE;TARGET_JVM</DefineConstants>\r
+    <DocumentationFile>\r
+    </DocumentationFile>\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <FileAlignment>4096</FileAlignment>\r
+    <NoStdLib>false</NoStdLib>\r
+    <NoWarn>1595</NoWarn>\r
+    <Optimize>false</Optimize>\r
+    <RegisterForComInterop>false</RegisterForComInterop>\r
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>\r
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>\r
+    <WarningLevel>4</WarningLevel>\r
+    <DebugType>full</DebugType>\r
+    <ErrorReport>prompt</ErrorReport>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">\r
+    <OutputPath>bin\Release_Java\</OutputPath>\r
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>\r
+    <ConfigurationOverrideFile>\r
+    </ConfigurationOverrideFile>\r
+    <DefineConstants>TRACE;TARGET_JVM</DefineConstants>\r
+    <DocumentationFile>\r
+    </DocumentationFile>\r
+    <DebugSymbols>false</DebugSymbols>\r
+    <FileAlignment>4096</FileAlignment>\r
+    <NoStdLib>false</NoStdLib>\r
+    <NoWarn>1595</NoWarn>\r
+    <Optimize>true</Optimize>\r
+    <RegisterForComInterop>false</RegisterForComInterop>\r
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>\r
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>\r
+    <WarningLevel>4</WarningLevel>\r
+    <DebugType>none</DebugType>\r
+    <ErrorReport>prompt</ErrorReport>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <OutputPath>.\</OutputPath>\r
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>\r
+    <ConfigurationOverrideFile>\r
+    </ConfigurationOverrideFile>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DocumentationFile>\r
+    </DocumentationFile>\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <FileAlignment>4096</FileAlignment>\r
+    <NoStdLib>false</NoStdLib>\r
+    <NoWarn>1595</NoWarn>\r
+    <Optimize>false</Optimize>\r
+    <RegisterForComInterop>false</RegisterForComInterop>\r
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>\r
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>\r
+    <WarningLevel>4</WarningLevel>\r
+    <DebugType>full</DebugType>\r
+    <ErrorReport>prompt</ErrorReport>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="System">\r
+      <Name>System</Name>\r
+    </Reference>\r
+    <Reference Include="System.XML" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="XmlCompare.cs">\r
+      <SubType>Code</SubType>\r
+    </Compile>\r
+    <Compile Include="xslttest.cs">\r
+      <SubType>Code</SubType>\r
+    </Compile>\r
+    <Compile Include="XsltTestUtils.cs">\r
+      <SubType>Code</SubType>\r
+    </Compile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\..\..\..\..\nunit20\core\nunit.core.dll20.csproj">\r
+      <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>\r
+      <Name>nunit.core.dll20</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj">\r
+      <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>\r
+      <Name>nunit.framework.dll20</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
+  <PropertyGroup>\r
+    <PreBuildEvent>\r
+    </PreBuildEvent>\r
+    <PostBuildEvent>\r
+    </PostBuildEvent>\r
+  </PropertyGroup>\r
+</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 (file)
index 0000000..f0b0a8c
--- /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\r
+# Visual Studio 2005\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xslt20", "xslt20.csproj", "{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll20", "..\..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll20", "..\..\..\..\..\nunit20\core\nunit.core.dll20.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console20", "..\..\..\..\..\nunit20\nunit-console\nunit-console20.csproj", "{9367EC89-6A38-42BA-9607-0DC288E4BC3A}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug_Java|Any CPU = Debug_Java|Any CPU\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Debug-Strong|Any CPU = Debug-Strong|Any CPU\r
+               Release_Java|Any CPU = Release_Java|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug-Strong|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug-Strong|Any CPU.Build.0 = Debug|Any CPU\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release|Any CPU.Build.0 = Release_Java|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug_Java|Any CPU.ActiveCfg = Debug-Strong|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug_Java|Any CPU.Build.0 = Debug-Strong|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug-Strong|Any CPU.ActiveCfg = Debug-Strong|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug-Strong|Any CPU.Build.0 = Debug-Strong|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release_Java|Any CPU.ActiveCfg = Release|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release_Java|Any CPU.Build.0 = Release|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug_Java|Any CPU.ActiveCfg = Debug-Strong|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug_Java|Any CPU.Build.0 = Debug-Strong|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug-Strong|Any CPU.ActiveCfg = Debug-Strong|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug-Strong|Any CPU.Build.0 = Debug-Strong|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release_Java|Any CPU.ActiveCfg = Release|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release_Java|Any CPU.Build.0 = Release|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug_Java|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug_Java|Any CPU.Build.0 = Debug|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug-Strong|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug-Strong|Any CPU.Build.0 = Debug|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release_Java|Any CPU.ActiveCfg = Release|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release_Java|Any CPU.Build.0 = Release|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.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.XML/Test/System.Xml/W3C/W3C.J2EE.vmwcsproj b/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.vmwcsproj
new file mode 100644 (file)
index 0000000..d6b4ffb
--- /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">\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>{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}</ProjectGuid>\r
+               <OutputType>Library</OutputType>\r
+               <AppDesignerFolder>Properties</AppDesignerFolder>\r
+               <RootNamespace>W3C</RootNamespace>\r
+               <AssemblyName>W3C</AssemblyName>\r
+               <JDKName>1.5.0_05</JDKName>\r
+               <GHProjectType>1</GHProjectType>\r
+               <Version>2.0</Version>\r
+               <jarserver>iap2</jarserver>\r
+               <StartupObject>\r
+               </StartupObject>\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</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
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">\r
+               <DebugType>pdbonly</DebugType>\r
+               <Optimize>true</Optimize>\r
+               <OutputPath>bin\Release_Java\</OutputPath>\r
+               <DefineConstants>TRACE;JAVA</DefineConstants>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <WarningLevel>4</WarningLevel>\r
+               <NoStdLib>true</NoStdLib>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <SkipValidation>false</SkipValidation>\r
+               <KeepIntermediate>false</KeepIntermediate>\r
+               <TargetPlatform>0</TargetPlatform>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+       </PropertyGroup>\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\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"/>\r
+               </VisualStudio>\r
+       </ProjectExtensions>\r
+       <ItemGroup>\r
+               <Reference Include="nunit.core, Version=2.3.6162.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"/>\r
+               <Reference Include="nunit.framework, Version=2.3.6162.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"/>\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>False</Private>\r
+               </Reference>\r
+               <Reference Include="System"/>\r
+               <Reference Include="System.XML"/>\r
+       </ItemGroup>\r
+       <ItemGroup>\r
+               <Compile Include="xmlconf.cs"/>\r
+       </ItemGroup>\r
+</Project>\r

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 (file)
index 0000000..c0beb6b
--- /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\r
+# Visual Studio 2005\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "W3C20.J2EE", "W3C20.J2EE.vmwcsproj", "{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}"\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
+               {4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Debug_Java|Any CPU.ActiveCfg = Debug_Java20|Any CPU\r
+               {4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Debug_Java|Any CPU.Build.0 = Debug_Java20|Any CPU\r
+               {4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU\r
+               {4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU\r
+               {4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU\r
+               {4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Release_Java20|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}.Release_Java20|Any CPU.Build.0 = Release_Java|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

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 (file)
index 0000000..9c4c544
--- /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">\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>{4A29F8EF-255A-444D-BAB9-3AB3A2CD72AD}</ProjectGuid>\r
+               <OutputType>Library</OutputType>\r
+               <AppDesignerFolder>Properties</AppDesignerFolder>\r
+               <RootNamespace>W3C</RootNamespace>\r
+               <AssemblyName>W3C</AssemblyName>\r
+               <JDKName>1.5.0_05</JDKName>\r
+               <GHProjectType>1</GHProjectType>\r
+               <Version>2.0</Version>\r
+               <jarserver>iap2</jarserver>\r
+               <StartupObject>\r
+               </StartupObject>\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
+               <SkipValidation>false</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;JAVA</DefineConstants>\r
+               <ErrorReport>prompt</ErrorReport>\r
+               <WarningLevel>4</WarningLevel>\r
+               <BaseAddress>285212672</BaseAddress>\r
+               <SkipValidation>false</SkipValidation>\r
+               <KeepIntermediate>false</KeepIntermediate>\r
+               <TargetPlatform>0</TargetPlatform>\r
+               <AdditionalClassPath>\r
+               </AdditionalClassPath>\r
+       </PropertyGroup>\r
+       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">\r
+               <DebugSymbols>true</DebugSymbols>\r
+               <OutputPath>.\</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>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
+               <jarserver>iap2</jarserver>\r
+               <TargetPlatform>0</TargetPlatform>\r
+       </PropertyGroup>\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-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"/>\r
+               </VisualStudio>\r
+       </ProjectExtensions>\r
+       <ItemGroup>\r
+               <Reference Include="nunit.core, Version=0.0.0.0, Culture=neutral">\r
+                       <SpecificVersion>False</SpecificVersion>\r
+                       <HintPath>..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.core.dll</HintPath>\r
+                       <Private>True</Private>\r
+               </Reference>\r
+               <Reference Include="nunit.framework, Version=0.0.0.0, Culture=neutral">\r
+                       <SpecificVersion>False</SpecificVersion>\r
+                       <HintPath>..\..\..\..\..\nunit20\nunit-console\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.Xml"/>\r
+       </ItemGroup>\r
+       <ItemGroup>\r
+               <Compile Include="xmlconf.cs"/>\r
+       </ItemGroup>\r
+</Project>\r

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 (file)
index 0000000..cf9dea6
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.sln
@@ -0,0 +1,44 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 9.00\r
+# Visual Studio 2005\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W3C20", "W3C20.csproj", "{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console20", "..\..\..\..\..\nunit20\nunit-console\nunit-console20.csproj", "{9367EC89-6A38-42BA-9607-0DC288E4BC3A}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll20", "..\..\..\..\..\nunit20\core\nunit.core.dll20.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll20", "..\..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll20", "..\..\..\..\..\nunit20\util\nunit.util.dll20.csproj", "{61CE9CE5-943E-44D4-A381-814DC1406767}"\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
+               {9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {61CE9CE5-943E-44D4-A381-814DC1406767}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {61CE9CE5-943E-44D4-A381-814DC1406767}.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.XML/Test/System.Xml/W3C/xmlconf.cs b/mcs/class/System.XML/Test/System.Xml/W3C/xmlconf.cs
index 1f14e97466a6094d9bac636403786f6cc6c3af1e..2cc6390cffb3fbf3eeeabf1459ff37ada8ccd97a 100644 (file)
--- 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;\r
+\r
+       public abstract class BaseTests
        {
-               TestSuite _suite;
-
+               TestSuite _suite;\r
 
                #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 {
+       }\r
+\r
+       public class CleanTests : BaseTests\r
+       {
                [Suite]
                static public TestSuite Suite{
                        get {
@@ -119,9 +119,10 @@ namespace MonoTests.W3C_xmlconf {
 
                        base.ProcessTest (testId, test);
                }
-       }
-
-       class KnownFailureTests: BaseTests {
+       }\r
+\r
+       public class KnownFailureTests : BaseTests\r
+       {
                [Suite]
                static public TestSuite Suite{
                        get {
@@ -148,9 +149,9 @@ namespace MonoTests.W3C_xmlconf {
 
                        base.ProcessTest (testId, test);
                }
-       }
-
-       class TestFromCatalog: NUnit.Core.TestCase
+       }\r
+\r
+       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 0b2b7858f4fa4efce5a5c5144d0d54aaad68b4b5..8a063f5771b6671c0329a388abc123c2faed3f8e 100644 (file)
--- a/mcs/class/System.XML/run-W3C-tests.bat
+++ b/mcs/class/System.XML/run-W3C-tests.bat
@@ -1,4 +1,4 @@
-@echo off\r
+rem @echo off\r
 REM ********************************************************\r
 REM This batch file receives the follwing parameters:\r
 REM build/rebuild (optional): should the solution file be rebuilded \r
@@ -10,6 +10,7 @@ REM ********************************************************
 IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
 IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%GHROOT%"=="" set GHROOT=%GH_HOME%\r
 \r
 REM ********************************************************\r
 REM Set parameters\r
@@ -28,16 +29,13 @@ REM @echo Set environment
 REM ********************************************************\r
 \r
 set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\\r
-\r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%J2SE.Helpers.jar;\r
 set NUNIT_OPTIONS=/fixture=MonoTests.W3C_xmlconf.CleanTests\r
-\r
+set PROJECT_CONFIGURATION=Debug_Java20\r
 set GH_OUTPUT_XML=W3C_nunit_results.xml\r
-\r
-set NUNIT_PATH=..\..\..\..\..\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_PATH=..\..\..\..\..\nunit20\r
+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\r
 set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
-\r
 set W3C_DIR=Test\System.Xml\W3C\\r
 \r
 pushd %W3C_DIR%\r
@@ -47,7 +45,7 @@ REM ********************************************************
 REM ********************************************************\r
 \r
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
-devenv %NUNIT_PATH%nunit.java.sln /%BUILD_OPTION% Debug_Java >build.log.txt 2<&1\r
+msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >build.log.txt 2<&1\r
 \r
 goto NUNITREADY\r
 \r
@@ -63,21 +61,22 @@ 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 >>build.log.txt 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.sln /p:configuration=Debug >>build.log.txt 2<&1\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe ..\..\..\r
+copy %XML_TOOL_PATH%\bin\Debug\xmltool.exe ..\..\..\r
 copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..\r
 \r
 REM ********************************************************\r
 @echo Building GH solution...\r
 REM ********************************************************\r
-devenv W3c.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1\r
+del W3C.jar\r
+msbuild W3c20.J2EE.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
 @echo Building test catalog...\r
 REM ********************************************************\r
-\r
+del xmlts20031210.zip\r
 wget http://www.w3.org/XML/Test/xmlts20031210.zip\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
@@ -89,9 +88,8 @@ IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 REM ********************************************************\r
 @echo Running GH tests...\r
 REM ********************************************************\r
-\r
 @echo on\r
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi W3C.jar  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%  >run.log.txt 2<&1\r
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi W3C.jar %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%  >run.log.txt 2<&1\r
 @echo off\r
 \r
 popd\r

diff --git a/mcs/class/System.XML/run-XSLT-tests.bat b/mcs/class/System.XML/run-XSLT-tests.bat
index b01cfd816118ce015ed74b7c1d2dbc6bb5ce61f8..cf92d0fa82489f756ccd6a92ab1325682a798ebe 100644 (file)
--- a/mcs/class/System.XML/run-XSLT-tests.bat
+++ b/mcs/class/System.XML/run-XSLT-tests.bat
@@ -1,4 +1,4 @@
-@echo off\r
+rem @echo off\r
 REM ********************************************************\r
 REM This batch file receives the follwing parameters:\r
 REM build/rebuild (optional): should the solution file be rebuilded \r
@@ -10,6 +10,7 @@ REM ********************************************************
 IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
 IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%GHROOT%"=="" set GHROOT=%GH_HOME%\r
 \r
 REM ********************************************************\r
 REM Set parameters\r
@@ -28,16 +29,13 @@ REM @echo Set environment
 REM ********************************************************\r
 \r
 set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\\r
-\r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%J2SE.Helpers.jar;\r
 set NUNIT_OPTIONS=/fixture=MonoTests.oasis_xslt.SuiteBuilder /include=Clean\r
-\r
+set PROJECT_CONFIGURATION=Debug_Java20\r
 set GH_OUTPUT_XML=XSLT_nunit_results.xml\r
-\r
 set NUNIT_PATH=..\..\..\..\..\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 CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
-\r
 set XSLT_DIR=Test\System.Xml.XSL\standalone_tests\\r
 \r
 pushd %XSLT_DIR%\r
@@ -46,8 +44,10 @@ IF "%BUILD_OPTION%"=="nobuild" GOTO RUN
 REM ********************************************************\r
 @echo Building NUnit solution...\r
 REM ********************************************************\r
+\r
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
-devenv %NUNIT_PATH%nunit.java.sln /%BUILD_OPTION% Debug_Java >build.log.txt 2<&1\r
+msbuild %NUNIT_PATH%nunit.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >build.log.txt 2<&1\r
+\r
 goto NUNITREADY\r
 \r
 :NUNITSKIP\r
@@ -62,16 +62,15 @@ 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 >>build.log.txt 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.sln /p:configuration=Debug >>build.log.txt 2<&1\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe ..\..\..\r
 copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..\r
 \r
-\r
 REM ********************************************************\r
 @echo Building GH solution...\r
 REM ********************************************************\r
-devenv xslt.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1\r
+msbuild xslt20.J2EE.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
@@ -97,12 +96,14 @@ REM ********************************************************
 @echo Running GH tests...\r
 REM ********************************************************\r
 \r
+del %GH_OUTPUT_XML%\r
 @echo on\r
 "%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi xslt.jar  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%  >run.log.txt 2<&1\r
 @echo off\r
 \r
 popd\r
 \r
+del %GH_OUTPUT_XML%\r
 copy %XSLT_DIR%\%GH_OUTPUT_XML% .\r
 \r
 REM ********************************************************\r