Fixes for Java compilations:

1. Upgrade project/solution files to visual studio 2008
2. In Grasshopper, the InternalVisible attribute in System.Web doesn't work, so need to compile without using the internals of System.Web.

svn path=/trunk/mcs/; revision=100539

mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs

@@ -55,9 +55,9 @@ namespace MonoTests.System.Web.UI.HtmlControls {
 			}
 		}
 
-#if NET_2_0
+#if NET_2_0 && !TARGET_JVM
 		public void SetContext ()
-		{
+		{            
 			SetContext (Context);
 		}
 #endif
@@ -201,7 +201,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
 		}
 
 #if NET_2_0
-#if !TARGET_DOTNET
+#if !TARGET_DOTNET && !TARGET_JVM
 		[Test]
 		public void ActionStringWithQuery ()
 		{

mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs

@@ -135,8 +135,8 @@ namespace MonoTests.System.Web.UI.WebControls
 			WebTest.CopyResource (GetType (), "menuclass.aspx", "menuclass.aspx");
 			WebTest.CopyResource (GetType (), "PostBackMenuTest.aspx", "PostBackMenuTest.aspx");
 #endif
-		}
-
+		}
+
 		[Test]
 		public void Menu_DefaultProperties ()
 		{
@@ -1022,7 +1022,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (Menu_RenderStaticItemsWithBaseAdapter_Vertical)).Run ();
 			RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
 			HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "Menu_RenderStaticItemsWithDefaultAdapter_Vertical");
-
+
 			#region OriginControlHtml
 			OriginControlHtml = @"<a href=""#Menu_SkipLink""><img alt=""Skip Navigation Links"" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><table id=""Menu"" class=""Menu_2"" cellpadding=""0"" cellspacing=""0"" border=""0"">
 	<tr>
@@ -1125,24 +1125,24 @@ namespace MonoTests.System.Web.UI.WebControls
 			RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
 			HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "Menu_RenderStaticItemsWithBaseAdapter_Horizontal");
 		}
-
-		class MyMenuAdapter : global::System.Web.UI.WebControls.Adapters.MenuAdapter
-		{
-			protected internal override void RenderItem (HtmlTextWriter writer, 
-								    MenuItem item,
-								    int position)
-			{
-				writer.Write ("{");
-				base.RenderItem (writer, item, position);
-				writer.Write ("}");				
-			}			
-		}
-
+
+		class MyMenuAdapter : global::System.Web.UI.WebControls.Adapters.MenuAdapter
+		{
+			protected override void RenderItem (HtmlTextWriter writer, 
+								    MenuItem item,
+								    int position)
+			{
+				writer.Write ("{");
+				base.RenderItem (writer, item, position);
+				writer.Write ("}");				
+			}			
+		}
+
 	  	[Test]
 		[Category ("NunitWeb")]
-		public void Menu_RenderStaticItemsWithAdapter () {
+		public void Menu_RenderStaticItemsWithAdapter () {
 			string RenderedPageHtml, RenderedControlHtml, OriginControlHtml;
-			RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (Menu_RenderStaticItemsWithAdapter_Vertical)).Run ();
+			RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (Menu_RenderStaticItemsWithAdapter_Vertical)).Run ();
 			RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
 			#region OriginControlHtml
 			OriginControlHtml = @"<a href=""#Menu_SkipLink""><img alt=""Skip Navigation Links"" src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160"" width=""0"" height=""0"" style=""border-width:0px;"" /></a><table id=""Menu"" class=""Menu_2"" cellpadding=""0"" cellspacing=""0"" border=""0"">
@@ -1367,7 +1367,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			#endregion
 			HtmlDiff.AssertAreEqual (OriginControlHtml, RenderedControlHtml, "Menu_RenderStaticItemsWithAdapter_Horizontal");
 		}
-
+
 		public static void Menu_RenderStaticItems_Vertical (Page p) {
 			Menu m = CreateMenuForRenderTests (null);
 			m.StaticDisplayLevels = 4;
@@ -1393,7 +1393,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			m.StaticDisplayLevels = 4;
 			AddMenuToPage (p, m);
 		}
-
+
 		public static void Menu_RenderStaticItemsWithAdapter_Vertical (Page p) {
 			Menu m = CreateMenuForRenderTests (new MyMenuAdapter());
 			m.StaticDisplayLevels = 4;
@@ -1406,27 +1406,27 @@ namespace MonoTests.System.Web.UI.WebControls
 			m.StaticDisplayLevels = 4;
 			AddMenuToPage (p, m);
 		}
-
+
 		private static void AddMenuToPage (Page p, Menu m) {
 			LiteralControl lcb = new LiteralControl (HtmlDiff.BEGIN_TAG);
 			LiteralControl lce = new LiteralControl (HtmlDiff.END_TAG);
 			p.Form.Controls.Add (lcb);
 			p.Form.Controls.Add (m);
 			p.Form.Controls.Add (lce);
-		}
-		
-		class MyMenu : Menu
-		{
-			internal MyMenu (MyWebControl.Adapters.MenuAdapter adapter) : base ()
-			{
-				menu_adapter = adapter;
-			}
-
-			MyWebControl.Adapters.MenuAdapter menu_adapter;
-			protected override global::System.Web.UI.Adapters.ControlAdapter ResolveAdapter ()
-			{
-				return menu_adapter;
-			}			
+		}
+		
+		class MyMenu : Menu
+		{
+			internal MyMenu (MyWebControl.Adapters.MenuAdapter adapter) : base ()
+			{
+				menu_adapter = adapter;
+			}
+
+			MyWebControl.Adapters.MenuAdapter menu_adapter;
+			protected override global::System.Web.UI.Adapters.ControlAdapter ResolveAdapter ()
+			{
+				return menu_adapter;
+			}			
 		}
 
 		private static Menu CreateMenuForRenderTests (MyWebControl.Adapters.MenuAdapter adapter) {

mcs/class/System.Web/Test/System.Web.UI.WebControls/WebControlTest.cs

@@ -702,6 +702,17 @@ namespace MonoTests.System.Web.UI.WebControls
 			{
 				return my_control_adapter;
 			}
+            public void DoRender(HtmlTextWriter writer)
+            {
+                Render(writer);
+            }
+            public bool GetIsEnabled
+            {
+                get
+                {
+                    return IsEnabled;
+                }
+            }
 		}
 		
 		[Test]
@@ -710,7 +721,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			MyWebControl c = new MyWebControl ();
 			StringWriter sw = new StringWriter ();
 			HtmlTextWriter w = new HtmlTextWriter (sw);			
-			c.Render (w);
+			c.DoRender (w);
 			Assert.AreEqual ("RenderBeginTag\nRenderContents\nRenderEndTag\n", sw.ToString (), "RenderWithWebControlAdapter #1");
 		}
 
@@ -721,22 +732,22 @@ namespace MonoTests.System.Web.UI.WebControls
 			c.my_control_adapter = new MyControlAdapter ();
 			StringWriter sw = new StringWriter ();
 			HtmlTextWriter w = new HtmlTextWriter (sw);			
-			c.Render (w);
+			c.DoRender (w);
 			Assert.AreEqual ("MyControlAdapter.Render\n", sw.ToString (), "RenderWithControlAdapter #1");
 		}
 
 		[Test]
 		public void IsEnabled ()
 		{
-			WebControl parent = new MyWebControl ();
-			WebControl child = new MyWebControl ();
+			MyWebControl parent = new MyWebControl ();
+			MyWebControl child = new MyWebControl ();
 			parent.Controls.Add (child);
-			Assert.IsTrue (child.IsEnabled, "IsEnabled #1");
+			Assert.IsTrue (child.GetIsEnabled, "IsEnabled #1");
 			parent.Enabled = false;
-			Assert.IsFalse (child.IsEnabled, "IsEnabled #2");
+			Assert.IsFalse (child.GetIsEnabled, "IsEnabled #2");
 			parent.Enabled = true;
 			child.Enabled = false;
-			Assert.IsFalse (child.IsEnabled, "IsEnabled #3");
+			Assert.IsFalse (child.GetIsEnabled, "IsEnabled #3");
 		}
 #endif
 	}

mcs/class/System.Web/Test/System.Web.UI/PageTest.cs

@@ -1409,9 +1409,15 @@ namespace MonoTests.System.Web.UI {
 				persister = new TestPersister(Page);
 			return persister;
 		}
-		
-		protected internal override string GetPostBackFormReference (string formId)
-		{
+
+        
+#if !TARGET_JVM
+        internal 
+#endif
+        protected override string GetPostBackFormReference (string formId)
+       
+
+        {
 			return String.Format("/* testFormReference */{0}", 
 				base.GetPostBackFormReference (formId));
 		}

mcs/class/System.Web/Test/TestMonoWeb.J2EE20.sln

@@ -1,6 +1,5 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestMonoWeb20", "TestMonoWeb20.csproj", "{7180B7A7-D0AB-4397-AC0A-CDB1A9DE6417}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NunitWeb20", "mainsoft\NunitWeb\NunitWeb\NunitWeb20.csproj", "{DC2320EB-CC91-4648-AF2B-8937F6794A14}"

mcs/class/System.Web/Test/TestMonoWeb20.csproj

@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7180B7A7-D0AB-4397-AC0A-CDB1A9DE6417}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -16,6 +16,27 @@
     <StartupObject>
     </StartupObject>
     <ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <jarserver>ip2</jarserver>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -97,14 +118,14 @@
   -->
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties REFS-JarPath-rt="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mscorlib.jar" REFS-JarPath-htmlcompare="mainsoft\MainsoftWebTest\bin\Debug_Java\HtmlCompare.jar" REFS-JarPath-nunit-framework="mainsoft\MainsoftWebTest\bin\Debug_Java\nunit.framework.jar" REFS-JarPath-nunitweb="mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\NunitWeb.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.jar" REFS-JarPath-system-configuration="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Configuration.jar" REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Data.jar" REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Drawing.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\jai_imageio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\jai_core.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\jai_codec.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\clibwrapper_jiio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mlibwrapper_jai.jar" REFS-JarPath-system-web="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Web.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Xml.jar" />
+      <UserProperties REFS-RefInfo-j2se-helpers="repository:vmw:framework:2.0" REFS-JarPath-j2se-helpers="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-RefInfo-system-web="repository:vmw:framework:2.0" REFS-RefInfo-nunit-framework="j2il:" REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Xml.jar" REFS-JarPath-system-web="" REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Drawing.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\jai_imageio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\jai_core.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\jai_codec.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\clibwrapper_jiio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mlibwrapper_jai.jar" REFS-JarPath-system-data="" REFS-JarPath-system-configuration="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Configuration.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.jar" REFS-JarPath-nunitweb="mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\NunitWeb.jar" REFS-JarPath-nunit-framework="..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-htmlcompare="mainsoft\MainsoftWebTest\bin\Debug_Java\HtmlCompare.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mscorlib.jar" REFS-JarPath-rt="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" />
     </VisualStudio>
   </ProjectExtensions>
   <ItemGroup>
+    <Reference Include="J2SE.Helpers, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
     <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.dll</HintPath>
@@ -113,13 +134,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data">
-      <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Data.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Web">
-      <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Web.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86" />
     <Reference Include="System.Xml">
       <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll</HintPath>
     </Reference>
@@ -173,7 +190,6 @@
     <Compile Include="System.Web.UI.HtmlControls\HtmlInputButtonTest.cs" />
     <Compile Include="System.Web.UI.HtmlControls\HtmlInputCheckBoxTest.cs" />
     <Compile Include="System.Web.UI.HtmlControls\HtmlInputControlTest.cs">
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="System.Web.UI.HtmlControls\HtmlInputFileTest.cs" />
     <Compile Include="System.Web.UI.HtmlControls\HtmlInputHiddenTest.cs" />
@@ -323,6 +339,7 @@
     </Compile>
     <Compile Include="System.Web.UI.WebControls\TableRowTest.cs" />
     <Compile Include="System.Web.UI.WebControls\TableSectionStyleTest.cs">
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="System.Web.UI.WebControls\TableStyleTest.cs">
       <SubType>Component</SubType>
@@ -358,6 +375,7 @@
     <Compile Include="System.Web.UI\ChtmlTextWriterTest.cs" />
     <Compile Include="System.Web.UI\CleanHtmlTextWriter.cs" />
     <Compile Include="System.Web.UI\ClientScriptManagerTest.cs">
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="System.Web.UI\ControlCollectionTest.cs" />
     <Compile Include="System.Web.UI\ControlTest.cs" />
@@ -424,7 +442,24 @@
       <Name>NunitWeb20</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <ItemGroup>
     <Folder Include="System.Web.Compilation\" />
   </ItemGroup>
-</Project>
+</Project>

mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlCompare20.csproj

@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C3375963-9409-41A1-ADD2-1076F5A90BDE}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -15,6 +15,27 @@
     <StartupObject>
     </StartupObject>
     <ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <jarserver>ip2</jarserver>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,7 +105,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="rt, Version=1.6.65535.65535, Culture=neutral, processorArchitecture=MSIL" />
+    <Reference Include="rt, Version=1.6.0.65535, Culture=neutral, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -109,7 +130,24 @@
     <Content Include="HtmlAgilityPack\readme.txt" />
     <EmbeddedResource Include="nunitweb_config.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-</Project>
+</Project>

mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/NunitWeb20.csproj

@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DC2320EB-CC91-4648-AF2B-8937F6794A14}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -12,10 +12,30 @@
     <JDKName>1.6</JDKName>
     <GHProjectType>1</GHProjectType>
     <Version>2.0</Version>
-    <jarserver>iap2</jarserver>
+    <jarserver>ip2</jarserver>
     <StartupObject>
     </StartupObject>
     <ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -78,18 +98,16 @@
   -->
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties REFS-JarPath-system-xml="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Xml.jar" REFS-JarPath-system-web="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Web.jar" REFS-JarPath-system-runtime-serialization-formatters-soap="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Runtime.Serialization.Formatters.Soap.jar" REFS-JarPath-system-data="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Data.jar" REFS-JarPath-system="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mscorlib.jar" REFS-JarPath-rt="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" REFS-JarPath-system-configuration="C:\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Configuration.jar" />
+      <UserProperties REFS-RefInfo-system-web="repository:vmw:framework:2.0" REFS-RefInfo-rt="repository:jre:sun:1.6.0" REFS-JarPath-system-configuration="C:\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Configuration.jar" REFS-JarPath-rt="" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mscorlib.jar" REFS-JarPath-system="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.jar" REFS-JarPath-system-data="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Data.jar" REFS-JarPath-system-runtime-serialization-formatters-soap="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Runtime.Serialization.Formatters.Soap.jar" REFS-JarPath-system-web="" REFS-JarPath-system-xml="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Xml.jar" />
     </VisualStudio>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="rt, Version=0.0.0.0, Culture=neutral">
-      <Private>False</Private>
-    </Reference>
+    <Reference Include="rt, Version=1.6.0.65535, Culture=neutral, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
-    <Reference Include="System.Web" />
+    <Reference Include="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -129,4 +147,21 @@
     <Compile Include="StandardUrl.cs" />
     <Compile Include="WebTest.cs" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+</Project>