Merge Mono.Web back into System.Web and remove the Mono.Web module

mcs/class/Makefile

@@ -52,7 +52,6 @@ common_dirs := \
 	Mono.Data.Sqlite		\
 	System.Web.ApplicationServices	\
 	System.Web			\
-	Mono.Web			\
 	System.Web.Services		\
 	System.Web			\
 	System.Runtime.Remoting		\
@@ -211,7 +210,7 @@ net_4_0_dirs := \
 	System.Data.Services \
 	System.Json.Microsoft \
 	monodoc
-	
+
 net_4_0_only_dirs := \
 	System.ComponentModel.Composition
 

mcs/class/Mono.Web/Assembly/AssemblyInfo.cs

@@ -1,64 +0,0 @@
-//
-// AssemblyInfo.cs
-//
-// Author:
-//   Marek Habersack ([email protected])
-//
-// (C) 2008 Novell, Inc (http://novell.com/)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Reflection;
-using System.Resources;
-using System.Security;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Web.UI;
-
-// General Information about the System.Web assembly
-
-[assembly: AssemblyVersion (Consts.FxVersion)]
-[assembly: SatelliteContractVersion (Consts.FxVersion)]
-
-[assembly: AssemblyTitle("Mono.Web.dll")]
-[assembly: AssemblyDescription("Mono.Web.dll")]
-[assembly: AssemblyConfiguration("Development version")]
-[assembly: AssemblyCompany("MONO development team")]
-[assembly: AssemblyProduct("MONO CLI")]
-[assembly: AssemblyCopyright("(c) 2008 Various Authors")]
-[assembly: AssemblyTrademark("")]
-[assembly: CLSCompliant(false)]
-[assembly: ComVisible(false)]
-[assembly: AssemblyDefaultAlias("Mono.Web.dll")]
-[assembly: AssemblyInformationalVersion("0.0.0.1")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-[assembly: AllowPartiallyTrustedCallers()]
-[assembly: TagPrefix("System.Web.UI.WebControls", "asp")]
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("../mono.pub")]
-
-#endif

mcs/class/Mono.Web/Assembly/ChangeLog

@@ -1,4 +0,0 @@
-2008-03-01  Marek Habersack  <[email protected]>
-
-	* AssemblyInfo.cs: added
-

mcs/class/Mono.Web/ChangeLog

@@ -1,11 +0,0 @@
-2008-04-14  Raja R Harinath  <[email protected]>
-
-	* Makefile (VALID_PROFILE): New.  Prepare to be invoked in other
-	profiles.
-
-2008-03-01  Marek Habersack  <[email protected]>
-
-	* Mono.Web.dll.sources: added
-
-	* Makefile: added
-

mcs/class/Mono.Web/Makefile

@@ -1,26 +0,0 @@
-thisdir = class/Mono.Web
-SUBDIRS = 
-include ../../build/rules.make
-
-LIBRARY = Mono.Web.dll
-
-NO_TEST = yes
-
-# This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
-ifdef VALID_PROFILE
-
-LIB_MCS_FLAGS = -r:$(corlib) \
-		-r:System.dll \
-		-r:System.Xml.dll \
-		-r:System.Web.dll \
-		-r:System.Configuration.dll
-
-else
-LIBRARY_NAME = dummy-Mono.Web.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
-
-include ../../build/library.make

mcs/class/Mono.Web/Mono.Web-net_2_0.csproj

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D02EAC8D-4C43-48F4-832A-7D9A3C2D07CF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699</NoWarn>
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>Mono.Web</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Mono.Web.Util\ISectionSettingsMapper.cs" />
-    <Compile Include="Mono.Web.Util\MembershipSectionMapper.cs" />
-    <Compile Include="Mono.Web.Util\RoleManagerSectionMapper.cs" />
-    <Compile Include="Mono.Web.Util\SettingsMapping.cs" />
-    <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />
-    <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />
  </ItemGroup>
-  <!-- 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>
-  -->
-  <PropertyGroup>
-    <PreBuildEvent>
-
-    </PreBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
-      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
-      <Name>corlib\corlib-net_2_0</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System\System-net_2_0-2.csproj">
-      <Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
-      <Name>System\System-net_2_0-2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
-      <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
-      <Name>System.XML\System.Xml-net_2_0-1</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Web\System.Web-net_2_0.csproj">
-      <Project>{3AE1BF46-F9C5-4EC2-B95D-C9D9F21F4E08}</Project>
-      <Name>System.Web\System.Web-net_2_0</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_2_0.csproj">
-      <Project>{2695A2F2-2271-423D-8E0D-553DAB84E917}</Project>
-      <Name>System.Configuration\System.Configuration-net_2_0</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-

mcs/class/Mono.Web/Mono.Web-net_4_0.csproj

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{04EE9360-5C89-4849-A14F-B74358595976}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699</NoWarn>
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>Mono.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Mono.Web.Util\ISectionSettingsMapper.cs" />
-    <Compile Include="Mono.Web.Util\MembershipSectionMapper.cs" />
-    <Compile Include="Mono.Web.Util\RoleManagerSectionMapper.cs" />
-    <Compile Include="Mono.Web.Util\SettingsMapping.cs" />
-    <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />
-    <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />
  </ItemGroup>
-  <!-- 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>
-  -->
-  <PropertyGroup>
-    <PreBuildEvent>
-
-    </PreBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
-      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
-      <Name>corlib\corlib-net_4_0</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System\System-net_4_0-2.csproj">
-      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
-      <Name>System\System-net_4_0-2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
-      <Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>
-      <Name>System.XML\System.Xml-net_4_0-1</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Web\System.Web-net_4_0.csproj">
-      <Project>{DF42883E-DAAC-43D8-8074-D48BD4BC1A36}</Project>
-      <Name>System.Web\System.Web-net_4_0</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_0.csproj">
-      <Project>{BC3505BA-1086-45B4-92AC-EB589CC1292F}</Project>
-      <Name>System.Configuration\System.Configuration-net_4_0</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-

mcs/class/Mono.Web/Mono.Web-net_4_5.csproj

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4FCA6281-7800-4198-AE09-89EA51D456EB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699</NoWarn>
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>Mono.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Mono.Web.Util\ISectionSettingsMapper.cs" />
-    <Compile Include="Mono.Web.Util\MembershipSectionMapper.cs" />
-    <Compile Include="Mono.Web.Util\RoleManagerSectionMapper.cs" />
-    <Compile Include="Mono.Web.Util\SettingsMapping.cs" />
-    <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />
-    <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />
  </ItemGroup>
-  <!-- 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>
-  -->
-  <PropertyGroup>
-    <PreBuildEvent>
-
-    </PreBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
-      <Name>corlib\corlib-net_4_5</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
-      <Name>System\System-net_4_5-2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>
-      <Name>System.XML\System.Xml-net_4_5-1</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5.csproj">
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>
-      <Name>System.Web\System.Web-net_4_5</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-

mcs/class/Mono.Web/Mono.Web.dll.sources

@@ -1,10 +0,0 @@
-Assembly/AssemblyInfo.cs
-../../build/common/Consts.cs
-../../build/common/Locale.cs
-../../build/common/MonoTODOAttribute.cs
-Mono.Web.Util/ISectionSettingsMapper.cs
-Mono.Web.Util/MembershipSectionMapper.cs
-Mono.Web.Util/RoleManagerSectionMapper.cs
-Mono.Web.Util/SettingsMapping.cs
-Mono.Web.Util/SettingsMappingManager.cs
-Mono.Web.Util/SettingsMappingWhat.cs

mcs/class/System.Web/Makefile

@@ -14,14 +14,12 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes
 
 WEBSERVICES_DEP := System.Web.Services.dll
 WEBSERVICES_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(WEBSERVICES_DEP))
-MONOWEB_DEP := Mono.Web.dll
-MONOWEB_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(MONOWEB_DEP))
 ifndef NO_SYSTEMCORE_DEP
 SYSTEMCORE_DEP := System.Core.dll
 SYSTEMCORE_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(SYSTEMCORE_DEP))
 endif
-CYCLIC_DEPS := $(WEBSERVICES_DEP) $(MONOWEB_DEP) 
-CYCLIC_DEP_FILES := $(WEBSERVICES_DEP_FILE) $(MONOWEB_DEP_FILE)
+CYCLIC_DEPS := $(WEBSERVICES_DEP)
+CYCLIC_DEP_FILES := $(WEBSERVICES_DEP_FILE)
 endif
 
 RESOURCE_FILES_1= \
@@ -334,11 +332,6 @@ LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP)
 $(build_lib): $(WEBSERVICES_DEP_FILE)
 endif
 
-ifdef MONOWEB_DEP_FILE
-LIB_MCS_FLAGS += -define:MONOWEB_DEP -r:$(MONOWEB_DEP)
-$(build_lib): $(MONOWEB_DEP_FILE)
-endif
-
 ifdef SYSTEMCORE_DEP_FILE
 LIB_MCS_FLAGS += -define:SYSTEMCORE_DEP -r:$(SYSTEMCORE_DEP)
 $(build_lib): $(SYSTEMCORE_DEP_FILE)

mcs/class/System.Web/System.Web-net_2_0.csproj

@@ -1329,11 +1329,6 @@
       <HintPath>System.Web.Services.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Mono.Web.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Mono.Web.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">
       <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>
       <Name>System.Core\System.Core-net_2_0</Name>

mcs/class/System.Web/System.Web.dll.sources

@@ -15,6 +15,14 @@ Assembly/AssemblyInfo.cs
 ../Managed.Windows.Forms/System.Resources/ResXDataNodeHandler.cs
 ../Managed.Windows.Forms/System.Resources/TypeConverterFromResXHandler.cs
 ../Managed.Windows.Forms/System.Resources/ResXFileRef.cs
+
+Mono.Web.Util/ISectionSettingsMapper.cs
+Mono.Web.Util/MembershipSectionMapper.cs
+Mono.Web.Util/RoleManagerSectionMapper.cs
+Mono.Web.Util/SettingsMapping.cs
+Mono.Web.Util/SettingsMappingManager.cs
+Mono.Web.Util/SettingsMappingWhat.cs
+
 System.Web/ApplicationShutdownReason.cs
 System.Web/BeginEventHandler.cs
 System.Web.Caching/AggregateCacheDependency.cs