From: Alexander Köplinger <alex.koeplinger@outlook.com>
Date: Mon, 8 May 2017 22:07:45 +0000 (+0200)
Subject: [bcl] Cleanup outdated csproj/sln files (#4806)
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=f95b3f433c4f154475734ea9d384f62db10696e8;p=mono.git

[bcl] Cleanup outdated csproj/sln files (#4806)

They were either replaced by the autogenerated csproj files
or just completely broken for years.
---

diff --git a/mcs/class/Mainsoft.Configuration/Mainsoft.Configuration.JavaEE.csproj b/mcs/class/Mainsoft.Configuration/Mainsoft.Configuration.JavaEE.csproj
deleted file mode 100644
index b9bd33e36b7..00000000000
--- a/mcs/class/Mainsoft.Configuration/Mainsoft.Configuration.JavaEE.csproj
+++ /dev/null
@@ -1,77 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{05391985-1646-4D19-BDEC-9C4550EB8E90}</ProjectGuid>
-    <ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AssemblyName>Mainsoft.Configuration</AssemblyName>
-    <JDKName>1.4.2</JDKName>
-    <GHProjectType>1</GHProjectType>
-    <Version>2.0</Version>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <RootNamespace>Mainsoft.Configuration</RootNamespace>
-    <jarserver>ip2</jarserver>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug_Java\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;JAVA</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseAddress>4194304</BaseAddress>
-    <SkipValidation>false</SkipValidation>
-    <KeepIntermediate>false</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release_Java\</OutputPath>
-    <DefineConstants>TRACE;JAVA</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseAddress>4194304</BaseAddress>
-    <SkipValidation>false</SkipValidation>
-    <KeepIntermediate>false</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
-  <Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties REFS-JarPath-j2se-helpers="..\lib\J2SE.Helpers.jar" REFS-RefInfo-rt="repository:jre:sun:1.4.2" REFS-JarPath-rt="" REFS-JarPath-system="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system-configuration="" REFS-RefInfo-system-configuration="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-xml="repository:vmw:framework:2.0" />
-    </VisualStudio>
-  </ProjectExtensions>
-  <ItemGroup>
-    <Reference Include="J2SE.Helpers, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\lib\J2SE.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="rt, Version=1.4.2.65535, Culture=neutral, processorArchitecture=MSIL" />
-    <Reference Include="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86" />
-    <Reference Include="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-</Project>
diff --git a/mcs/class/Mainsoft.Configuration/Mainsoft.Configuration.csproj b/mcs/class/Mainsoft.Configuration/Mainsoft.Configuration.csproj
deleted file mode 100644
index 012ff384484..00000000000
--- a/mcs/class/Mainsoft.Configuration/Mainsoft.Configuration.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A384DE21-09A4-4C80-99BC-2F08F9ADBA5C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Mainsoft.Configuration</RootNamespace>
-    <AssemblyName>Mainsoft.Configuration</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Mainsoft.Web.Configuration\MainsoftWebSectionGroup.cs" />
-    <Compile Include="Mainsoft.Web.Configuration\PagesSection.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_3_5.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_3_5.csproj
deleted file mode 100644
index e7b4ffdcbdc..00000000000
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_3_5.csproj
+++ /dev/null
@@ -1,169 +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>{9DEA0C0A-BF6D-4C05-B3C5-1429F70A6FF5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699</NoWarn>
-    <OutputPath>./../../class/lib/net_3_5</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>Microsoft.Build.Engine</AssemblyName>
-    <TargetFrameworkVersion>v3.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_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_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\MonoTODOAttribute.cs" />
-    <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />
-    <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskItem.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskItemGroup.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskPropertyGroup.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\IBuildTask.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.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.Core\System.Core-net_2_0.csproj">
-      <Project>{FBEC45AD-4493-41EA-9BCC-F3F29A08EB9E}</Project>
-      <Name>System.Core\System.Core-net_2_0</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="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5.csproj">
-      <Project>{88FC8C2C-9157-41EB-A47C-981B2205ED7E}</Project>
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5.csproj">
-      <Project>{C3F8A358-9DA1-423C-8466-58AB30893EB0}</Project>
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_3_5.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_3_5.csproj
deleted file mode 100644
index 64d0559bba5..00000000000
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_3_5.csproj
+++ /dev/null
@@ -1,122 +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>{7721C784-CEB1-4817-BF8F-228A94CB124D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699</NoWarn>
-    <OutputPath>bin\Debug\Microsoft.Build.Engine-tests-net_3_5</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>False</NoConfig>
-    
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>Microsoft.Build.Engine_test_net_3_5</AssemblyName>
-    <TargetFrameworkVersion>v3.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_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_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="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />
-    <Compile Include="Test\various\Build.cs" />
-    <Compile Include="Test\various\Conditions.cs" />
-    <Compile Include="Test\various\DefaultTasks.cs" />
-    <Compile Include="Test\various\EvaluationOrder.cs" />
-    <Compile Include="Test\various\Items.cs" />
-    <Compile Include="Test\various\ProjectElement.cs" />
-    <Compile Include="Test\various\Properties.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>
-    <Reference Include="..\lib\net_3_5\nunit.framework.dll" />
-    <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="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_3_5.csproj">
-      <Project>{9DEA0C0A-BF6D-4C05-B3C5-1429F70A6FF5}</Project>
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_3_5</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5.csproj">
-      <Project>{88FC8C2C-9157-41EB-A47C-981B2205ED7E}</Project>
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5.csproj">
-      <Project>{C3F8A358-9DA1-423C-8466-58AB30893EB0}</Project>
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5</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>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/Mono.C5/C5.sln b/mcs/class/Mono.C5/C5.sln
deleted file mode 100644
index f6add3c878a..00000000000
--- a/mcs/class/Mono.C5/C5.sln
+++ /dev/null
@@ -1,150 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C5", "C5\C5.csproj", "{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F} = {6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit", "nunit\nunit.csproj", "{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docNet", "docNet\docNet.csproj", "{42811A81-6A99-4C7A-A6DA-DF104C767B72}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserGuideExamples", "UserGuideExamples\UserGuideExamples.csproj", "{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PreProcess", "PreProcess\PreProcess.csproj", "{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed platforms = Debug|Mixed platforms
-		Debug|Win32 = Debug|Win32
-		DebugSnk|Any CPU = DebugSnk|Any CPU
-		DebugSnk|Mixed platforms = DebugSnk|Mixed platforms
-		DebugSnk|Win32 = DebugSnk|Win32
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed platforms = Release|Mixed platforms
-		Release|Win32 = Release|Win32
-		ReleaseSnk|Any CPU = ReleaseSnk|Any CPU
-		ReleaseSnk|Mixed platforms = ReleaseSnk|Mixed platforms
-		ReleaseSnk|Win32 = ReleaseSnk|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Mixed platforms.Build.0 = Debug|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Win32.Build.0 = Debug|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.DebugSnk|Any CPU.ActiveCfg = DebugSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.DebugSnk|Any CPU.Build.0 = DebugSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.DebugSnk|Mixed platforms.ActiveCfg = DebugSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.DebugSnk|Mixed platforms.Build.0 = DebugSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.DebugSnk|Win32.ActiveCfg = DebugSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.DebugSnk|Win32.Build.0 = DebugSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Mixed platforms.ActiveCfg = Release|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Mixed platforms.Build.0 = Release|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Win32.ActiveCfg = Release|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.ReleaseSnk|Any CPU.ActiveCfg = ReleaseSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.ReleaseSnk|Any CPU.Build.0 = ReleaseSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.ReleaseSnk|Mixed platforms.ActiveCfg = ReleaseSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.ReleaseSnk|Mixed platforms.Build.0 = ReleaseSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.ReleaseSnk|Win32.ActiveCfg = ReleaseSnk|Any CPU
-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.ReleaseSnk|Win32.Build.0 = ReleaseSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Mixed platforms.Build.0 = Debug|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Win32.Build.0 = Debug|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.DebugSnk|Any CPU.ActiveCfg = DebugSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.DebugSnk|Any CPU.Build.0 = DebugSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.DebugSnk|Mixed platforms.ActiveCfg = DebugSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.DebugSnk|Mixed platforms.Build.0 = DebugSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.DebugSnk|Win32.ActiveCfg = DebugSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.DebugSnk|Win32.Build.0 = DebugSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Release|Mixed platforms.ActiveCfg = Release|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Release|Mixed platforms.Build.0 = Release|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Release|Win32.ActiveCfg = Release|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.ReleaseSnk|Any CPU.ActiveCfg = ReleaseSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.ReleaseSnk|Any CPU.Build.0 = ReleaseSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.ReleaseSnk|Mixed platforms.ActiveCfg = ReleaseSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.ReleaseSnk|Mixed platforms.Build.0 = ReleaseSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.ReleaseSnk|Win32.ActiveCfg = ReleaseSnk|Any CPU
-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.ReleaseSnk|Win32.Build.0 = ReleaseSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Mixed platforms.Build.0 = Debug|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Win32.Build.0 = Debug|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.DebugSnk|Any CPU.ActiveCfg = DebugSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.DebugSnk|Any CPU.Build.0 = DebugSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.DebugSnk|Mixed platforms.ActiveCfg = DebugSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.DebugSnk|Mixed platforms.Build.0 = DebugSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.DebugSnk|Win32.ActiveCfg = DebugSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.DebugSnk|Win32.Build.0 = DebugSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Release|Mixed platforms.ActiveCfg = Release|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Release|Mixed platforms.Build.0 = Release|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Release|Win32.ActiveCfg = Release|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.ReleaseSnk|Any CPU.ActiveCfg = ReleaseSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.ReleaseSnk|Any CPU.Build.0 = ReleaseSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.ReleaseSnk|Mixed platforms.ActiveCfg = ReleaseSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.ReleaseSnk|Mixed platforms.Build.0 = ReleaseSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.ReleaseSnk|Win32.ActiveCfg = ReleaseSnk|Any CPU
-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.ReleaseSnk|Win32.Build.0 = ReleaseSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Mixed platforms.Build.0 = Debug|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Win32.Build.0 = Debug|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.DebugSnk|Any CPU.ActiveCfg = DebugSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.DebugSnk|Any CPU.Build.0 = DebugSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.DebugSnk|Mixed platforms.ActiveCfg = DebugSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.DebugSnk|Mixed platforms.Build.0 = DebugSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.DebugSnk|Win32.ActiveCfg = DebugSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.DebugSnk|Win32.Build.0 = DebugSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Mixed platforms.ActiveCfg = Release|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Mixed platforms.Build.0 = Release|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Win32.ActiveCfg = Release|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.ReleaseSnk|Any CPU.ActiveCfg = ReleaseSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.ReleaseSnk|Any CPU.Build.0 = ReleaseSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.ReleaseSnk|Mixed platforms.ActiveCfg = ReleaseSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.ReleaseSnk|Mixed platforms.Build.0 = ReleaseSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.ReleaseSnk|Win32.ActiveCfg = ReleaseSnk|Any CPU
-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.ReleaseSnk|Win32.Build.0 = ReleaseSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Mixed platforms.Build.0 = Debug|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Win32.Build.0 = Debug|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.DebugSnk|Any CPU.ActiveCfg = DebugSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.DebugSnk|Any CPU.Build.0 = DebugSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.DebugSnk|Mixed platforms.ActiveCfg = DebugSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.DebugSnk|Mixed platforms.Build.0 = DebugSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.DebugSnk|Win32.ActiveCfg = DebugSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.DebugSnk|Win32.Build.0 = DebugSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Mixed platforms.ActiveCfg = Release|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Mixed platforms.Build.0 = Release|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Win32.ActiveCfg = Release|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.ReleaseSnk|Any CPU.ActiveCfg = ReleaseSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.ReleaseSnk|Any CPU.Build.0 = ReleaseSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.ReleaseSnk|Mixed platforms.ActiveCfg = ReleaseSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.ReleaseSnk|Mixed platforms.Build.0 = ReleaseSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.ReleaseSnk|Win32.ActiveCfg = ReleaseSnk|Any CPU
-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.ReleaseSnk|Win32.Build.0 = ReleaseSnk|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/class/Mono.C5/C5/.gitattributes b/mcs/class/Mono.C5/C5/.gitattributes
index aedb6007a13..e69de29bb2d 100644
--- a/mcs/class/Mono.C5/C5/.gitattributes
+++ b/mcs/class/Mono.C5/C5/.gitattributes
@@ -1 +0,0 @@
-C5.csproj -crlf
diff --git a/mcs/class/Mono.C5/C5/C5.csproj b/mcs/class/Mono.C5/C5/C5.csproj
deleted file mode 100644
index 111b355dc10..00000000000
--- a/mcs/class/Mono.C5/C5/C5.csproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>C5</RootNamespace>
-    <NoStandardLibraries>false</NoStandardLibraries>
-    <AssemblyName>C5</AssemblyName>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>c5.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugSnk|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\DebugSnk\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;STRONGNAME</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseSnk|AnyCPU' ">
-    <OutputPath>bin\ReleaseSnk\</OutputPath>
-    <DefineConstants>TRACE;STRONGNAME</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="arrays\CircularQueue.cs" />
-    <Compile Include="arrays\HashedArrayList.cs" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Attributes.cs" />
-    <Compile Include="Builtin.cs" />
-    <Compile Include="Comparer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Delegates.cs" />
-    <Compile Include="Enums.cs" />
-    <Compile Include="Exceptions.cs" />
-    <Compile Include="Formatting.cs" />
-    <Compile Include="Hashers.cs" />
-    <Compile Include="Events.cs" />
-    <Compile Include="Collections.cs">
-    </Compile>
-    <Compile Include="Dictionaries.cs">
-    </Compile>
-    <Compile Include="Interfaces.cs">
-    </Compile>
-    <Compile Include="linkedlists\HashedLinkedList.cs" />
-    <Compile Include="Random.cs" />
-    <Compile Include="Records.cs" />
-    <Compile Include="Sorting.cs" />
-    <Compile Include="ViewSupport.cs" />
-    <Compile Include="MappedEnumerators.cs" />
-    <Compile Include="WrappedArray.cs" />
-    <Compile Include="Wrappers.cs">
-    </Compile>
-    <Compile Include="arrays\ArrayList.cs">
-    </Compile>
-    <Compile Include="arrays\SortedArray.cs">
-    </Compile>
-    <Compile Include="hashing\HashBag.cs">
-    </Compile>
-    <Compile Include="hashing\HashDictionary.cs">
-    </Compile>
-    <Compile Include="hashing\HashTable.cs">
-    </Compile>
-    <Compile Include="heaps\IntervalHeap.cs">
-    </Compile>
-    <Compile Include="linkedlists\LinkedList.cs">
-    </Compile>
-    <Compile Include="trees\RedBlackTreeSet.cs">
-    </Compile>
-    <Compile Include="trees\RedBlackTreeBag.cs">
-    </Compile>
-    <Compile Include="trees\RedBlackTreeDictionary.cs">
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>"$(SolutionDir)PreProcess\$(OutDir)PreProcess.exe"</PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/mcs/class/Mono.C5/Test/nunit.csproj b/mcs/class/Mono.C5/Test/nunit.csproj
deleted file mode 100644
index 0d127906913..00000000000
--- a/mcs/class/Mono.C5/Test/nunit.csproj
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <StartupObject>
-    </StartupObject>
-    <RootNamespace>nunit</RootNamespace>
-    <NoStandardLibraries>false</NoStandardLibraries>
-    <AssemblyName>nunit</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>.\bin\Debug\</OutputPath>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <WarningLevel>4</WarningLevel>
-    <IncrementalBuild>false</IncrementalBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>false</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>.\bin\Release\</OutputPath>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <DefineConstants>TRACE</DefineConstants>
-    <WarningLevel>4</WarningLevel>
-    <IncrementalBuild>false</IncrementalBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'DebugSnk' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\DebugSnk\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseSnk' ">
-    <OutputPath>bin\ReleaseSnk\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\C5\C5.csproj">
-      <Project>{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Name>C5</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="arrays\CircularQueueTest.cs" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="BasesTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InterfacesTest.cs" />
-    <Compile Include="Records.cs" />
-    <Compile Include="Sorting.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SupportClasses.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="arrays\ArrayListTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="arrays\HashedArrayListTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="arrays\SortedArrayTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="hashing\HashBagTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="hashing\HashDictionaryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="hashing\HashTableTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="heaps\HeapTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="linkedlists\HashedLinkedListTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="linkedlists\LinkedListTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="templates\Clone.cs" />
-    <Compile Include="templates\Events.cs" />
-    <Compile Include="templates\GenericCollectionTester.cs" />
-    <Compile Include="templates\List.cs" />
-    <Compile Include="trees\Bag.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="trees\Dictionary.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="trees\RedBlackTreeSetTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WrappersTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files\NUnit 2.5.9\bin\net-2.0\framework\nunit.framework.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
diff --git a/mcs/class/Mono.C5/UserGuideExamples/UserGuideExamples.csproj b/mcs/class/Mono.C5/UserGuideExamples/UserGuideExamples.csproj
deleted file mode 100644
index 9d9fac66872..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/UserGuideExamples.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>UserGuideExamples</RootNamespace>
-    <AssemblyName>UserGuideExamples</AssemblyName>
-    <WarningLevel>4</WarningLevel>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>.\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>false</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>.\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugSnk|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\DebugSnk\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseSnk|AnyCPU' ">
-    <OutputPath>bin\ReleaseSnk\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AnagramHashBag.cs" />
-    <Compile Include="Anagrams.cs" />
-    <Compile Include="AnagramStrings.cs" />
-    <Compile Include="AnagramTreeBag.cs" />
-    <None Include="Antipatterns.cs" />
-    <Compile Include="BipartiteMatching.cs" />
-    <Compile Include="Cloning.cs" />
-    <Compile Include="CollectionCollection.cs" />
-    <Compile Include="CollectionSanity.cs" />
-    <Compile Include="EventPatterns.cs" />
-    <Compile Include="GettingStarted.cs" />
-    <Compile Include="Graph.cs" />
-    <Compile Include="Fileindex.cs" />
-    <Compile Include="GCHForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GConvexHull.cs" />
-    <Compile Include="GNfaToDfa.cs" />
-    <Compile Include="HashCodes.cs" />
-    <Compile Include="Jobqueue.cs" />
-    <Compile Include="KeywordRecognition.cs" />
-    <Compile Include="ListPatterns.cs" />
-    <Compile Include="Locking.cs" />
-    <Compile Include="MultiCollection.cs" />
-    <Compile Include="MultiDictionary.cs" />
-    <Compile Include="PointLocation.cs" />
-    <Compile Include="RandomSelection.cs" />
-    <Compile Include="ReadOnlyPatterns.cs" />
-    <Compile Include="Sets.cs" />
-    <Compile Include="SortedIterationPatterns.cs" />
-    <Compile Include="SortingPermutation.cs" />
-    <Compile Include="TestSortedArray.cs" />
-    <Compile Include="ThisFun.cs" />
-    <Compile Include="Toposort.cs" />
-    <Compile Include="TreeTraversal.cs" />
-    <Compile Include="Try.cs" />
-    <Compile Include="ViewPatterns.cs" />
-    <Compile Include="Views.cs" />
-    <Compile Include="WrappedArray.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="GCHForm.resx">
-      <DependentUpon>GCHForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\C5\C5.csproj">
-      <Project>{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Name>C5</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
diff --git a/mcs/class/Mono.C5/doc/docNet.csproj b/mcs/class/Mono.C5/doc/docNet.csproj
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/ComponentModel.csproj b/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/ComponentModel.csproj
deleted file mode 100644
index 82902383d12..00000000000
--- a/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/ComponentModel.csproj
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <ProductVersion>10.0.20729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1BBA5101-D4F0-48B8-A5D6-7B23A099DCE3}</ProjectGuid>
-    <ProjectTypeGuids></ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AssemblyName>System.ComponentModel.Composition.CodePlex</AssemblyName>
-    <RootNamespace>Microsoft.Internal</RootNamespace>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-</PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\build\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CLR40;USE_CODEPLEX_KEY;FEATURE_LEGACYSURFACEAREA;FEATURE_SERIALIZATION;FEATURE_FILEIO;FEATURE_LEGACYCOMPONENTMODEL;FEATURE_CAS_APTCA;FEATURE_SLIMLOCK;FEATURE_MISSINGCONTRACTARGUMENTVALIDATOR;FEATURE_MISSINGREADONLYDICTIONARY;FEATURE_REFLECTIONCONTEXT;FEATURE_CUSTOMREFLECTIONCONTEXT;FEATURE_INTERNAL_REFLECTIONCONTEXT;FEATURE_REFLECTIONONLY;FEATURE_REFLECTIONEMIT;FEATURE_REFLECTIONFILEIO;FEATURE_ADVANCEDREFLECTION;FEATURE_TRACING;FEATURE_OBSERVABLECOLLECTIONS;FEATURE_ADVANCEDCOLLECTIONS;FEATURE_COMINTEROP;FEATURE_APPDOMAINCONTROL;MEF_FEATURE_MVC;MEF_FEATURE_REGISTRATION;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>0414;1570;1572;1573;1591;1699;3021</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\build\ret\</OutputPath>
-    <DefineConstants>TRACE;CLR40;USE_CODEPLEX_KEY;FEATURE_LEGACYSURFACEAREA;FEATURE_SERIALIZATION;FEATURE_FILEIO;FEATURE_LEGACYCOMPONENTMODEL;FEATURE_CAS_APTCA;FEATURE_SLIMLOCK;FEATURE_MISSINGCONTRACTARGUMENTVALIDATOR;FEATURE_MISSINGREADONLYDICTIONARY;FEATURE_REFLECTIONCONTEXT;FEATURE_CUSTOMREFLECTIONCONTEXT;FEATURE_INTERNAL_REFLECTIONCONTEXT;FEATURE_REFLECTIONONLY;FEATURE_REFLECTIONEMIT;FEATURE_REFLECTIONFILEIO;FEATURE_ADVANCEDREFLECTION;FEATURE_TRACING;FEATURE_OBSERVABLECOLLECTIONS;FEATURE_ADVANCEDCOLLECTIONS;FEATURE_COMINTEROP;FEATURE_APPDOMAINCONTROL;MEF_FEATURE_MVC;MEF_FEATURE_REGISTRATION;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>0414;1570;1572;1573;1591;1699;3021</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>CodePlexKey.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-    <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Microsoft\Internal\Assumes.cs" />
-    <Compile Include="Microsoft\Internal\AttributeServices.cs" />
-    <Compile Include="Microsoft\Internal\Collections\CollectionServices.cs" />
-    <Compile Include="Microsoft\Internal\Collections\CollectionServices.CollectionOfObject.cs" />
-    <Compile Include="Microsoft\Internal\Collections\EnumerableCardinality.cs" />
-    <Compile Include="Microsoft\Internal\Collections\WeakReferenceCollection.cs" />
-    <Compile Include="Microsoft\Internal\ContractServices.cs" />
-    <Compile Include="Microsoft\Internal\Assumes.InternalErrorException.cs" />
-    <Compile Include="Microsoft\Internal\GenerationServices.cs" />
-    <Compile Include="Microsoft\Internal\LazyServices.cs" />
-    <Compile Include="Microsoft\Internal\Lock.cs" />
-    <Compile Include="Microsoft\Internal\Lock.Reader.cs" />
-    <Compile Include="Microsoft\Internal\Lock.Writer.cs" />
-    <Compile Include="Microsoft\Internal\Requires.cs" />
-    <Compile Include="Microsoft\Internal\Runtime\Serialization\SerializationServices.cs" />
-    <Compile Include="Microsoft\Internal\StringComparers.cs" />
-    <Compile Include="Microsoft\Internal\ReflectionServices.cs" />
-    <Compile Include="Microsoft\Internal\ReflectionInvoke.cs" />
-    <Compile Include="Strings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Strings.resx</DependentUpon>
-      <CustomToolNamespace>Microsoft.Internal</CustomToolNamespace>
-    </Compile>
-    <Compile Include="ContractAdditions.cs" />
-    <Compile Include="SuppressMessages.cs" />
-    <Compile Include="SuppressMessagesBaselined.cs" />
-    <Compile Include="System\ComponentModel\Composition\AttributedModelServices.cs" />
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedModelDiscovery.cs" />
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedPartCreationInfo.cs" />
-    <Compile Include="System\ComponentModel\Composition\AttributedModel\AttributedExportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\CatalogReflectionContextAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\CompositionExceptionDebuggerProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTrace.cs" />
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceId.cs" />
-    <Compile Include="System\ComponentModel\Composition\ConstraintServices.cs" />
-    <Compile Include="System\ComponentModel\Composition\CompositionContractMismatchException.cs" />
-    <Compile Include="System\ComponentModel\Composition\CompositionError.cs" />
-    <Compile Include="System\ComponentModel\Composition\CompositionResultOfT.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.FactoryExport.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.PartCreatorExport.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.ScopeFactoryExport.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.ScopeManager.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionContainer.CompositionServiceShim.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionLock.cs" />
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\CompositionTraceSource.cs" />
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceWriter.cs" />
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\TraceSourceTraceWriter.cs" />
-    <Compile Include="System\ComponentModel\Composition\Diagnostics\SilverlightTraceWriter.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportSourceImportDefinitionHelpers.cs" />
-    <Compile Include="System\ComponentModel\Composition\ImportCardinalityMismatchExceptionDebuggerProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\FilteredCatalog.DependenciesTraversal.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\FilteredCatalog.DependentsTraversal.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\FilteredCatalog.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\FilteredCatalog.Traversal.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\FilteredCatalog.IComposablePartCatalogTraversal.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ScopingExtensions.cs" />
-    <Compile Include="System\ComponentModel\Composition\InheritedExportAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\ExportServices.DisposableLazy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\AtomicComposition.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\AtomicCompositionExtensions.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionConstants.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionOptions.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogChangeProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartExceptionDebuggerProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionScopeDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionScopeDefinitionDebuggerProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\IPartCreatorImportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\PrimitivesServices.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ExportfactoryCreator.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ExportfactoryCreator.LifetimeContext.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\GenericServices.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\GenericSpecializationPartCreationInfo.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorExportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorParameterImportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\PartCreatorMemberImportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\IAttributedImport.cs" />
-    <Compile Include="System\ComponentModel\Composition\ImportCardinalityMismatchException.cs" />
-    <Compile Include="System\ComponentModel\Composition\ImportManyAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\ErrorBuilder.cs" />
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorDebuggerProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\ExceptionBuilder.cs" />
-    <Compile Include="System\ComponentModel\Composition\ExportCardinalityCheckResult.cs" />
-    <Compile Include="System\ComponentModel\Composition\ExportFactoryOfT.cs" />
-    <Compile Include="System\ComponentModel\Composition\ExportFactoryOfTTMetadata.cs" />
-    <Compile Include="System\ComponentModel\Composition\ExportLifetimeContextOfT.cs" />
-    <Compile Include="System\ComponentModel\Composition\ExportServices.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\AggregateCatalog.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\AggregateExportProvider.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalog.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\AssemblyCatalogDebuggerProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogExport.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExportProvider.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CatalogExtensions.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartCatalogChangeEventArgs.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartCatalogCollection.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ComposablePartExportProvider.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionBatch.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionBatch.SingleExportComposablePart.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionContainer.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionService.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\CompositionServices.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportProvider.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportProvider.GetExportOverrides.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ExportsChangeEventArgs.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.RecompositionManager.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.EngineContext.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.PartManager.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ImportEngine.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\INotifyComposablePartCatalogChanged.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\TypeCatalog.cs" />
-    <Compile Include="System\ComponentModel\Composition\ImportingConstructorAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\IPartImportsSatisfiedNotification.cs" />
-    <Compile Include="System\ComponentModel\Composition\MetadataServices.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePart.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalog.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartCatalogDebuggerProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ComposablePartException.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElement.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementDebuggerProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\CompositionElementExtensions.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ContractBasedImportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\Export.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ExportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ExportedDelegate.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ICompositionElement.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ImportCardinality.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\ImportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\Primitives\SerializableCompositionElement.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\DisposableReflectionComposablePart.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\IReflectionPartCreationInfo.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\LazyMemberInfo.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionImportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionItemType.cs" />
-    <Compile Include="System\ComponentModel\Composition\MetadataViewProvider.cs" />
-    <Compile Include="System\ComponentModel\Composition\MetadataViewImplementationAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\PartCreationPolicyAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\PartMetadataAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\PartNotDiscoverableAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionExtensions.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingParameter.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingItem.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ExportingMember.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportingMember.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ImportType.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePart.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePartDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberExportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMemberImportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionModelServices.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionParameterImportDefinition.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />
-    <Compile Include="System\ComponentModel\Composition\MetadataViewGenerator.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionField.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMember.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionParameter.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionProperty.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionType.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionItem.cs" />
-    <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionMethod.cs" />
-    <Compile Include="System\ComponentModel\Composition\ChangeRejectedException.cs" />
-    <Compile Include="System\ComponentModel\Composition\CompositionException.cs" />
-    <Compile Include="System\ComponentModel\Composition\CompositionErrorId.cs" />
-    <Compile Include="System\ComponentModel\Composition\CompositionResult.cs" />
-    <Compile Include="System\ComponentModel\Composition\ContractNameServices.cs" />
-    <Compile Include="System\ComponentModel\Composition\CreationPolicy.cs" />
-    <Compile Include="System\ComponentModel\Composition\ExportAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\ExportMetadataAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\ICompositionService.cs" />
-    <Compile Include="System\ComponentModel\Composition\ImportAttribute.cs" />
-    <Compile Include="System\ComponentModel\Composition\ImportSource.cs" />
-    <Compile Include="System\ComponentModel\Composition\MetadataAttributeAttribute.cs" />
-    <Compile Include="System\LazyOfTTMetadata.cs" />
-    <Compile Include="PlatformWorkarounds.cs" />
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionary.cs" />
-    <Compile Include="Microsoft\Internal\Collections\ReadOnlyDictionaryDebuggerProxy.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\ApplicationCatalog.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalog.cs" />
-    <Compile Include="System\ComponentModel\Composition\Hosting\DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs" />
-  </ItemGroup>
-
-    <ItemGroup>
-    <Compile Include="VersionInfo.cs" />
-    <None Include="CodePlexKey.snk" />
-  </ItemGroup>
-
-    <ItemGroup>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="mscorlib" />
-  </ItemGroup>
-
-    <ItemGroup>
-    <ProjectReference Include="..\InternalReflectionContext\System.Reflection.Context.csproj">
-      <Project>{0900B66B-65A1-4653-B3FD-C9A7E76297F1}</Project>
-      <Name>System.Reflection.Context.CodePlex</Name>
-    </ProjectReference>
-  </ItemGroup>
-
-    <ItemGroup>
-    <EmbeddedResource Include="Strings.resx">
-      <SubType>Designer</SubType>
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-      <CustomToolNamespace>Microsoft.Internal</CustomToolNamespace>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
diff --git a/mcs/class/System.Data.DataSetExtensions/Test/System.Data.DataSetExtensions.Test.csproj b/mcs/class/System.Data.DataSetExtensions/Test/System.Data.DataSetExtensions.Test.csproj
deleted file mode 100644
index 1bf17323d2c..00000000000
--- a/mcs/class/System.Data.DataSetExtensions/Test/System.Data.DataSetExtensions.Test.csproj
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7C7649EB-F476-4D07-B9DA-896C97148DE8}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Test2</RootNamespace>
-    <AssemblyName>Test2</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="System.Data\DataRowComparerTest.cs" />
-    <Compile Include="System.Data\DataTableExtensionsTest.cs" />
-    <Compile Include="System.Data\EnumerableRowCollectionTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\nunit20\framework\nunit.framework.dll20.J2EE.csproj">
-      <Project>{ACDA29DB-62AB-4AF8-8862-B3B4FC755BBC}</Project>
-      <Name>nunit.framework.dll20.J2EE</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>copy $(ProjectDir)\..\..\..\nunit20\\nunit-console\bin\Debug_Java20\*.dll $(TargetDir)
-copy $(ProjectDir)\..\..\..\nunit20\\nunit-console\bin\Debug_Java20\*.exe $(TargetDir)</PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/mcs/class/System.Data.Services.Client/Client/System.Data.Services.Client.csproj b/mcs/class/System.Data.Services.Client/Client/System.Data.Services.Client.csproj
deleted file mode 100644
index f9a97029fb6..00000000000
--- a/mcs/class/System.Data.Services.Client/Client/System.Data.Services.Client.csproj
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D1567C63-4A0D-4E18-A14E-79699B9BFFFF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>System.Data.Services.Client</RootNamespace>
-    <AssemblyName>System.Data.Services.Client</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TEXTRES_ONLYGETSTRING;ASTORIA_CLIENT;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TEXTRES_ONLYGETSTRING;ASTORIA_CLIENT;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <TextStringResource Include="System.Data.Services.Client.txt">
-      <ResFile>System.Data.Services.Client</ResFile>
-      <Sealed>true</Sealed>
-      <Parameterize>true</Parameterize>
-      <Visibility>internal</Visibility>
-      <GenerateResource>true</GenerateResource>
-      <FullClassName>System.Data.Services.Client.TextRes</FullClassName>
-    </TextStringResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmContentSerializerBase.cs">
-      <Link>System\Data\Services\EpmContentSerializerBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmCustomContentSerializer.cs">
-      <Link>System\Data\Services\EpmCustomContentSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmCustomContentWriterNodeData.cs">
-      <Link>System\Data\Services\EpmCustomContentWriterNodeData.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmSourcePathSegment.cs">
-      <Link>System\Data\Services\EpmSourcePathSegment.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmSourceTree.cs">
-      <Link>System\Data\Services\EpmSourceTree.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmTargetPathSegment.cs">
-      <Link>System\Data\Services\EpmTargetPathSegment.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmTargetTree.cs">
-      <Link>System\Data\Services\EpmTargetTree.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\HttpProcessUtility.cs">
-      <Link>System\Data\Services\HttpProcessUtility.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Parsing\WebConvert.cs">
-      <Link>System\Data\Services\WebConvert.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Providers\EntityPropertyMappingInfo.cs">
-      <Link>System\Data\Services\EntityPropertyMappingInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\XmlConstants.cs">
-      <Link>System\Data\Services\XmlConstants.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyAttributes.cs" />
-    <Compile Include="Parameterized.System.Data.Services.Client.cs" />
-    <Compile Include="System.Data.Services.Client.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\DataServiceExpressionVisitor.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\DataServiceQueryProvider.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\Evaluator.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ExpressionNormalizer.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ExpressionVisitor.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ExpressionWriter.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\FilterQueryOptionExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\InputBinder.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\InputReferenceExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\NavigationPropertySingletonExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\OrderByQueryOptionExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ParameterReplacerVisitor.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\PathBox.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ProjectionAnalyzer.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ProjectionQueryOptionExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ProjectionRewriter.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\QueryComponents.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\QueryOptionExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ReflectionUtil.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ResourceBinder.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ResourceExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ResourceExpressionType.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\ResourceSetExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\SkipQueryOptionExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\TakeQueryOptionExpression.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\TypeSystem.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\UriHelper.cs" />
-    <Compile Include="System\Data\Services\Client\ALinq\UriWriter.cs" />
-    <Compile Include="System\Data\Services\Client\ArraySet.cs" />
-    <Compile Include="System\Data\Services\Client\AtomContentProperty.cs" />
-    <Compile Include="System\Data\Services\Client\AtomDataKind.cs" />
-    <Compile Include="System\Data\Services\Client\AtomEntry.cs" />
-    <Compile Include="System\Data\Services\Client\AtomFeed.cs" />
-    <Compile Include="System\Data\Services\Client\AtomMaterializer.cs" />
-    <Compile Include="System\Data\Services\Client\AtomMaterializerLog.cs" />
-    <Compile Include="System\Data\Services\Client\AtomParser.cs" />
-    <Compile Include="System\Data\Services\Client\BaseAsyncResult.cs" />
-    <Compile Include="System\Data\Services\Client\BatchStream.cs" />
-    <Compile Include="System\Data\Services\Client\BatchStreamState.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\BindingEntityInfo.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\BindingGraph.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\BindingObserver.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\BindingUtils.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\DataServiceCollectionOfT.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\DataServiceEntityAttribute.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\DataServiceSaveChangesEventArgs.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\EntityChangedParams.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\EntityCollectionChangedParams.cs" />
-    <Compile Include="System\Data\Services\Client\Binding\LoadCompletedEventArgs.cs" />
-    <Compile Include="System\Data\Services\Client\ChangesetResponse.cs" />
-    <Compile Include="System\Data\Services\Client\ClientConvert.cs" />
-    <Compile Include="System\Data\Services\Client\ClientType.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceClientException.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceContext.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceEntityAttribute.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceKeyAttribute.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceProtocolVersion.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceQuery.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceQueryContinuation.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceQueryException.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceQueryOfT.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceRequest.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceRequestArgs.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceRequestException.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceRequestOfT.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceResponse.cs" />
-    <Compile Include="System\Data\Services\Client\DataServiceStreamResponse.cs" />
-    <Compile Include="System\Data\Services\Client\Descriptor.cs" />
-    <Compile Include="System\Data\Services\Client\EntityDescriptor.cs" />
-    <Compile Include="System\Data\Services\Client\EntityPropertyMappingAttribute.cs" />
-    <Compile Include="System\Data\Services\Client\EntityStates.cs" />
-    <Compile Include="System\Data\Services\Client\Epm\EpmSyndicationContentSerializer.cs" />
-    <Compile Include="System\Data\Services\Client\Error.cs" />
-    <Compile Include="System\Data\Services\Client\GetReadStreamResult.cs" />
-    <Compile Include="System\Data\Services\Client\HasStreamAttribute.cs" />
-    <Compile Include="System\Data\Services\Client\LinkDescriptor.cs" />
-    <Compile Include="System\Data\Services\Client\MaterializeFromAtom.cs" />
-    <Compile Include="System\Data\Services\Client\MediaEntryAttribute.cs" />
-    <Compile Include="System\Data\Services\Client\MemberAssignmentAnalysis.cs" />
-    <Compile Include="System\Data\Services\Client\MergeOption.cs" />
-    <Compile Include="System\Data\Services\Client\MimeTypePropertyAttribute.cs" />
-    <Compile Include="System\Data\Services\Client\OpenObject.cs" />
-    <Compile Include="System\Data\Services\Client\OpenObjectAttribute.cs" />
-    <Compile Include="System\Data\Services\Client\OperationResponse.cs" />
-    <Compile Include="System\Data\Services\Client\ProjectionPath.cs" />
-    <Compile Include="System\Data\Services\Client\ProjectionPathBuilder.cs" />
-    <Compile Include="System\Data\Services\Client\ProjectionPathSegment.cs" />
-    <Compile Include="System\Data\Services\Client\ProjectionPlan.cs" />
-    <Compile Include="System\Data\Services\Client\ProjectionPlanCompiler.cs" />
-    <Compile Include="System\Data\Services\Client\QueryOperationResponseOfT.cs" />
-    <Compile Include="System\Data\Services\Client\QueryResponse.cs" />
-    <Compile Include="System\Data\Services\Client\QueryResult.cs" />
-    <Compile Include="System\Data\Services\Client\ReadingWritingEntityEventArgs.cs" />
-    <Compile Include="System\Data\Services\Client\ReferenceEqualityComparer.cs" />
-    <Compile Include="System\Data\Services\Client\SaveChangesOptions.cs" />
-    <Compile Include="System\Data\Services\Client\SendingRequestEventArgs.cs" />
-    <Compile Include="System\Data\Services\Client\Util.cs" />
-    <Compile Include="System\Data\Services\Client\WebUtil.cs" />
-    <Compile Include="System\Data\Services\Client\XmlUtil.cs" />
-    <Compile Include="System\Data\Services\Client\Xml\XmlAtomErrorReader.cs" />
-    <Compile Include="System\Data\Services\Client\Xml\XmlWrappingReader.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/System.Data.Services.Client/Client_SL/System.Data.Services.Client_SL.csproj b/mcs/class/System.Data.Services.Client/Client_SL/System.Data.Services.Client_SL.csproj
deleted file mode 100644
index 1621f5d8a75..00000000000
--- a/mcs/class/System.Data.Services.Client/Client_SL/System.Data.Services.Client_SL.csproj
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{289FE6B7-82AC-4D0F-92C7-386B7D6DC231}</ProjectGuid>
-    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>System.Data.Services.Client</RootNamespace>
-    <AssemblyName>System.Data.Services.Client</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TEXTRES_ONLYGETSTRING;ASTORIA_CLIENT;ASTORIA_LIGHT</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <DefineConstants>TRACE;TEXTRES_ONLYGETSTRING;ASTORIA_CLIENT;ASTORIA_LIGHT</DefineConstants>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <TextStringResource Include="System.Data.Services.Client.txt">
-      <ResFile>System.Data.Services.Client</ResFile>
-      <Sealed>true</Sealed>
-      <Parameterize>true</Parameterize>
-      <Visibility>internal</Visibility>
-      <GenerateResource>true</GenerateResource>
-      <FullClassName>System.Data.Services.Client.TextRes</FullClassName>
-    </TextStringResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Net">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Browser" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceQueryContinuation.cs">
-      <Link>System\Data\Services\Client\DataServiceQueryContinuation.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\MemberAssignmentAnalysis.cs">
-      <Link>System\Data\Services\Client\MemberAssignmentAnalysis.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ProjectionPath.cs">
-      <Link>System\Data\Services\Client\ProjectionPath.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ProjectionPathBuilder.cs">
-      <Link>System\Data\Services\Client\ProjectionPathBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ProjectionPathSegment.cs">
-      <Link>System\Data\Services\Client\ProjectionPathSegment.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ProjectionPlan.cs">
-      <Link>System\Data\Services\Client\ProjectionPlan.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ProjectionPlanCompiler.cs">
-      <Link>System\Data\Services\Client\ProjectionPlanCompiler.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ReferenceEqualityComparer.cs">
-      <Link>System\Data\Services\Client\ReferenceEqualityComparer.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ResourceExpression.cs">
-      <Link>System\Data\Services\Client\ResourceExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\HasStreamAttribute.cs">
-      <Link>System\Data\Services\Client\HasStreamAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\MediaEntryAttribute.cs">
-      <Link>System\Data\Services\Client\MediaEntryAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\MimeTypePropertyAttribute.cs">
-      <Link>System\Data\Services\Client\MimeTypePropertyAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ReadingWritingEntityEventArgs.cs">
-      <Link>System\Data\Services\Client\ReadingWritingEntityEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\httpprocessutility.cs">
-      <Link>System\Data\Services\Client\httpprocessutility.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\XmlConstants.cs">
-      <Link>System\Data\Services\Client\XmlConstants.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmContentSerializerBase.cs">
-      <Link>System\Data\Services\Client\Epm\EpmContentSerializerBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmCustomContentSerializer.cs">
-      <Link>System\Data\Services\Client\Epm\EpmCustomContentSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmCustomContentWriterNodeData.cs">
-      <Link>System\Data\Services\Client\Epm\EpmCustomContentWriterNodeData.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmSourceTree.cs">
-      <Link>System\Data\Services\Client\Epm\EpmSourceTree.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmSourcePathSegment.cs">
-      <Link>System\Data\Services\Client\Epm\EpmSourcePathSegment.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmTargetTree.cs">
-      <Link>System\Data\Services\Client\Epm\EpmTargetTree.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Epm\EpmTargetPathSegment.cs">
-      <Link>System\Data\Services\Client\Epm\EpmTargetPathSegment.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Providers\EntityPropertyMappingInfo.cs">
-      <Link>System\Data\Services\Client\Epm\EntityPropertyMappingInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Server\System\Data\Services\Parsing\WebConvert.cs">
-      <Link>System\Data\Services\Client\ALinq\WebConvert.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ReflectionUtil.cs">
-      <Link>System\Data\Services\Client\ReflectionUtil.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\Evaluator.cs">
-      <Link>System\Data\Services\Client\Evaluator.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ExpressionNormalizer.cs">
-      <Link>System\Data\Services\Client\ExpressionNormalizer.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ExpressionVisitor.cs">
-      <Link>System\Data\Services\Client\ExpressionVisitor.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\FilterQueryOptionExpression.cs">
-      <Link>System\Data\Services\Client\FilterQueryOptionExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\InputBinder.cs">
-      <Link>System\Data\Services\Client\InputBinder.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\InputReferenceExpression.cs">
-      <Link>System\Data\Services\Client\InputReferenceExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceKeyAttribute.cs">
-      <Link>System\Data\Services\Client\DataServiceKeyAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceEntityAttribute.cs">
-      <Link>System\Data\Services\Client\DataServiceEntityAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\OrderByQueryOptionExpression.cs">
-      <Link>System\Data\Services\Client\OrderByQueryOptionExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\PathBox.cs">
-      <Link>System\Data\Services\Client\PathBox.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ProjectionRewriter.cs">
-      <Link>System\Data\Services\Client\ProjectionRewriter.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ProjectionAnalyzer.cs">
-      <Link>System\Data\Services\Client\ProjectionAnalyzer.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\QueryOptionExpression.cs">
-      <Link>System\Data\Services\Client\QueryOptionExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ResourceBinder.cs">
-      <Link>System\Data\Services\Client\ResourceBinder.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ResourceExpressionType.cs">
-      <Link>System\Data\Services\Client\ResourceExpressionType.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\NavigationPropertySingletonExpression.cs">
-      <Link>System\Data\Services\Client\NavigationPropertySingletonExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ResourceSetExpression.cs">
-      <Link>System\Data\Services\Client\ResourceSetExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\SkipQueryOptionExpression.cs">
-      <Link>System\Data\Services\Client\SkipQueryOptionExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\TakeQueryOptionExpression.cs">
-      <Link>System\Data\Services\Client\TakeQueryOptionExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ProjectionQueryOptionExpression.cs">
-      <Link>System\Data\Services\Client\ProjectionQueryOptionExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\TypeSystem.cs">
-      <Link>System\Data\Services\Client\TypeSystem.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\UriHelper.cs">
-      <Link>System\Data\Services\Client\UriHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\ExpressionWriter.cs">
-      <Link>System\Data\Services\Client\ExpressionWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\UriWriter.cs">
-      <Link>System\Data\Services\Client\UriWriter.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\QueryComponents.cs">
-      <Link>System\Data\Services\Client\UriTranslateResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\DataServiceExpressionVisitor.cs">
-      <Link>System\Data\Services\Client\DataServiceExpressionVisitor.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ALinq\DataServiceQueryProvider.cs">
-      <Link>System\Data\Services\Client\DataServiceQueryProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ArraySet.cs">
-      <Link>System\Data\Services\Client\ArraySet.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\AtomContentProperty.cs">
-      <Link>System\Data\Services\Client\AtomContentProperty.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\AtomDataKind.cs">
-      <Link>System\Data\Services\Client\AtomDataKind.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\AtomEntry.cs">
-      <Link>System\Data\Services\Client\AtomEntry.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\AtomFeed.cs">
-      <Link>System\Data\Services\Client\AtomFeed.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\AtomMaterializer.cs">
-      <Link>System\Data\Services\Client\AtomMaterializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\AtomMaterializerLog.cs">
-      <Link>System\Data\Services\Client\AtomMaterializerLog.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\AtomParser.cs">
-      <Link>System\Data\Services\Client\AtomParser.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\BaseAsyncResult.cs">
-      <Link>System\Data\Services\Client\BaseAsyncResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\BatchStream.cs">
-      <Link>System\Data\Services\Client\BatchStream.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\BatchStreamState.cs">
-      <Link>System\Data\Services\Client\BatchStreamState.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\LinkDescriptor.cs">
-      <Link>System\Data\Services\Client\LinkDescriptor.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ChangesetResponse.cs">
-      <Link>System\Data\Services\Client\ChangesetResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ClientConvert.cs">
-      <Link>System\Data\Services\Client\ClientConvert.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\ClientType.cs">
-      <Link>System\Data\Services\Client\ClientType.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceQuery.cs">
-      <Link>System\Data\Services\Client\DataServiceQuery.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceClientException.cs">
-      <Link>System\Data\Services\Client\DataServiceClientException.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceQueryException.cs">
-      <Link>System\Data\Services\Client\DataServiceQueryException.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceRequest.cs">
-      <Link>System\Data\Services\Client\DataServiceRequest.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceRequestArgs.cs">
-      <Link>System\Data\Services\Client\DataServiceRequestArgs.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceRequestException.cs">
-      <Link>System\Data\Services\Client\DataServiceRequestException.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceRequestOfT.cs">
-      <Link>System\Data\Services\Client\DataServiceRequestOfT.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceResponse.cs">
-      <Link>System\Data\Services\Client\DataServiceResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceStreamResponse.cs">
-      <Link>System\Data\Services\Client\DataServiceStreamResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Descriptor.cs">
-      <Link>System\Data\Services\Client\Descriptor.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\EntityPropertyMappingAttribute.cs">
-      <Link>System\Data\Services\Client\EntityPropertyMappingAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Epm\EpmSyndicationContentSerializer.cs">
-      <Link>System\Data\Services\Client\Epm\EpmSyndicationContentSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\GetReadStreamResult.cs">
-      <Link>System\Data\Services\Client\GetReadStreamResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\OperationResponse.cs">
-      <Link>System\Data\Services\Client\OperationResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\QueryOperationResponseOfT.cs">
-      <Link>System\Data\Services\Client\QueryOperationResponseOfT.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\QueryResponse.cs">
-      <Link>System\Data\Services\Client\QueryResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Error.cs">
-      <Link>System\Data\Services\Client\Error.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\MaterializeFromAtom.cs">
-      <Link>System\Data\Services\Client\MaterializeFromAtom.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\MergeOption.cs">
-      <Link>System\Data\Services\Client\MergeOption.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\OpenObject.cs">
-      <Link>System\Data\Services\Client\OpenObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\OpenObjectAttribute.cs">
-      <Link>System\Data\Services\Client\OpenObjectAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\QueryResult.cs">
-      <Link>System\Data\Services\Client\QueryAsyncResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\EntityDescriptor.cs">
-      <Link>System\Data\Services\Client\EntityDescriptor.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\EntityStates.cs">
-      <Link>System\Data\Services\Client\EntityStates.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\SaveChangesOptions.cs">
-      <Link>System\Data\Services\Client\SaveChangesOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\SendingRequestEventArgs.cs">
-      <Link>System\Data\Services\Client\SendingRequestEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Util.cs">
-      <Link>System\Data\Services\Client\Util.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceContext.cs">
-      <Link>System\Data\Services\Client\DataServiceContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\DataServiceQueryOfT.cs">
-      <Link>System\Data\Services\Client\DataServiceQueryOfT.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\WebUtil.cs">
-      <Link>System\Data\Services\Client\WebUtil.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\XmlUtil.cs">
-      <Link>System\Data\Services\Client\XmlUtil.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Xml\XmlAtomErrorReader.cs">
-      <Link>System\Data\Services\Client\Xml\XmlAtomErrorReader.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Xml\XmlWrappingReader.cs">
-      <Link>System\Data\Services\Client\Xml\XmlWrappingReader.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\BindingEntityInfo.cs">
-      <Link>System\Data\Services\Client\Binding\BindingEntityInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\BindingGraph.cs">
-      <Link>System\Data\Services\Client\Binding\BindingGraph.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\BindingObserver.cs">
-      <Link>System\Data\Services\Client\Binding\BindingObserver.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\BindingUtils.cs">
-      <Link>System\Data\Services\Client\Binding\BindingUtils.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\DataServiceEntityAttribute.cs">
-      <Link>System\Data\Services\Client\Binding\DataServiceEntityAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\DataServiceSaveChangesEventArgs.cs">
-      <Link>System\Data\Services\Client\Binding\DataServiceSaveChangesEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\EntityChangedParams.cs">
-      <Link>System\Data\Services\Client\Binding\EntityChangedParams.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\EntityCollectionChangedParams.cs">
-      <Link>System\Data\Services\Client\Binding\EntityCollectionChangedParams.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\DataServiceCollectionOfT.cs">
-      <Link>System\Data\Services\Client\Binding\DataServiceCollectionOfT.cs</Link>
-    </Compile>
-    <Compile Include="..\Client\System\Data\Services\Client\Binding\LoadCompletedEventArgs.cs">
-      <Link>System\Data\Services\Client\Binding\LoadCompletedEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="System\Data\Services\Client\HttpStack.cs" />
-    <Compile Include="System\Data\Services\Http\CaseInsensitiveAscii.cs" />
-    <Compile Include="System\Data\Services\Http\ClientHttpWebRequest.cs" />
-    <Compile Include="System\Data\Services\Http\ClientHttpWebResponse.cs" />
-    <Compile Include="System\Data\Services\Http\ClientWebHeaderCollection.cs" />
-    <Compile Include="System\Data\Services\Http\HeaderInfo.cs" />
-    <Compile Include="System\Data\Services\Http\HeaderInfoTable.cs" />
-    <Compile Include="System\Data\Services\Http\HttpHeaderToName.cs" />
-    <Compile Include="System\Data\Services\Http\HttpRequestHeader.cs" />
-    <Compile Include="System\Data\Services\Http\HttpRequestHeaderEnumToName.cs" />
-    <Compile Include="System\Data\Services\Http\HttpStatusCode.cs" />
-    <Compile Include="System\Data\Services\Http\HttpWebRequest.cs" />
-    <Compile Include="System\Data\Services\Http\HttpWebResponse.cs" />
-    <Compile Include="System\Data\Services\Http\NameValueFromDictionary.cs" />
-    <Compile Include="System\Data\Services\Http\ScriptObjectUtility.cs" />
-    <Compile Include="System\Data\Services\Http\ScriptXmlHttpRequest.cs" />
-    <Compile Include="System\Data\Services\Http\ValidationHelper.cs" />
-    <Compile Include="System\Data\Services\Http\WebException.cs" />
-    <Compile Include="System\Data\Services\Http\WebExceptionStatus.cs" />
-    <Compile Include="System\Data\Services\Http\WebHeaderCollection.cs" />
-    <Compile Include="System\Data\Services\Http\WebHeaderCollectionType.cs" />
-    <Compile Include="System\Data\Services\Http\WebParseError.cs" />
-    <Compile Include="System\Data\Services\Http\WebRequest.cs" />
-    <Compile Include="System\Data\Services\Http\WebResponse.cs" />
-    <Compile Include="System\Data\Services\Http\XHRHttpWebRequest.cs" />
-    <Compile Include="System\Data\Services\Http\XHRHttpWebResponse.cs" />
-    <Compile Include="System\Data\Services\Http\XHRWebHeaderCollection.cs" />
-    <Compile Include="System.Data.Services.Client.cs" />
-    <Compile Include="Parameterized.System.Data.Services.Client.cs" />
-    <Compile Include="AssemblyAttributes.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
-  <!-- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -->
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
-        <SilverlightProjectProperties />
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
diff --git a/mcs/class/System.Data.Services.Client/ODataClientLibrary.sln b/mcs/class/System.Data.Services.Client/ODataClientLibrary.sln
deleted file mode 100644
index 07f233de639..00000000000
--- a/mcs/class/System.Data.Services.Client/ODataClientLibrary.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.Services.Client", "Client\System.Data.Services.Client.csproj", "{D1567C63-4A0D-4E18-A14E-79699B9BFFFF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.Services.Client_SL", "Client_SL\System.Data.Services.Client_SL.csproj", "{289FE6B7-82AC-4D0F-92C7-386B7D6DC231}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D1567C63-4A0D-4E18-A14E-79699B9BFFFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1567C63-4A0D-4E18-A14E-79699B9BFFFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1567C63-4A0D-4E18-A14E-79699B9BFFFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1567C63-4A0D-4E18-A14E-79699B9BFFFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{289FE6B7-82AC-4D0F-92C7-386B7D6DC231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{289FE6B7-82AC-4D0F-92C7-386B7D6DC231}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{289FE6B7-82AC-4D0F-92C7-386B7D6DC231}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{289FE6B7-82AC-4D0F-92C7-386B7D6DC231}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/class/System.Drawing/GDIPlusTest.csproj b/mcs/class/System.Drawing/GDIPlusTest.csproj
deleted file mode 100644
index 45f0702e464..00000000000
--- a/mcs/class/System.Drawing/GDIPlusTest.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- MSBuild project for testing GDIPlus functions on Windows -->
-<!-- Output goes to bin\Debug\GDIPlusTest.exe -->
-
-<?xml version="1.0" encoding="iso-8859-1"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
-	 DefaultTargets="Build">
-
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-
-  <PropertyGroup>
-    <DefineConstants>TEST</DefineConstants>
-    <OutputType>Library</OutputType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="nunit.framework" />    
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="Test\System.Drawing\GDIPlusTest.cs" />
-    <Compile Include="System.Drawing\gdipEnums.cs" />
-    <Compile Include="System.Drawing\gdipFunctions.cs" />
-    <Compile Include="System.Drawing\gdipStructs.cs" />
-  </ItemGroup>
-</Project>
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper.csproj b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper.csproj
deleted file mode 100644
index 784b95bf402..00000000000
--- a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper.csproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "DrawingTest"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "DrawingTest"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = "1595"
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = "1595"
-                    Optimize = "true"
-                    OutputPath = "..\bin\Release_Java\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Drawing"
-                    AssemblyName = "System.Drawing"
-                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
-                    Private = "False"
-                />
-                <Reference
-                    Name = "System.Windows.Forms"
-                    AssemblyName = "System.Windows.Forms"
-                    HintPath = "..\..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
-                />
-                <Reference
-                    Name = "Exocortex.DSP.v1"
-                    Project = "{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-                <Reference
-                    Name = "nunit.framework.dll.J2EE"
-                    Project = "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"
-                    Package = "{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "DrawingTest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "PDComparer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj
deleted file mode 100644
index 85b60a24049..00000000000
--- a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj
+++ /dev/null
@@ -1,61 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0E97F734-51B9-497B-9259-B6999FD87BDF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DrawingTest</RootNamespace>
-    <AssemblyName>DrawingTest</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="DrawingTest.cs" />
-    <Compile Include="PDComparer.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Exocortex.DSP\src\Exocortex.DSP20.v1.csproj">
-      <Project>{A9553E24-D07E-44FE-92FB-8C1D3D3C744E}</Project>
-      <Name>Exocortex.DSP20.v1</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP.v1.csproj b/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP.v1.csproj
deleted file mode 100644
index 7c10afb2b67..00000000000
--- a/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP.v1.csproj
+++ /dev/null
@@ -1,135 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "Exocortex.DSP.v1"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "Exocortex.DSP"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "true"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = "doc\Exocortex.DSP.xml"
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "true"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "true"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = "doc\Exocortex.DSP.xml"
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
-                />
-                <Reference
-                    Name = "System.Drawing"
-                    AssemblyName = "System.Drawing"
-                    HintPath = "..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Drawing.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Complex.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ComplexArray.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ComplexF.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ComplexMath.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ComplexStats.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Fourier.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "FourierDirection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj b/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj
deleted file mode 100644
index fd7db0605d0..00000000000
--- a/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A9553E24-D07E-44FE-92FB-8C1D3D3C744E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Exocortex.DSP</RootNamespace>
-    <AssemblyName>Exocortex.DSP.v1</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Complex.cs" />
-    <Compile Include="ComplexArray.cs" />
-    <Compile Include="ComplexF.cs" />
-    <Compile Include="ComplexMath.cs" />
-    <Compile Include="ComplexStats.cs" />
-    <Compile Include="Fourier.cs" />
-    <Compile Include="FourierDirection.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.dotnet.sln b/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.dotnet.sln
deleted file mode 100644
index 165feff5022..00000000000
--- a/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.dotnet.sln
+++ /dev/null
@@ -1,99 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.dotnet", "..\Test.dotnet.csproj", "{DFE29E81-D6A8-45D4-A627-161F462BE767}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exocortex.DSP.v1", "Exocortex.DSP\src\Exocortex.DSP.v1.csproj", "{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawingTestHelper", "DrawingTestHelper\DrawingTestHelper.csproj", "{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll.J2EE", "..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll.J2EE", "..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll.J2EE", "..\..\..\..\nunit20\util\nunit.util.dll.J2EE.vmwcsproj", "{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console.J2EE", "..\..\..\..\nunit20\nunit-console\nunit-console.J2EE.vmwcsproj", "{EE901CF2-A263-471C-AEE2-2400A7105ABE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Debug_Java = Debug_Java
-		Release = Release
-		Release_Java = Release_Java
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{DFE29E81-D6A8-45D4-A627-161F462BE767}.Debug.ActiveCfg = Debug|.NET
-		{DFE29E81-D6A8-45D4-A627-161F462BE767}.Debug.Build.0 = Debug|.NET
-		{DFE29E81-D6A8-45D4-A627-161F462BE767}.Debug_Java.ActiveCfg = Debug|.NET
-		{DFE29E81-D6A8-45D4-A627-161F462BE767}.Debug_Java.Build.0 = Debug|.NET
-		{DFE29E81-D6A8-45D4-A627-161F462BE767}.Release.ActiveCfg = Release|.NET
-		{DFE29E81-D6A8-45D4-A627-161F462BE767}.Release.Build.0 = Release|.NET
-		{DFE29E81-D6A8-45D4-A627-161F462BE767}.Release_Java.ActiveCfg = Release|.NET
-		{DFE29E81-D6A8-45D4-A627-161F462BE767}.Release_Java.Build.0 = Release|.NET
-		{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}.Debug.ActiveCfg = Debug|.NET
-		{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}.Debug.Build.0 = Debug|.NET
-		{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}.Debug_Java.ActiveCfg = Debug|.NET
-		{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}.Debug_Java.Build.0 = Debug|.NET
-		{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}.Release.ActiveCfg = Release|.NET
-		{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}.Release.Build.0 = Release|.NET
-		{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}.Release_Java.ActiveCfg = Release|.NET
-		{1904A41B-D1B8-40E5-ADBB-728DDCF7C816}.Release_Java.Build.0 = Release|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Debug.ActiveCfg = Debug|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Debug.Build.0 = Debug|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Debug_Java.ActiveCfg = Debug|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Debug_Java.Build.0 = Debug|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Release.ActiveCfg = Release|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Release.Build.0 = Release|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Release_Java.ActiveCfg = Release|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Release_Java.Build.0 = Release|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.ActiveCfg = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.Build.0 = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.ActiveCfg = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.Build.0 = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.ActiveCfg = Debug_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.Build.0 = Debug_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.Build.0 = Debug_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release.ActiveCfg = Release_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release.Build.0 = Release_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.ActiveCfg = Release_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.Build.0 = Release_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.ActiveCfg = Debug_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.Build.0 = Debug_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.Build.0 = Debug_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release.ActiveCfg = Release_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release.Build.0 = Release_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.ActiveCfg = Release_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.Build.0 = Release_Java|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.sln b/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.sln
deleted file mode 100644
index 5f472abb958..00000000000
--- a/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.sln
+++ /dev/null
@@ -1,84 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "Exocortex.DSP.v1.J2EE", "Exocortex.DSP\src\Exocortex.DSP.v1.J2EE.vmwcsproj", "{8D602CEF-DC13-48F1-AF0C-F6201A634FD2}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "DrawingTestHelper_java", "DrawingTestHelper\DrawingTestHelper_java.vmwcsproj", "{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "Test", "..\Test.vmwcsproj", "{D92997D0-B8BD-49A8-A7D0-8B6043930A07}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.core.dll.J2EE", "..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit-console.J2EE", "..\..\..\..\nunit20\nunit-console\nunit-console.J2EE.vmwcsproj", "{EE901CF2-A263-471C-AEE2-2400A7105ABE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.util.dll.J2EE", "..\..\..\..\nunit20\util\nunit.util.dll.J2EE.vmwcsproj", "{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Debug_Java = Debug_Java
-		Release_Java = Release_Java
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{8D602CEF-DC13-48F1-AF0C-F6201A634FD2}.Debug.ActiveCfg = Debug|.NET
-		{8D602CEF-DC13-48F1-AF0C-F6201A634FD2}.Debug.Build.0 = Debug|.NET
-		{8D602CEF-DC13-48F1-AF0C-F6201A634FD2}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{8D602CEF-DC13-48F1-AF0C-F6201A634FD2}.Debug_Java.Build.0 = Debug_Java|.NET
-		{8D602CEF-DC13-48F1-AF0C-F6201A634FD2}.Release_Java.ActiveCfg = Release_Java|.NET
-		{8D602CEF-DC13-48F1-AF0C-F6201A634FD2}.Release_Java.Build.0 = Release_Java|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Debug.ActiveCfg = Debug|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Debug.Build.0 = Debug|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Debug_Java.Build.0 = Debug_Java|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Release_Java.ActiveCfg = Release_Java|.NET
-		{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Release_Java.Build.0 = Release_Java|.NET
-		{D92997D0-B8BD-49A8-A7D0-8B6043930A07}.Debug.ActiveCfg = Debug|.NET
-		{D92997D0-B8BD-49A8-A7D0-8B6043930A07}.Debug.Build.0 = Debug|.NET
-		{D92997D0-B8BD-49A8-A7D0-8B6043930A07}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{D92997D0-B8BD-49A8-A7D0-8B6043930A07}.Debug_Java.Build.0 = Debug_Java|.NET
-		{D92997D0-B8BD-49A8-A7D0-8B6043930A07}.Release_Java.ActiveCfg = Release_Java|.NET
-		{D92997D0-B8BD-49A8-A7D0-8B6043930A07}.Release_Java.Build.0 = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.ActiveCfg = Debug|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.Build.0 = Debug|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.Build.0 = Debug_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.ActiveCfg = Release_Java|.NET
-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.Build.0 = Release_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.ActiveCfg = Debug|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.Build.0 = Debug|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.Build.0 = Debug_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.ActiveCfg = Release_Java|.NET
-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.Build.0 = Release_Java|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/class/System.ServiceModel/Test/MetadataTests/ExportUtil.csproj b/mcs/class/System.ServiceModel/Test/MetadataTests/ExportUtil.csproj
deleted file mode 100644
index ad627b8834e..00000000000
--- a/mcs/class/System.ServiceModel/Test/MetadataTests/ExportUtil.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D4C1B0BD-3488-441C-92B9-7E017041E137}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>ExportUtil</RootNamespace>
-    <AssemblyName>ExportUtil</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>True</Externalconsole>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>True</Externalconsole>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Web.Services" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="ExportUtil.cs" />
-    <Compile Include="MetadataSamples.cs" />
-    <Compile Include="TestContext.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
diff --git a/mcs/class/System.ServiceModel/Test/MetadataTests/MetadataTests.csproj b/mcs/class/System.ServiceModel/Test/MetadataTests/MetadataTests.csproj
deleted file mode 100644
index 9c2d92ca3fa..00000000000
--- a/mcs/class/System.ServiceModel/Test/MetadataTests/MetadataTests.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7731D464-5152-4A1B-AACB-6B5A7CA9ACAA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>MetadataTests</RootNamespace>
-    <AssemblyName>MetadataTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;USE_EMBEDDED_METADATA;NET_4_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="nunit.framework" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="BindingTestAssertions.cs" />
-    <Compile Include="MetadataSamples.cs" />
-    <Compile Include="TestContext.cs" />
-    <Compile Include="TestLabel.cs" />
-    <Compile Include="MiscImportTests.cs" />
-    <Compile Include="ImportTests.cs" />
-    <Compile Include="ImportTests_LoadMetadata.cs" />
-    <Compile Include="ImportTests_CreateMetadata.cs" />
-    <Compile Include="ImportTests_RoundTrip.cs" />
-    <Compile Include="ExportTests.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="README.txt" />
-    <None Include="Resources\BasicHttp_Operation.xml" />
-    <None Include="Resources\NetTcp_Operation.xml" />
-    <None Include="Resources\BasicHttp_Config2.config" />
-    <None Include="Resources\BasicHttp_Config2.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\BasicHttp.xml" />
-    <EmbeddedResource Include="Resources\BasicHttp_MessageSecurity.xml" />
-    <EmbeddedResource Include="Resources\BasicHttp_Mtom.xml" />
-    <EmbeddedResource Include="Resources\BasicHttp_NtlmAuth.xml" />
-    <EmbeddedResource Include="Resources\BasicHttp_TransportSecurity.xml" />
-    <EmbeddedResource Include="Resources\BasicHttp_TransportWithMessageCredential.xml" />
-    <EmbeddedResource Include="Resources\BasicHttps.xml" />
-    <EmbeddedResource Include="Resources\BasicHttps_Certificate.xml" />
-    <EmbeddedResource Include="Resources\BasicHttps_NtlmAuth.xml" />
-    <EmbeddedResource Include="Resources\BasicHttps_TransportWithMessageCredential.xml" />
-    <EmbeddedResource Include="Resources\NetTcp.xml" />
-    <EmbeddedResource Include="Resources\NetTcp_MessageSecurity.xml" />
-    <EmbeddedResource Include="Resources\NetTcp_ReliableSession.xml" />
-    <EmbeddedResource Include="Resources\NetTcp_TransferMode.xml" />
-    <EmbeddedResource Include="Resources\NetTcp_TransportSecurity.xml" />
-    <EmbeddedResource Include="Resources\NetTcp_TransportWithMessageCredential.xml" />
-    <EmbeddedResource Include="Resources\http-error.xml" />
-    <EmbeddedResource Include="Resources\BasicHttp_Mtom_EmbeddedPolicy.xml" />
-    <EmbeddedResource Include="Resources\BasicHttp_Config.config" />
-    <EmbeddedResource Include="Resources\BasicHttp_Config.xml" />
-  </ItemGroup>
-</Project>
diff --git a/mcs/class/System.ServiceModel/Test/MetadataTests/MetadataTests.sln b/mcs/class/System.ServiceModel/Test/MetadataTests/MetadataTests.sln
deleted file mode 100644
index 30861792ceb..00000000000
--- a/mcs/class/System.ServiceModel/Test/MetadataTests/MetadataTests.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetadataTests", "MetadataTests.csproj", "{7731D464-5152-4A1B-AACB-6B5A7CA9ACAA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExportUtil", "ExportUtil.csproj", "{D4C1B0BD-3488-441C-92B9-7E017041E137}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7731D464-5152-4A1B-AACB-6B5A7CA9ACAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7731D464-5152-4A1B-AACB-6B5A7CA9ACAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7731D464-5152-4A1B-AACB-6B5A7CA9ACAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7731D464-5152-4A1B-AACB-6B5A7CA9ACAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4C1B0BD-3488-441C-92B9-7E017041E137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4C1B0BD-3488-441C-92B9-7E017041E137}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4C1B0BD-3488-441C-92B9-7E017041E137}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4C1B0BD-3488-441C-92B9-7E017041E137}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = MetadataTests.csproj
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/class/System.ServiceModel/Test/MetadataTests/README.txt b/mcs/class/System.ServiceModel/Test/MetadataTests/README.txt
index a1ed18eaa35..b7469151a1f 100644
--- a/mcs/class/System.ServiceModel/Test/MetadataTests/README.txt
+++ b/mcs/class/System.ServiceModel/Test/MetadataTests/README.txt
@@ -11,8 +11,7 @@ Generating and updating the XML Samples:
 Mono's WsdlExporter is not yet capable of generating the wsdl files that
 are used as test input here.
 
-To generate the XML files, compile the ExportUtil.exe tool either by using the
-ExportUtil.csproj or compiling it manually:
+To generate the XML files, compile the ExportUtil.exe tool:
 
   mcs -r:System.ServiceModel -r:System.Web.Services ExportUtil.cs MetadataSamples.cs TestContext.cs 
 
diff --git a/mcs/class/System.ServiceModel/Test/SwitchMode/SwitchMode.csproj b/mcs/class/System.ServiceModel/Test/SwitchMode/SwitchMode.csproj
deleted file mode 100644
index a320916bf7c..00000000000
--- a/mcs/class/System.ServiceModel/Test/SwitchMode/SwitchMode.csproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{59F7BE17-5E8C-4FA3-BC04-56604E2F00F1}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SwitchMode</RootNamespace>
-    <AssemblyName>SwitchMode</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/System.ServiceModel/Test/WCFServers/WCFServers.csproj b/mcs/class/System.ServiceModel/Test/WCFServers/WCFServers.csproj
deleted file mode 100644
index 693433b6304..00000000000
--- a/mcs/class/System.ServiceModel/Test/WCFServers/WCFServers.csproj
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{88AB909A-C341-4639-B99C-729AC1581E7D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WCFServers</RootNamespace>
-    <AssemblyName>WCFServers</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.ServiceModel">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj">
-      <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
-      <Name>nunit.framework.dll20</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\nunit20\nunit-console\nunit-console20.csproj">
-      <Project>{9367EC89-6A38-42BA-9607-0DC288E4BC3A}</Project>
-      <Name>nunit-console20</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\System.ServiceModel_Test.csproj">
-      <Project>{05A2DAF1-316D-4350-B07B-B73BE591DE57}</Project>
-      <Name>System.ServiceModel_Test</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/System.Web.Extensions/Test/AUT/SystemWebExtensionsAUT.csproj b/mcs/class/System.Web.Extensions/Test/AUT/SystemWebExtensionsAUT.csproj
deleted file mode 100644
index 6662eff2e47..00000000000
--- a/mcs/class/System.Web.Extensions/Test/AUT/SystemWebExtensionsAUT.csproj
+++ /dev/null
@@ -1,658 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4F37CC78-1B9E-46C5-B257-B813E4107D99}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SystemWebExtensionsAUT</RootNamespace>
-    <AssemblyName>SystemWebExtensionsAUT</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.Extensions.Design, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="AjaxClientApp\AjaxScript.aspx" />
-    <Content Include="AjaxClientApp\AjaxScriptComplete.aspx" />
-    <Content Include="AjaxClientApp\HelloWorldService.asmx" />
-    <Content Include="App_Data\Contacts.xml" />
-    <Content Include="App_Data\SurveyQuestions.xml" />
-    <Content Include="ArrayTypeExtensions\ArrayMembersSampleCSharp.aspx" />
-    <Content Include="BooleanTypeExtensions_NotForUse\BooleanParseSampleCSharp.aspx" />
-    <Content Include="CalendarInCalendarOut.aspx" />
-    <Content Include="CancelPostback.js" />
-    <Content Include="ClientEventExample1\ClientEventTest.js" />
-    <Content Include="ClientEventExample1\default.aspx" />
-    <Content Include="ClientEventExample2\default.aspx" />
-    <Content Include="ClientEventExample2\EventSyntax.js" />
-    <Content Include="ClientPageLifecycleEvents.aspx" />
-    <Content Include="CustomEvents2\Default.aspx" />
-    <Content Include="CustomEvents2\Question.js" />
-    <Content Include="CustomEvents2\Section.js" />
-    <Content Include="CustomEvents\Default.aspx" />
-    <Content Include="CustomEvents\Question.js" />
-    <Content Include="CustomEvents\Section.js" />
-    <Content Include="NoScriptManager.aspx" />
-    <Content Include="StopAsynchronousPostback.aspx" />
-    <Content Include="TwoPanelsProgress.aspx" />
-    <Content Include="TwoScriptManagers.aspx" />
-    <Content Include="TwoUpdatePanels.aspx" />
-    <Content Include="UpdateButtonInside.aspx" />
-    <Content Include="UpdateButtonOutside.aspx" />
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ExtenderControlTutorial1\FocusExtender.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IScriptControlTutorial1\SampleTextBox.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LocalizingClientResourcesWalkthrough\ClientVerification.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="System.Web.Configuration\ConfigSectionSample.cs" />
-    <Compile Include="System.Web.Script.Serialization.ScriptIgnoreAttribute\ScriptIgnoreSample.cs" />
-    <Compile Include="System.Web.Script.Serialization.TypeResolver\TypeResolver.cs" />
-    <Compile Include="System.Web.Script.Serialization\ListItemCollectionConverter.cs" />
-    <Compile Include="System.Web.UI.Controls.Timer.Walkthrough2Panels\Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="System.Web.UI.Controls.Timer.Walkthrough2Panels\Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="System.Web.UI.Controls.Timer.Walkthrough\Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="System.Web.UI.Controls.Timer.Walkthrough\Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="System.Web.UI.ScriptReference\customcontrol.cs" />
-    <Compile Include="System.Web.UI.UpdatePanel.ContentTemplate\CustomContentTemplate.cs" />
-    <Compile Include="System.Web.UI.UpdatePanel.CreateContentTemplateContainer\CustomUpdatePanel.cs" />
-    <Compile Include="UpdatePanelTutorialCustom\ProductsView.cs" />
-    <Compile Include="UpdatePanelUserControlTutorial1\Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UpdatePanelUserControlTutorial1\Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="UpdatePanelUserControlTutorial1\EmployeeInfo.ascx.cs">
-      <DependentUpon>EmployeeInfo.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UpdatePanelUserControlTutorial1\EmployeeInfo.ascx.designer.cs">
-      <DependentUpon>EmployeeInfo.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="UpdatePanelUserControlTutorial1\EmployeeList.ascx.cs">
-      <DependentUpon>EmployeeList.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UpdatePanelUserControlTutorial1\EmployeeList.ascx.designer.cs">
-      <DependentUpon>EmployeeList.ascx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="MyAuthenticationService\MyAuthenticationService.asmx" />
-    <Content Include="MyProfileService\MyProfileService.asmx" />
-    <Content Include="NumberTypeExtensions_NotForUse\NumberParseSampleCSharp.aspx" />
-    <Content Include="PageRequestManagerOverview1\images\calendar.gif" />
-    <Content Include="PageRequestManagerOverview1\TicketExampleCS.aspx" />
-    <Content Include="PartialPageRenderingOverview\PartialPageRenderingOverviewCS.aspx" />
-    <Content Include="PartialPageRenderingOverview\PartialPageRenderingOverviewSyntaxCS.aspx" />
-    <Content Include="SampleAJAXApplication\Employees.aspx" />
-    <Content Include="StringBuilder\js\JavaScript\StringBuilderOverviewSample.aspx" />
-    <Content Include="Sys.Application\Default.aspx" />
-    <Content Include="Sys.Application\HighVis.js" />
-    <Content Include="Sys.Application\HoverButton.JS" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Sys.Application\Web.config" />
-    <Content Include="Sys.CultureInfo.CurrentCulture.dateTimeFormat\default.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Sys.CultureInfo.CurrentCulture.dateTimeFormat\web.config" />
-    <Content Include="Sys.CultureInfo.CurrentCulture.numberFormat\default.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Sys.CultureInfo.CurrentCulture.numberFormat\web.config" />
-    <Content Include="Sys.Debug\Default.aspx" />
-    <Content Include="Sys.EventHandlerList\Default.aspx" />
-    <Content Include="Sys.EventHandlerList\HoverButton.js" />
-    <Content Include="Sys.Net.CallWebServiceMethods\CallWebServiceMethods.aspx" />
-    <Content Include="Sys.Net.CallWebServiceMethods\CallWebServiceMethods.js" />
-    <Content Include="Sys.Net.CallWebServiceMethods\WebService.asmx" />
-    <Content Include="Sys.Net.ConnectingEndPoints\ConnectingEndPoints.aspx" />
-    <Content Include="Sys.Net.ConnectingEndPoints\ConnectingEndPoints.js" />
-    <Content Include="Sys.Net.ConnectingEndPoints\getTarget.htm" />
-    <Content Include="Sys.Net.ConnectingEndPoints\postTarget.aspx" />
-    <Content Include="Sys.Net.ErrorHandlingTutorial\WebService.asmx" />
-    <Content Include="Sys.Net.ErrorHandlingTutorial\WebServiceMethodError.aspx" />
-    <Content Include="Sys.Net.ErrorHandlingTutorial\WebServiceMethodError.js" />
-    <Content Include="Sys.Net.ExchangeComplexTypes\default.aspx" />
-    <Content Include="Sys.Net.ExchangeComplexTypes\HandleColor.asmx" />
-    <Content Include="Sys.Net.ExchangeComplexTypes\HandleColor.js" />
-    <Content Include="Sys.Net.JsonSerialization\ClientDeserializeServerSerialize.aspx" />
-    <Content Include="Sys.Net.JsonSerialization\ClientSerializeServerDeserialize.aspx" />
-    <Content Include="Sys.Net.MultipleCallers\multiplecallers.aspx" />
-    <Content Include="Sys.Net.MultipleCallers\WebService.asmx" />
-    <Content Include="Sys.Net.MultipleCallers\WebServiceMultipleCallers.js" />
-    <Content Include="Sys.Net.PageMethod\PageMethod.aspx" />
-    <Content Include="Sys.Net.PageMethod\PageMethod.js" />
-    <Content Include="Sys.Net.PassComplexType\default.aspx" />
-    <Content Include="Sys.Net.PassComplexType\HandleColor.asmx" />
-    <Content Include="Sys.Net.PassComplexType\HandleColor.js" />
-    <Content Include="Sys.Net.ReturnComplexType\default.aspx" />
-    <Content Include="Sys.Net.ReturnComplexType\HandleColor.asmx" />
-    <Content Include="Sys.Net.ReturnComplexType\HandleColor.js" />
-    <Content Include="Sys.Net.ServerSupport\default.aspx" />
-    <Content Include="Sys.Net.ServerSupport\ServerTypes.asmx" />
-    <Content Include="Sys.Net.ServerSupport\ServerTypes.js" />
-    <Content Include="Sys.Net.ServerTime\ServerTime.asmx" />
-    <Content Include="Sys.Net.ServerTime\ServerTime.aspx" />
-    <Content Include="Sys.Net.SimpleWebService\SimpleWebService.asmx" />
-    <Content Include="Sys.Net.SimpleWebService\SimpleWebService.aspx" />
-    <Content Include="Sys.Net.UsingProxyClass\default.aspx" />
-    <Content Include="Sys.Net.UsingProxyClass\UsingProxyClass.asmx" />
-    <Content Include="Sys.Net.UsingProxyClass\UsingProxyClass.js" />
-    <Content Include="Sys.Net.WebRequestManager\getTarget.htm" />
-    <Content Include="Sys.Net.WebRequestManager\WebRequestManager.aspx" />
-    <Content Include="Sys.Net.WebRequestManager\WebRequestManager.js" />
-    <Content Include="Sys.Net.WebRequest\getTarget.htm" />
-    <Content Include="Sys.Net.WebRequest\postTarget.aspx" />
-    <Content Include="Sys.Net.WebRequest\webrequest.aspx" />
-    <Content Include="Sys.Net.WebRequest\WebRequest.js" />
-    <Content Include="Sys.Net.WebServiceGenerics\default.aspx" />
-    <Content Include="Sys.Net.WebServiceGenerics\generics.js" />
-    <Content Include="Sys.Net.WebServiceGenerics\WebService.asmx" />
-    <Content Include="Sys.Net.WebServiceProxy\WebService.asmx" />
-    <Content Include="Sys.Net.WebServiceProxy\WebServiceProxy.aspx" />
-    <Content Include="Sys.Net.WebServiceProxy\WebServiceProxy.js" />
-    <Content Include="Sys.Net.XmlHttpExecutor\getTarget.htm" />
-    <Content Include="Sys.Net.XmlHttpExecutor\getTarget.xml" />
-    <Content Include="Sys.Net.XmlHttpExecutor\XmlHttpExecutor.aspx" />
-    <Content Include="Sys.Net.XmlHttpExecutor\XmlHttpExecutor.js" />
-    <Content Include="Sys.Services.AuthenticationServiceTutorial\Authentication.js" />
-    <Content Include="Sys.Services.AuthenticationServiceTutorial\CreateNewUser.aspx" />
-    <Content Include="Sys.Services.AuthenticationServiceTutorial\login.aspx" />
-    <Content Include="Sys.Services.AuthenticationServiceTutorial\secured\Default.aspx" />
-    <Content Include="Sys.Services.AuthenticationServiceTutorial\secured\Web.config.txt" />
-    <Content Include="Sys.Services.AuthenticationUserControl\Login.aspx" />
-    <Content Include="Sys.Services.AuthenticationUserControl\LoginControl.ascx" />
-    <Content Include="Sys.Services.AuthenticationUserControl\secured\Default.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Sys.Services.AuthenticationUserControl\secured\Web.config" />
-    <Content Include="Sys.Services.ProfileServiceTutorial\login.aspx" />
-    <Content Include="Sys.Services.ProfileServiceTutorial\Profile.js" />
-    <Content Include="Sys.Services.ProfileUserControl\LoginProfileControl.ascx" />
-    <Content Include="Sys.Services.ProfileUserControl\Profile.aspx" />
-    <Content Include="Sys.UI.DomElement\default.aspx" />
-    <Content Include="Sys.UI.DomEvent.addHandlers\default.aspx" />
-    <Content Include="Sys.UI.DomEvent2\default.aspx" />
-    <Content Include="Sys.UI.DomEvent\default.aspx" />
-    <Content Include="Sys.WebForms.EndRequestEventArgs\default.aspx" />
-    <Content Include="Sys.WebForms.PageRequestManager.abortPostBack\PageRequestManager_AbortPostBackCS.aspx" />
-    <Content Include="Sys.WebForms.PageRequestManager.beginRequest\default.aspx" />
-    <Content Include="Sys.WebForms.PageRequestManager.endRequest\default.aspx" />
-    <Content Include="Sys.WebForms.PageRequestManager.initializeRequest\default.aspx" />
-    <Content Include="Sys.WebForms.PageRequestManager.pageLoaded\PageRequestManager_isInAsyncPostBack.aspx" />
-    <Content Include="Sys.WebForms.PageRequestManager.pageLoaded\default.aspx" />
-    <Content Include="System.Web.Configuration\DefaultDummy.aspx" />
-    <Content Include="System.Web.Script.Serialization.ScriptIgnoreAttribute\DefaultDummy.aspx" />
-    <Content Include="System.Web.Script.Serialization.TypeResolver\Default.aspx" />
-    <Content Include="System.Web.Script.Serialization\Default.aspx" />
-    <Content Include="System.Web.Script.Serialization\images\spinner.gif" />
-    <Content Include="System.Web.Script.Services.GenerateScriptTypeAttribute\GenerateScriptTypeSample.asmx" />
-    <Content Include="System.Web.Script.Services.ScriptMethodAttribute\WebService.asmx" />
-    <Content Include="System.Web.Script.Services.ScriptServiceAttribute\ScriptServiceSample.asmx" />
-    <Content Include="System.Web.UI.AsyncPostBackTrigger\AsyncPostBackTriggerCS.aspx" />
-    <Content Include="System.Web.UI.CompareValidator\UpdatePanelWizardValidatorsCS.aspx" />
-    <Content Include="System.Web.UI.Controls.Timer.Interval\Default.aspx" />
-    <Content Include="System.Web.UI.Controls.Timer.Tick\Default.aspx" />
-    <Content Include="System.Web.UI.Controls.Timer.Walkthrough2Panels\Default.aspx" />
-    <Content Include="System.Web.UI.Controls.Timer.Walkthrough\Default.aspx" />
-    <Content Include="System.Web.UI.Controls.Timer\Default.aspx" />
-    <Content Include="System.WEb.UI.PostBackTrigger\PostBackTriggerCS.aspx" />
-    <Content Include="System.Web.UI.ScriptManager.AsyncPostBackErrorMessage\ScriptManager_AsyncPostBackErrorMessageCS.aspx" />
-    <Content Include="System.Web.UI.ScriptManager.EnableScriptGlobalization\default.aspx" />
-    <Content Include="System.Web.UI.ScriptManager.OnAsyncPostBackError\default.aspx" />
-    <Content Include="System.Web.UI.ScriptManager.OnAsyncPostBackError\ErrorHandling.js" />
-    <Content Include="System.Web.UI.ScriptManager.RegisterAsyncPostBackControl\Controls\WebUserControl.ascx" />
-    <Content Include="System.Web.UI.ScriptManager.RegisterAsyncPostBackControl\ScriptManager1CS.aspx" />
-    <Content Include="System.Web.UI.ScriptManager.RegisterAsyncPostBackControl\ScriptManager2CS.aspx" />
-    <Content Include="System.Web.UI.ScriptManager.RegisterClientScriptBlock\App_Data\Contacts.xml" />
-    <Content Include="System.Web.UI.ScriptManager.RegisterClientScriptBlock\ScriptManager_RegisterClientScriptBlockCS.aspx" />
-    <Content Include="System.Web.UI.ScriptManager.RegisterClientScriptInclude\ScriptManager_RegisterClientScriptIncludeCS.aspx" />
-    <Content Include="System.Web.UI.ScriptManager.RegisterClientScriptInclude\scripts\script_alertdiv.js" />
-    <Content Include="System.Web.UI.ScriptManager.RegisterDataItem\ScriptManagerRegisterDataItemCS.aspx" />
-    <Content Include="System.Web.UI.ScriptMode\CustomClient.js" />
-    <Content Include="System.Web.UI.ScriptMode\Default.aspx" />
-    <Content Include="System.Web.UI.ScriptReference.Path\Default.aspx" />
-    <Content Include="System.Web.UI.ScriptReference.Path\scripts\UpdatePanelAnimation.js" />
-    <Content Include="System.Web.UI.ScriptReferenceEventArgs\Default.aspx" />
-    <Content Include="System.Web.UI.ScriptReferenceEventArgs\scripts\CustomScript.js" />
-    <Content Include="System.Web.UI.ScriptReference\Default.aspx" />
-    <EmbeddedResource Include="LocalizingClientResourcesWalkthrough\VerificationResources.it.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="LocalizingClientResourcesWalkthrough\VerificationResources.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="System.Web.UI.ScriptReference\UpdatePanelAnimation.js" />
-    <Content Include="System.Web.UI.UpdatePanel.Constructor\UpdatePanelConstructorCS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel.ContentTemplate\UpdatePanelContentTemplateCS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel.ContentTemplate\UpdatePanelContentTemplateDynamicCS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel.CreateContentTemplateContainer\UpdatePanelCreateContentTemplateContainerCS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel.RenderMode\UpdatePanelRenderModeCS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel.UpdateMode\UpdatePanelUpdateMode2CS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel.UpdateMode\UpdatePanelUpdateMode3CS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel.UpdateMode\UpdatePanelUpdateModeCS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel\UpdatePanelExample1CS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel\UpdatePanelExample2CS.aspx" />
-    <Content Include="System.Web.UI.UpdatePanel\UpdatePanelExample3CS.aspx" />
-    <Content Include="System.Web.UI.UpdateProgress1\default.aspx" />
-    <Content Include="System.Web.UI.UpdateProgress2\default.aspx" />
-    <Content Include="System.Web.UI.UpdateProgress3\default.aspx" />
-    <Content Include="System.Web.UI.UpdateProgress4\default.aspx" />
-    <Content Include="System.Web.UI.UpdateProgress5\default.aspx" />
-    <Content Include="System.Web.UI.ValidationSummary2\WizardValidationSummaryCS.aspx" />
-    <Content Include="System.Web.UI.ValidationSummary\ValidationSummaryCS.aspx" />
-    <Content Include="UpdatePanelApplicationSample1\images\calendar.gif" />
-    <Content Include="UpdatePanelApplicationSample1\UpdatePanel1CS.aspx" />
-    <Content Include="UpdatePanelApplicationSample1\UpdatePanel2CS.aspx" />
-    <Content Include="UpdatePanelApplicationSample1\UpdatePanel3CS.aspx" />
-    <Content Include="UpdatePanelHowTo1\UpdatePanel4CS.aspx" />
-    <Content Include="UpdatePanelHowTo10\ErrorHandlingBasicsCS.aspx" />
-    <Content Include="UpdatePanelHowTo10\ErrorHandlingExampleCS.aspx" />
-    <Content Include="UpdatePanelHowTo1\UpdatePanelHowToNoUpdatePanel.aspx" />
-    <Content Include="UpdatePanelHowTo1\UpdatePanelHowToWithUpdatePanel.aspx" />
-    <Content Include="UpdatePanelHowTo2\Controls\WebUserControl.ascx" />
-    <Content Include="UpdatePanelHowTo2\UpdatePanelHowTo1CS.aspx" />
-    <Content Include="UpdatePanelHowTo2\UpdatePanelHowTo2CS.aspx" />
-    <Content Include="UpdatePanelHowTo3\UpdatePanelContentPage2CS.aspx" />
-    <Content Include="UpdatePanelHowTo3\UpdatePanelContentPage3CS.aspx" />
-    <Content Include="UpdatePanelHowTo3\UpdatePanelContentPageCS.aspx" />
-    <Content Include="UpdatePanelHowTo3\UpdatePanelContentPageDisablePartialRenderingCS.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="UpdatePanelHowTo3\MasterPageCS.master" />
-    <Content Include="UpdatePanelHowTo4\UpdatePanelDynamicallyUpdatedCS1.aspx" />
-    <Content Include="UpdatePanelHowTo4\UpdatePanelDynamicallyUpdatedCS2.aspx" />
-    <Content Include="UpdatePanelHowTo4\UpdatePanelDynamicallyUpdatedCS3.aspx" />
-    <Content Include="UpdatePanelHowTo5\UpdatePanelTriggerBasicsCS.aspx" />
-    <Content Include="UpdatePanelHowTo5\UpdatePanelTriggerExampleCS.aspx" />
-    <Content Include="UpdatePanelHowTo6\SurveyQuestionsExample.aspx" />
-    <Content Include="UpdatePanelHowTo7\NewsHeadLineExampleCS.aspx" />
-    <Content Include="UpdatePanelHowTo7\SimpleExample1CS.aspx" />
-    <Content Include="UpdatePanelHowTo7\SimpleExample2CS.aspx" />
-    <Content Include="UpdatePanelHowTo8\SimpleExample1CS.aspx" />
-    <Content Include="UpdatePanelHowTo8\SimpleExample2CS.aspx" />
-    <Content Include="UpdatePanelHowTo8\SimpleExample3CS.aspx" />
-    <Content Include="UpdatePanelHowTo9\ExclusivePostBackBasicsCS.aspx" />
-    <Content Include="UpdatePanelHowTo9\ExclusivePostBackCS.aspx" />
-    <Content Include="UpdatePanelTechnologyOverview1\UpdatePanelContentPageCS.aspx" />
-    <Content Include="UpdatePanelTechnologyOverview1\UpdatePanelCS.aspx" />
-    <Content Include="UpdatePanelTechnologyOverview1\UpdatePanelNestedCS.aspx" />
-    <Content Include="UpdatePanelTechnologyOverview1\UpdatePanelProgrammaticallyCS.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="UpdatePanelTechnologyOverview1\MasterCS.master" />
-    <Content Include="UpdatePanelTutorial12\default.aspx" />
-    <Content Include="UpdatePanelTutorial13\default.aspx" />
-    <Content Include="UpdatePanelTutorial14\default.aspx" />
-    <Content Include="UpdatePanelTutorial14\ProductQueryScript.js" />
-    <Content Include="UpdatePanelTutorial14\ProductQueryService.asmx" />
-    <Content Include="UpdatePanelTutorial15\default.aspx" />
-    <Content Include="UpdatePanelTutorial15\ProductQueryScript.js" />
-    <Content Include="UpdatePanelTutorial15\ProductQueryService.asmx" />
-    <Content Include="UpdatePanelTutorial16\default.aspx" />
-    <Content Include="UpdatePanelTutorial16\UpdatePanelAnimation.js" />
-    <Content Include="UpdatePanelTutorial17\CancelPostback.js" />
-    <Content Include="UpdatePanelTutorial17\default.aspx" />
-    <Content Include="UpdatePanelTutorial18\default.aspx" />
-    <Content Include="UpdatePanelTutorial18\PostbackPrecedence.js" />
-    <Content Include="UpdatePanelTutorial19\default.aspx" />
-    <Content Include="UpdatePanelTutorial20\default.aspx" />
-    <Content Include="UpdatePanelTutorialChildTriggers\ChildTriggers.aspx" />
-    <Content Include="UpdatePanelTutorialCustom\images\awc_jersey_female_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\awc_jersey_male_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\awc_tee_female_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\awc_tee_male_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\awc_tee_male_yellow_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\bikepump_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\bike_lock_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\bike_shoes_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\bike_shorts_female_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\bike_shorts_male_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\chain_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\chain_lube_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\clipless_pedals_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\co2_4tire_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\double_headlight_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\fork_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\frame_black_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\frame_blue_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\frame_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\frame_red_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\frame_silver_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\frame_yellow_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\handlebar_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\handpump_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\hotrodbike_black_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\hotrodbike_blue_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\hotrodbike_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\hotrodbike_f_silver_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\hotrodbike_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\hotrodbike_red_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\hotrodbike_silver_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\hotrodbike_yellow_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\innertube_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_black_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_blue_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_f_black_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_f_blue_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_f_gold_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_f_green_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_f_red_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_gold_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_green_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_red_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_silver_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\julianax_r_02_yellow_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\mb_shoes_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\mb_tires_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\no_image_available_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\pedal_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer02_black_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer02_black_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer02_blue_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer02_blue_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer02_green_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer02_green_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer02_red_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer02_silver_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer02_yellow_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer_black_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer_blue_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer_red_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer_silver_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\racer_yellow_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_black_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_blue_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_green_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_green_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_purple_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_purple_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_red_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_red_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_silver_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_yellow_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\roadster_yellow_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\saddle_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\shorts_female_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\shorts_male_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\silver_chain_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\silver_pedal_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\silver_sprocket_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\single_headlight_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\sprocket_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\street_tires_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_black_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_black_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_blue_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_blue_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_metalicgreen_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_metalicgreen_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_red_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_red_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_silver_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_silver_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_yellow_f_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\superlight_yellow_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\tail_lights_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\awc_jersey_female_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\awc_jersey_male_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\awc_tee_female_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\awc_tee_male_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\awc_tee_male_yellow_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\bikepump_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\bike_lock_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\bike_shoes_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\bike_shorts_female_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\bike_shorts_male_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\chain_lube_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\chain_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\clipless_pedals_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\co2_4tire_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\double_headlight_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\fork_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\frame_black_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\frame_blue_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\frame_red_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\frame_silver_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\frame_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\frame_yellow_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\handlebar_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\handpump_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\hotrodbike_black_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\hotrodbike_blue_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\hotrodbike_f_silver_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\hotrodbike_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\hotrodbike_red_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\hotrodbike_silver_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\hotrodbike_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\hotrodbike_yellow_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\innertube_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_black_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_blue_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_f_black_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_f_blue_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_f_gold_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_f_green_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_f_red_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_gold_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_green_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_red_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_silver_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\julianax_r_02_yellow_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\mb_shoes_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\mb_tires_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\no_image_available_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\pedal_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer02_black_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer02_black_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer02_blue_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer02_blue_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer02_green_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer02_green_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer02_red_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer02_silver_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer02_yellow_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer_black_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer_blue_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer_red_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer_silver_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\racer_yellow_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_black_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_blue_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_green_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_green_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_purple_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_purple_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_red_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_red_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_silver_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_yellow_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\roadster_yellow_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\saddle_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\shorts_female_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\shorts_male_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\silver_chain_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\silver_pedal_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\silver_sprocket_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\single_headlight_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\sprocket_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\street_tires_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_black_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_black_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_blue_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_blue_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_metalicgreen_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_metalicgreen_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_red_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_red_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_silver_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_silver_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_yellow_f_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\superlight_yellow_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\tail_lights_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\tirepatch_kit_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\water_bottle_cage_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\water_bottle_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\thumbnails\wheel_small.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\tirepatch_kit_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\water_bottle_cage_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\water_bottle_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\images\wheel_large.gif" />
-    <Content Include="UpdatePanelTutorialCustom\ShowProducts.aspx" />
-    <Content Include="UpdatePanelTutorialIntro1\default.aspx" />
-    <Content Include="UpdatePanelTutorialIntro2\default.aspx" />
-    <Content Include="UpdatePanelTutorialIntro3\default.aspx" />
-    <Content Include="UpdatePanelTutorialIntro4\default.aspx" />
-    <Content Include="UpdatePanelTutorialIntro5\default.aspx" />
-    <Content Include="UpdatePanelTutorialIntro8\default.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="UpdatePanelTutorialIntro8\MasterPage.master" />
-    <Content Include="UpdatePanelTutorialIntro9\default.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="UpdatePanelTutorialIntro9\MasterPage.master" />
-    <Content Include="UpdatePanelTutorialNested\NestedPanels.aspx" />
-    <Content Include="UpdatePanelTutorialSibling\DataEntry.aspx" />
-    <Content Include="UpdatePanelUserControlTutorial1\EmployeeInfo.ascx" />
-    <Content Include="UpdatePanelUserControlTutorial1\EmployeeList.ascx" />
-    <Content Include="UpdatePanelWalkthrough1\DeclarativeMarkupCS.aspx" />
-    <Content Include="UpdatePanelWalkthrough1\WizardWithoutUpdatePanelCS.aspx" />
-    <Content Include="UpdatePanelWalkthrough1\WizardWithUpdatePanelCS.aspx" />
-    <Content Include="UpdatePanelWalkthrough2\SearchResultsWithoutUpdatePanelCS.aspx" />
-    <Content Include="UpdatePanelWalkthrough2\SearchResultsWithUpdatePanelCS.aspx" />
-    <Content Include="UpdatePanelWalkthrough2\TriggersDeclarativeMarkupCS.aspx" />
-    <Content Include="UpdatePanelWalkthrough3\DelcarativeContentPageCS.aspx" />
-    <Content Include="UpdatePanelWalkthrough3\NorthwindTradersContentPageCS.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="DynamicScriptReferencesHowTo\DynamicScriptReferences1.aspx" />
-    <Content Include="DynamicScriptReferencesHowTo\DynamicScriptReferences2.aspx" />
-    <EmbeddedResource Include="DynamicScriptReferencesHowTo\Scripts\Scripts.debug.js" />
-    <EmbeddedResource Include="DynamicScriptReferencesHowTo\Scripts\Scripts.js" />
-    <Content Include="EnhancingJavaScript\Enumeration.aspx" />
-    <Content Include="EnhancingJavaScript\Enumeration.js" />
-    <Content Include="EnhancingJavaScript\Inheritance.aspx" />
-    <Content Include="EnhancingJavaScript\Inheritance.js" />
-    <Content Include="EnhancingJavaScript\Interface.aspx" />
-    <Content Include="EnhancingJavaScript\Interface.js" />
-    <Content Include="EnhancingJavaScript\Namespace.aspx" />
-    <Content Include="EnhancingJavaScript\Namespace.js" />
-    <Content Include="EnhancingJavaScript\Reflection.aspx" />
-    <Content Include="ErrorTypeExtensions\ErrorArgumentNullSampleCSharp.aspx" />
-    <Content Include="ErrorTypeExtensions\ErrorCreateSampleCSharp.aspx" />
-    <Content Include="ExtenderControlTutorial1\Default.aspx" />
-    <Content Include="ExtenderControlTutorial1\FocusBehavior.js" />
-    <Content Include="IScriptControlTutorial1\Default.aspx" />
-    <Content Include="IScriptControlTutorial1\SampleTextBox.js" />
-    <EmbeddedResource Include="LocalizingClientResourcesWalkthrough\CheckAnswer.js" />
-    <Content Include="LocalizingClientResourcesWalkthrough\Default.aspx" />
-    <Content Include="LocalizingDateTutorial1\localeFormat.aspx" />
-    <Content Include="UpdatePanelUserControlTutorial1\Default.aspx" />
-    <Content Include="UpdatePanelWalkthrough3\DeclarativeMasterPageCS.master" />
-    <Content Include="UpdatePanelWalkthrough3\NorthwindTradersMasterPageCS.master" />
-    <Content Include="UpdatePanelWalkthrough4\SurveyExampleCS.aspx" />
-    <Content Include="UpdateProgressOverview1\default.aspx" />
-    <Content Include="UpdateProgressOverview2\default.aspx" />
-    <Content Include="UpdateProgressTutorialIntro10\default.aspx" />
-    <Content Include="UpdateProgressTutorialIntro11\default.aspx" />
-    <Content Include="UpdateProgressTutorialIntro6\default.aspx" />
-    <Content Include="UpdateProgressTutorialIntro7\default.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="LocalizingDateTutorial1\web.config" />
-    <Content Include="LocalizingDateTutorial2\localeFormat.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="LocalizingDateTutorial2\web.config" />
-    <Content Include="LocalizingDateTutorial3\localeFormat.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="LocalizingDateTutorial3\web.config" />
-    <Content Include="LocalizingDateTutorial4\localeFormat.aspx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="LocalizingDateTutorial4\web.config" />
-    <Content Include="ResourcesInScriptFile\Default.aspx" />
-    <Content Include="ResourcesInScriptFile\scripts\CheckAnswer.it-IT.js" />
-    <Content Include="ResourcesInScriptFile\scripts\CheckAnswer.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_GlobalResources\" />
-    <Folder Include="Sys.WebForms.PageRequestManager.isInAsyncPostBack\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v8.0\WebApplications\Microsoft.WebApplication.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>0</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost/SystemWebExtensionsAUT</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc.csproj
deleted file mode 100644
index ad38a2c1d2e..00000000000
--- a/mcs/class/System.Web.Mvc3/System.Web.Mvc.csproj
+++ /dev/null
@@ -1,471 +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>{3D3FFD8A-624D-4E9B-954B-E1C105507975}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>System.Web</RootNamespace>
-    <AssemblyName>System.Web.Mvc</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <BaseAddress>1609891840</BaseAddress>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <CodeAnalysisRuleSet>..\FxCopRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <CodeAnalysisRuleSet>..\FxCopRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FxCop|AnyCPU'">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\FxCop\</OutputPath>
-    <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
-    <CodeAnalysisRuleSet>..\FxCopRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CodeCoverage|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\bin\CodeCoverage\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CODE_COVERAGE</DefineConstants>
-    <DebugType>full</DebugType>
-    <CodeAnalysisRuleSet>..\FxCopRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\webpages\ReferenceAssemblies\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.Entity" />
-    <Reference Include="System.Data.Linq" />
-    <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Mvc\AdditionalMetaDataAttribute.cs" />
-    <Compile Include="Mvc\BuildManagerCompiledView.cs" />
-    <Compile Include="Mvc\BuildManagerViewEngine.cs" />
-    <Compile Include="Mvc\CompareAttribute.cs" />
-    <Compile Include="Mvc\ChildActionValueProvider.cs" />
-    <Compile Include="Mvc\ChildActionValueProviderFactory.cs" />
-    <Compile Include="Mvc\DataTypeUtil.cs" />
-    <Compile Include="Mvc\ReflectedAttributeCache.cs" />
-    <Compile Include="Mvc\SessionStateAttribute.cs" />
-    <Compile Include="Mvc\AllowHtmlAttribute.cs" />
-    <Compile Include="Mvc\UnvalidatedRequestValuesAccessor.cs" />
-    <Compile Include="Mvc\UnvalidatedRequestValuesWrapper.cs" />
-    <Compile Include="Mvc\IUnvalidatedRequestValues.cs" />
-    <Compile Include="Mvc\IUnvalidatedValueProvider.cs" />
-    <Compile Include="Mvc\DependencyResolverExtensions.cs" />
-    <Compile Include="Mvc\ExpressionUtil\BinaryExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\CachedExpressionCompiler.cs" />
-    <Compile Include="Mvc\ExpressionUtil\ConditionalExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\ConstantExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\DefaultExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\ExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\ExpressionFingerprintChain.cs" />
-    <Compile Include="Mvc\ExpressionUtil\FingerprintingExpressionVisitor.cs" />
-    <Compile Include="Mvc\ExpressionUtil\HashCodeCombiner.cs" />
-    <Compile Include="Mvc\ExpressionUtil\Hoisted`2.cs" />
-    <Compile Include="Mvc\ExpressionUtil\HoistingExpressionVisitor.cs" />
-    <Compile Include="Mvc\ExpressionUtil\IndexExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\LambdaExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\MemberExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\MethodCallExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\ParameterExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\TypeBinaryExpressionFingerprint.cs" />
-    <Compile Include="Mvc\ExpressionUtil\UnaryExpressionFingerprint.cs" />
-    <Compile Include="Mvc\IControllerActivator.cs" />
-    <Compile Include="Mvc\IModelBinderProvider.cs" />
-    <Compile Include="Mvc\IUniquelyIdentifiable.cs" />
-    <Compile Include="Mvc\IViewStartPageChild.cs" />
-    <Compile Include="Mvc\IResolver.cs" />
-    <Compile Include="Mvc\ControllerInstanceFilterProvider.cs" />
-    <Compile Include="Mvc\ModelClientValidationEqualToRule.cs" />
-    <Compile Include="Mvc\ModelClientValidationRemoteRule.cs" />
-    <Compile Include="Mvc\RazorView.cs" />
-    <Compile Include="Mvc\RazorViewEngine.cs" />
-    <Compile Include="Mvc\DynamicViewDataDictionary.cs" />
-    <Compile Include="Mvc\Filter.cs" />
-    <Compile Include="Mvc\FilterAttributeFilterProvider.cs" />
-    <Compile Include="Mvc\FilterProviderCollection.cs" />
-    <Compile Include="Mvc\FilterProviders.cs" />
-    <Compile Include="Mvc\FilterScope.cs" />
-    <Compile Include="Mvc\GlobalFilterCollection.cs" />
-    <Compile Include="Mvc\GlobalFilters.cs" />
-    <Compile Include="Mvc\IFilterProvider.cs" />
-    <Compile Include="Mvc\IMvcFilter.cs" />
-    <Compile Include="Mvc\IViewPageActivator.cs" />
-    <Compile Include="Mvc\ModelBinderProviderCollection.cs" />
-    <Compile Include="Mvc\ModelBinderProviders.cs" />
-    <Compile Include="Mvc\MultiServiceResolver.cs" />
-    <Compile Include="Mvc\Razor\ModelSpan.cs" />
-    <Compile Include="Mvc\Razor\MvcCSharpRazorCodeParser.cs" />
-    <Compile Include="Mvc\Razor\MvcCSharpRazorCodeGenerator.cs" />
-    <Compile Include="Mvc\MvcFilter.cs" />
-    <Compile Include="Mvc\Razor\MvcVBRazorCodeGenerator.cs" />
-    <Compile Include="Mvc\Razor\MvcVBRazorCodeParser.cs" />
-    <Compile Include="Mvc\Razor\MvcWebPageRazorHost.cs" />
-    <Compile Include="Mvc\MvcWebRazorHostFactory.cs" />
-    <Compile Include="Mvc\PreApplicationStartCode.cs" />
-    <Compile Include="Mvc\RemoteAttribute.cs" />
-    <Compile Include="Mvc\SecurityUtil.cs" />
-    <Compile Include="Mvc\SingleServiceResolver.cs" />
-    <Compile Include="Mvc\Razor\StartPageLookupDelegate.cs" />
-    <Compile Include="Mvc\TagBuilderExtensions.cs" />
-    <Compile Include="Mvc\UrlRewriterHelper.cs" />
-    <Compile Include="Mvc\ViewStartPage.cs" />
-    <Compile Include="Mvc\WebViewPage.cs" />
-    <Compile Include="Mvc\WebViewPage`1.cs" />
-    <Compile Include="Mvc\HttpNotFoundResult.cs" />
-    <Compile Include="Mvc\HttpStatusCodeResult.cs" />
-    <Compile Include="Mvc\IMvcControlBuilder.cs" />
-    <Compile Include="Mvc\AssociatedMetadataProvider.cs" />
-    <Compile Include="Mvc\ActionExecutedContext.cs" />
-    <Compile Include="Mvc\ActionExecutingContext.cs" />
-    <Compile Include="Mvc\ClientDataTypeModelValidatorProvider.cs" />
-    <Compile Include="Mvc\AssociatedValidatorProvider.cs" />
-    <Compile Include="Mvc\Async\ActionDescriptorCreator.cs" />
-    <Compile Include="Mvc\Async\AsyncActionDescriptor.cs" />
-    <Compile Include="Mvc\Async\AsyncActionMethodSelector.cs" />
-    <Compile Include="Mvc\Async\AsyncControllerActionInvoker.cs" />
-    <Compile Include="Mvc\Async\SynchronousOperationException.cs" />
-    <Compile Include="Mvc\Async\AsyncManager.cs" />
-    <Compile Include="Mvc\AsyncTimeoutAttribute.cs" />
-    <Compile Include="Mvc\Async\BeginInvokeDelegate.cs" />
-    <Compile Include="Mvc\Async\AsyncResultWrapper.cs" />
-    <Compile Include="Mvc\Async\AsyncVoid.cs" />
-    <Compile Include="Mvc\AsyncController.cs" />
-    <Compile Include="Mvc\Async\AsyncUtil.cs" />
-    <Compile Include="Mvc\Async\IAsyncController.cs" />
-    <Compile Include="Mvc\Async\IAsyncActionInvoker.cs" />
-    <Compile Include="Mvc\Async\IAsyncManagerContainer.cs" />
-    <Compile Include="Mvc\IClientValidatable.cs" />
-    <Compile Include="Mvc\IMetadataAware.cs" />
-    <Compile Include="Mvc\IDependencyResolver.cs" />
-    <Compile Include="Mvc\JsonValueProviderFactory.cs" />
-    <Compile Include="Mvc\DependencyResolver.cs" />
-    <Compile Include="Mvc\UrlParameter.cs" />
-    <Compile Include="Mvc\FormValueProvider.cs" />
-    <Compile Include="Mvc\FormValueProviderFactory.cs" />
-    <Compile Include="Mvc\HttpFileCollectionValueProvider.cs" />
-    <Compile Include="Mvc\HttpFileCollectionValueProviderFactory.cs" />
-    <Compile Include="Mvc\QueryStringValueProvider.cs" />
-    <Compile Include="Mvc\QueryStringValueProviderFactory.cs" />
-    <Compile Include="Mvc\RangeAttributeAdapter.cs" />
-    <Compile Include="Mvc\RegularExpressionAttributeAdapter.cs" />
-    <Compile Include="Mvc\RequiredAttributeAdapter.cs" />
-    <Compile Include="Mvc\RouteDataValueProvider.cs" />
-    <Compile Include="Mvc\RouteDataValueProviderFactory.cs" />
-    <Compile Include="Mvc\StringLengthAttributeAdapter.cs" />
-    <Compile Include="Mvc\TypeCacheUtil.cs" />
-    <Compile Include="Mvc\TypeCacheSerializer.cs" />
-    <Compile Include="Mvc\Html\DisplayTextExtensions.cs" />
-    <Compile Include="Mvc\NoAsyncTimeoutAttribute.cs" />
-    <Compile Include="Mvc\Async\OperationCounter.cs" />
-    <Compile Include="Mvc\Async\ReflectedAsyncActionDescriptor.cs" />
-    <Compile Include="Mvc\Async\ReflectedAsyncControllerDescriptor.cs" />
-    <Compile Include="Mvc\Async\Trigger.cs" />
-    <Compile Include="Mvc\Async\TriggerListener.cs" />
-    <Compile Include="Mvc\Async\SimpleAsyncResult.cs" />
-    <Compile Include="Mvc\Async\EndInvokeDelegate.cs" />
-    <Compile Include="Mvc\Async\EndInvokeDelegate`1.cs" />
-    <Compile Include="Mvc\Async\SynchronizationContextUtil.cs" />
-    <Compile Include="Mvc\AuthorizationContext.cs" />
-    <Compile Include="Mvc\ByteArrayModelBinder.cs" />
-    <Compile Include="Mvc\ControllerContext.cs" />
-    <Compile Include="Mvc\Html\ChildActionExtensions.cs" />
-    <Compile Include="Mvc\ParameterInfoUtil.cs" />
-    <Compile Include="Mvc\HttpHandlerUtil.cs" />
-    <Compile Include="Mvc\ChildActionOnlyAttribute.cs" />
-    <Compile Include="Mvc\TypeDescriptorHelper.cs" />
-    <Compile Include="Mvc\ValidatableObjectAdapter.cs" />
-    <Compile Include="Mvc\ValueProviderFactories.cs" />
-    <Compile Include="Mvc\ValueProviderFactory.cs" />
-    <Compile Include="Mvc\ValueProviderFactoryCollection.cs" />
-    <Compile Include="Mvc\ValueProviderCollection.cs" />
-    <Compile Include="Mvc\DictionaryValueProvider`1.cs" />
-    <Compile Include="Mvc\NameValueCollectionValueProvider.cs" />
-    <Compile Include="Mvc\ValueProviderUtil.cs" />
-    <Compile Include="Mvc\IValueProvider.cs" />
-    <Compile Include="Mvc\DataErrorInfoModelValidatorProvider.cs" />
-    <Compile Include="Mvc\ModelValidatorProviderCollection.cs" />
-    <Compile Include="Mvc\DataAnnotationsModelMetadata.cs" />
-    <Compile Include="Mvc\HiddenInputAttribute.cs" />
-    <Compile Include="Mvc\HttpGetAttribute.cs" />
-    <Compile Include="Mvc\HttpPutAttribute.cs" />
-    <Compile Include="Mvc\HttpDeleteAttribute.cs" />
-    <Compile Include="Mvc\ModelClientValidationRequiredRule.cs" />
-    <Compile Include="Mvc\ModelClientValidationRangeRule.cs" />
-    <Compile Include="Mvc\ModelClientValidationStringLengthRule.cs" />
-    <Compile Include="Mvc\MvcHtmlString.cs" />
-    <Compile Include="Mvc\DataAnnotationsModelValidator.cs" />
-    <Compile Include="Mvc\DataAnnotationsModelValidatorProvider.cs" />
-    <Compile Include="Mvc\DataAnnotationsModelValidator`1.cs" />
-    <Compile Include="Mvc\EmptyModelValidatorProvider.cs" />
-    <Compile Include="Mvc\ExpressionHelper.cs" />
-    <Compile Include="Mvc\FieldValidationMetadata.cs" />
-    <Compile Include="Mvc\FormContext.cs" />
-    <Compile Include="Mvc\JsonRequestBehavior.cs" />
-    <Compile Include="Mvc\ModelClientValidationRegexRule.cs" />
-    <Compile Include="Mvc\ModelClientValidationRule.cs" />
-    <Compile Include="Mvc\ModelValidationResult.cs" />
-    <Compile Include="Mvc\ModelValidator.cs" />
-    <Compile Include="Mvc\ModelValidatorProvider.cs" />
-    <Compile Include="Mvc\ModelValidatorProviders.cs" />
-    <Compile Include="Mvc\RequireHttpsAttribute.cs" />
-    <Compile Include="Mvc\HttpRequestExtensions.cs" />
-    <Compile Include="Mvc\DataAnnotationsModelMetadataProvider.cs" />
-    <Compile Include="Mvc\EmptyModelMetadataProvider.cs" />
-    <Compile Include="Mvc\ModelMetadata.cs" />
-    <Compile Include="Mvc\ModelMetadataProvider.cs" />
-    <Compile Include="Mvc\ModelMetadataProviders.cs" />
-    <Compile Include="Mvc\AreaHelpers.cs" />
-    <Compile Include="Mvc\AreaRegistration.cs" />
-    <Compile Include="Mvc\AreaRegistrationContext.cs" />
-    <Compile Include="Mvc\Error.cs" />
-    <Compile Include="Mvc\IRouteWithArea.cs" />
-    <Compile Include="Mvc\Async\SingleEntryGate.cs" />
-    <Compile Include="Mvc\Html\PartialExtensions.cs" />
-    <Compile Include="Mvc\LinqBinaryModelBinder.cs" />
-    <Compile Include="Mvc\TryGetValueDelegate.cs" />
-    <Compile Include="Mvc\ViewDataInfo.cs" />
-    <Compile Include="Mvc\Html\DefaultDisplayTemplates.cs" />
-    <Compile Include="Mvc\Html\DefaultEditorTemplates.cs" />
-    <Compile Include="Mvc\Html\DisplayExtensions.cs" />
-    <Compile Include="Mvc\Html\EditorExtensions.cs" />
-    <Compile Include="Mvc\Html\LabelExtensions.cs" />
-    <Compile Include="Mvc\Html\TemplateHelpers.cs" />
-    <Compile Include="Mvc\HttpPostAttribute.cs" />
-    <Compile Include="Mvc\PathHelpers.cs" />
-    <Compile Include="Mvc\ExceptionContext.cs" />
-    <Compile Include="Mvc\ResultExecutedContext.cs" />
-    <Compile Include="Mvc\ResultExecutingContext.cs" />
-    <Compile Include="Mvc\TemplateInfo.cs" />
-    <Compile Include="Mvc\ValidateAntiForgeryTokenAttribute.cs" />
-    <Compile Include="Mvc\JavaScriptResult.cs" />
-    <Compile Include="Mvc\ActionDescriptor.cs" />
-    <Compile Include="Mvc\ActionMethodDispatcher.cs" />
-    <Compile Include="Mvc\ActionMethodSelector.cs" />
-    <Compile Include="Mvc\ActionMethodSelectorAttribute.cs" />
-    <Compile Include="Mvc\ActionNameSelectorAttribute.cs" />
-    <Compile Include="Mvc\AuthorizeAttribute.cs" />
-    <Compile Include="Mvc\Ajax\AjaxOptions.cs" />
-    <Compile Include="Mvc\Ajax\AjaxExtensions.cs" />
-    <Compile Include="Mvc\ActionMethodDispatcherCache.cs" />
-    <Compile Include="Mvc\BindAttribute.cs" />
-    <Compile Include="Mvc\ControllerBase.cs" />
-    <Compile Include="Mvc\ActionNameAttribute.cs" />
-    <Compile Include="Mvc\AcceptVerbsAttribute.cs" />
-    <Compile Include="Mvc\AjaxHelper`1.cs" />
-    <Compile Include="Mvc\HtmlHelper`1.cs" />
-    <Compile Include="Mvc\DictionaryHelpers.cs" />
-    <Compile Include="Mvc\AjaxRequestExtensions.cs" />
-    <Compile Include="Mvc\ModelBinderDictionary.cs" />
-    <Compile Include="Mvc\ValueProviderDictionary.cs" />
-    <Compile Include="Mvc\ViewContext.cs" />
-    <Compile Include="Mvc\ViewMasterPageControlBuilder.cs" />
-    <Compile Include="Mvc\ViewTemplateUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Mvc\ViewTemplateUserControl`1.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Mvc\ViewType.cs" />
-    <Compile Include="Mvc\ViewTypeControlBuilder.cs" />
-    <Compile Include="Mvc\ViewUserControlControlBuilder.cs">
-    </Compile>
-    <Compile Include="Mvc\ViewPageControlBuilder.cs">
-    </Compile>
-    <Compile Include="Mvc\ViewTypeParserFilter.cs" />
-    <Compile Include="Mvc\DefaultViewLocationCache.cs" />
-    <Compile Include="Mvc\FormCollection.cs" />
-    <Compile Include="Mvc\HttpPostedFileBaseModelBinder.cs" />
-    <Compile Include="Mvc\NullViewLocationCache.cs" />
-    <Compile Include="Mvc\ValidateInputAttribute.cs" />
-    <Compile Include="Mvc\FileContentResult.cs" />
-    <Compile Include="Mvc\FilePathResult.cs" />
-    <Compile Include="Mvc\FileResult.cs" />
-    <Compile Include="Mvc\FileStreamResult.cs" />
-    <Compile Include="Mvc\InputType.cs" />
-    <Compile Include="Mvc\ControllerDescriptorCache.cs" />
-    <Compile Include="Mvc\ReflectedParameterBindingInfo.cs" />
-    <Compile Include="Mvc\ParameterBindingInfo.cs" />
-    <Compile Include="Mvc\ReaderWriterCache`2.cs" />
-    <Compile Include="Mvc\DescriptorUtil.cs" />
-    <Compile Include="Mvc\ReflectedControllerDescriptor.cs" />
-    <Compile Include="Mvc\ControllerDescriptor.cs" />
-    <Compile Include="Mvc\ActionSelector.cs" />
-    <Compile Include="Mvc\ReflectedActionDescriptor.cs" />
-    <Compile Include="Mvc\Html\MvcForm.cs" />
-    <Compile Include="Mvc\HttpVerbs.cs" />
-    <Compile Include="Mvc\DefaultModelBinder.cs" />
-    <Compile Include="Mvc\ModelBindingContext.cs" />
-    <Compile Include="Mvc\ParameterDescriptor.cs" />
-    <Compile Include="Mvc\RouteValuesHelpers.cs" />
-    <Compile Include="Mvc\SelectListItem.cs" />
-    <Compile Include="Mvc\ReflectedParameterDescriptor.cs" />
-    <Compile Include="Mvc\ValueProviderResult.cs" />
-    <Compile Include="Mvc\CustomModelBinderAttribute.cs" />
-    <Compile Include="Mvc\FormMethod.cs" />
-    <Compile Include="Mvc\Html\FormExtensions.cs" />
-    <Compile Include="Mvc\Html\InputExtensions.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Mvc\Html\RenderPartialExtensions.cs" />
-    <Compile Include="Mvc\Html\SelectExtensions.cs" />
-    <Compile Include="Mvc\Html\TextAreaExtensions.cs" />
-    <Compile Include="Mvc\Html\ValidationExtensions.cs" />
-    <Compile Include="Mvc\IModelBinder.cs" />
-    <Compile Include="Mvc\Html\LinkExtensions.cs" />
-    <Compile Include="Mvc\ModelBinderAttribute.cs" />
-    <Compile Include="Mvc\ModelBinders.cs" />
-    <Compile Include="Mvc\ModelStateDictionary.cs" />
-    <Compile Include="Mvc\ModelState.cs" />
-    <Compile Include="Mvc\ModelErrorCollection.cs" />
-    <Compile Include="Mvc\ModelError.cs" />
-    <Compile Include="Mvc\Ajax\InsertionMode.cs" />
-    <Compile Include="Mvc\HandleErrorAttribute.cs" />
-    <Compile Include="Mvc\HandleErrorInfo.cs" />
-    <Compile Include="Mvc\HttpUnauthorizedResult.cs" />
-    <Compile Include="Mvc\IActionInvoker.cs" />
-    <Compile Include="Mvc\IView.cs" />
-    <Compile Include="Mvc\IViewLocationCache.cs" />
-    <Compile Include="Mvc\MvcHttpHandler.cs" />
-    <Compile Include="Mvc\PartialViewResult.cs" />
-    <Compile Include="Mvc\SessionStateTempDataProvider.cs" />
-    <Compile Include="Mvc\ITempDataProvider.cs" />
-    <Compile Include="Mvc\OutputCacheAttribute.cs" />
-    <Compile Include="Mvc\FilterInfo.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="Mvc\ActionFilterAttribute.cs" />
-    <Compile Include="Mvc\ActionResult.cs" />
-    <Compile Include="Mvc\AjaxHelper.cs" />
-    <Compile Include="Mvc\BuildManagerWrapper.cs" />
-    <Compile Include="Mvc\Controller.cs" />
-    <Compile Include="Mvc\ControllerActionInvoker.cs" />
-    <Compile Include="Mvc\ControllerBuilder.cs" />
-    <Compile Include="Mvc\ControllerTypeCache.cs" />
-    <Compile Include="Mvc\ContentResult.cs" />
-    <Compile Include="Mvc\FilterAttribute.cs" />
-    <Compile Include="Mvc\IResultFilter.cs" />
-    <Compile Include="Mvc\IExceptionFilter.cs" />
-    <Compile Include="Mvc\IAuthorizationFilter.cs" />
-    <Compile Include="Mvc\JsonResult.cs" />
-    <Compile Include="Mvc\NameValueCollectionExtensions.cs" />
-    <Compile Include="Mvc\ViewDataDictionary`1.cs" />
-    <Compile Include="Mvc\EmptyResult.cs" />
-    <Compile Include="Mvc\MultiSelectList.cs" />
-    <Compile Include="Mvc\RedirectResult.cs" />
-    <Compile Include="Mvc\RedirectToRouteResult.cs" />
-    <Compile Include="Mvc\DefaultControllerFactory.cs" />
-    <Compile Include="Mvc\HtmlHelper.cs" />
-    <Compile Include="Mvc\IActionFilter.cs" />
-    <Compile Include="Mvc\IBuildManager.cs" />
-    <Compile Include="Mvc\IController.cs" />
-    <Compile Include="Mvc\IControllerFactory.cs" />
-    <Compile Include="Mvc\IViewDataContainer.cs" />
-    <Compile Include="Mvc\IViewEngine.cs" />
-    <Compile Include="Mvc\MvcHandler.cs" />
-    <Compile Include="Mvc\MvcRouteHandler.cs" />
-    <Compile Include="Mvc\NonActionAttribute.cs" />
-    <Compile Include="Mvc\RouteCollectionExtensions.cs" />
-    <Compile Include="Mvc\SelectList.cs" />
-    <Compile Include="Mvc\TempDataDictionary.cs" />
-    <Compile Include="Mvc\TypeHelpers.cs" />
-    <Compile Include="Mvc\UrlHelper.cs" />
-    <Compile Include="Mvc\ViewDataDictionary.cs" />
-    <Compile Include="Mvc\ViewEngineCollection.cs" />
-    <Compile Include="Mvc\ViewEngineResult.cs" />
-    <Compile Include="Mvc\ViewEngines.cs" />
-    <Compile Include="Mvc\ViewMasterPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Mvc\ViewMasterPage`1.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Mvc\ViewPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Mvc\ViewPage`1.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Mvc\ViewResult.cs" />
-    <Compile Include="Mvc\ViewResultBase.cs" />
-    <Compile Include="Mvc\ViewUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Mvc\ViewUserControl`1.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Mvc\VirtualPathProviderViewEngine.cs" />
-    <Compile Include="Mvc\WebFormView.cs" />
-    <Compile Include="Mvc\WebFormViewEngine.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Mvc\Resources\MvcResources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>MvcResources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Mvc\Resources\MvcResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>MvcResources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <CodeAnalysisDictionary Include="..\CustomDictionary.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\webpages\src\System.Web.Razor\System.Web.Razor.csproj">
-      <Project>{8F18041B-9410-4C36-A9C5-067813DF5F31}</Project>
-      <Name>System.Web.Razor</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\webpages\src\System.Web.WebPages.Razor\System.Web.WebPages.Razor.csproj">
-      <Project>{0939B11A-FE4E-4BA1-8AD6-D97741EE314F}</Project>
-      <Name>System.Web.WebPages.Razor</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\webpages\src\System.Web.WebPages\System.Web.WebPages.csproj">
-      <Project>{76EFA9C5-8D7E-4FDF-B710-E20F8B6B00D2}</Project>
-      <Name>System.Web.WebPages</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/System.Web.Services/DefaultWsdlHelpGenerator/DefaultWsdlHelpGenerator.csproj b/mcs/class/System.Web.Services/DefaultWsdlHelpGenerator/DefaultWsdlHelpGenerator.csproj
deleted file mode 100644
index 95e59d39eb3..00000000000
--- a/mcs/class/System.Web.Services/DefaultWsdlHelpGenerator/DefaultWsdlHelpGenerator.csproj
+++ /dev/null
@@ -1,182 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20_prepare|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;JAVA</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <SkipValidation>False</SkipValidation>
-    <KeepIntermediate>False</KeepIntermediate>
-    <PreCompile>true</PreCompile>
-    <DeploymentMethod>1</DeploymentMethod>
-    <CompressionLevel>1</CompressionLevel>
-    <UseTestingPage>True</UseTestingPage>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BC1CF9B3-F696-4988-A4D1-E190CB6D2851}</ProjectGuid>
-    <ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AssemblyName>DefaultWsdlHelpGenerator</AssemblyName>
-    <JDKName>1.6</JDKName>
-    <GHProjectType>3</GHProjectType>
-    <GHProjectKind>runtime</GHProjectKind>
-    <Version>2.0</Version>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <RootNamespace>DefaultWsdlHelpGenerator</RootNamespace>
-    <jarserver>ip2</jarserver>
-    <ApplicationServerType>tomcat</ApplicationServerType>
-    <FlatWebApp>true</FlatWebApp>
-    <DeployOnBuild>False</DeployOnBuild>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;JAVA</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <SkipValidation>False</SkipValidation>
-    <KeepIntermediate>False</KeepIntermediate>
-    <PreCompile>true</PreCompile>
-    <DeploymentMethod>1</DeploymentMethod>
-    <CompressionLevel>1</CompressionLevel>
-    <UseTestingPage>True</UseTestingPage>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;JAVA</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseAddress>285212672</BaseAddress>
-    <SkipValidation>False</SkipValidation>
-    <KeepIntermediate>False</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-    <PreCompile>true</PreCompile>
-    <DeploymentMethod>1</DeploymentMethod>
-    <CompressionLevel>1</CompressionLevel>
-    <UseTestingPage>True</UseTestingPage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;JAVA</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseAddress>285212672</BaseAddress>
-    <SkipValidation>False</SkipValidation>
-    <KeepIntermediate>False</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-    <PreCompile>true</PreCompile>
-    <DeploymentMethod>1</DeploymentMethod>
-    <CompressionLevel>1</CompressionLevel>
-    <UseTestingPage>True</UseTestingPage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;JAVA</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <SkipValidation>False</SkipValidation>
-    <KeepIntermediate>False</KeepIntermediate>
-    <PreCompile>true</PreCompile>
-    <DeploymentMethod>1</DeploymentMethod>
-    <CompressionLevel>1</CompressionLevel>
-    <UseTestingPage>True</UseTestingPage>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20_prepare|AnyCPU' ">
-    <OutputPath>bin\</OutputPath>
-    <SkipValidation>False</SkipValidation>
-    <KeepIntermediate>False</KeepIntermediate>
-    <PreCompile>true</PreCompile>
-    <DeploymentMethod>1</DeploymentMethod>
-    <CompressionLevel>1</CompressionLevel>
-    <UseTestingPage>True</UseTestingPage>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;JAVA</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <BaseAddress>285212672</BaseAddress>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="myfaces, Version=1.6.65535.65535, Culture=neutral, processorArchitecture=MSIL" />
-    <Reference Include="rt, Version=1.6.65535.65535, Culture=neutral, processorArchitecture=MSIL" />
-    <Reference Include="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86" />
-    <Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86" />
-    <Reference Include="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="DefaultWsdlHelpGenerator.aspx" />
-    <Content Include="WEB-INF\faces-config.xml" />
-    <Content Include="WEB-INF\web.xml" />
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
-  <Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>2253</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-      <UserProperties REFS-JarPath-system="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system-configuration="" REFS-RefInfo-system-configuration="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-drawing="" REFS-RefInfo-system-drawing="repository:vmw:framework:2.0" REFS-JarPath-system-web="" REFS-RefInfo-system-web="repository:vmw:framework:2.0" REFS-JarPath-system-web-services="" REFS-RefInfo-system-web-services="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-xml="repository:vmw:framework:2.0" REFS-JarPath-mainsoft-web-aspnetconfig="" REFS-RefInfo-mainsoft-web-aspnetconfig="repository:vmw:framework:2.0" REFS-JarPath-myfaces="" REFS-RefInfo-myfaces="repository:vmw:framework:2.0" REFS-JarPath-rt="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" />
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PreBuildEvent>copy ..\..\..\..\..\mono\data\net_2_0\DefaultWsdlHelpGenerator.jvm.aspx ..\DefaultWsdlHelpGenerator.aspx</PreBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/mcs/class/System.Web.Services/Mono.System.Web.Services.csproj b/mcs/class/System.Web.Services/Mono.System.Web.Services.csproj
deleted file mode 100644
index 93597850fa6..00000000000
--- a/mcs/class/System.Web.Services/Mono.System.Web.Services.csproj
+++ /dev/null
@@ -1,901 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.2292"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{1E24995F-861C-4FCB-BE59-C7B518F02F64}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "System.Web.Services"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "System.Web.Servces"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "true"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System.EnterpriseServices"
-                    AssemblyName = "System.EnterpriseServices"
-                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.EnterpriseServices.dll"
-                />
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
-                />
-                <Reference
-                    Name = "System.Web"
-                    AssemblyName = "System.Web"
-                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "ChangeLog"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "list"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "makefile.gnu"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "System.Web.Services.build"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "System.Web.Services\ChangeLog"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "System.Web.Services\TODOAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services\WebMethodAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services\WebService.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services\WebService.resx"
-                    DependentUpon = "WebService.cs"
-                    BuildAction = "EmbeddedResource"
-                />
-                <File
-                    RelPath = "System.Web.Services\WebServiceAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services\WebServiceBindingAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services\WebServicesDescriptionAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Configuration\ChangeLog"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "System.Web.Services.Configuration\XmlFormatExtensionAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Configuration\XmlFormatExtensionPointAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Configuration\XmlFormatExtensionPrefixAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\Binding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\BindingCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ChangeLog"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\DocumentableItem.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\FaultBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\FaultBindingCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\HttpAddressBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\HttpBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\HttpOperationBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\HttpUrlEncodedBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\HttpUrlReplacementBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\Import.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ImportCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\InputBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\Message.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MessageBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MessageCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MessagePart.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MessagePartCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MimeContentBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MimeMultipartRelatedBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MimePart.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MimePartCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MimeTextBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MimeTextMatch.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MimeTextMatchCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\MimeXmlBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\Operation.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationBindingCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationFault.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationFaultCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationFlow.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationInput.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationMessageCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OperationOutput.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\OutputBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\Port.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\PortCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\PortType.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\PortTypeCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ProtocolImporter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ProtocolReflector.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\Service.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceDescription.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceDescriptionBaseCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceDescriptionCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceDescriptionFormatExtension.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceDescriptionImporter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceDescriptionImportStyle.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceDescriptionImportWarnings.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\ServiceDescriptionReflector.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapAddressBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapBindingStyle.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapBindingUse.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapBodyBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapExtensionImporter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapExtensionReflector.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapFaultBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapHeaderBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapHeaderFaultBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapOperationBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapProtocolImporter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapProtocolReflector.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\SoapTransportImporter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Description\Types.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\ChangeLog"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\ContractReference.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\ContractSearchPattern.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryClientDocumentCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryClientProtocol.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryClientReferenceCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryClientResult.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryClientResultCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryDocument.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryDocumentLinksPattern.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryDocumentReference.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryDocumentSearchPattern.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryExceptionDictionary.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryReference.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryReferenceCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoveryRequestHandler.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DiscoverySearchPattern.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\DynamicDiscoveryDocument.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\ExcludePathInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\SchemaReference.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\SoapBinding.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Discovery\XmlSchemaSearchPattern.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\AnyReturnReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\ChangeLog"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\HtmlFormParameterReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\HtmlFormParameterWriter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\HttpGetClientProtocol.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\HttpMethodAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\HttpPostClientProtocol.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\HttpServerProtocol.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\HttpSimpleClientProtocol.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\HttpWebClientProtocol.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\LogicalMethodInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\LogicalMethodTypes.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\MatchAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\MimeFormatter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\MimeParameterReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\MimeParameterWriter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\MimeReturnReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\MimeReturnWriter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\NopReturnReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\PatternMatcher.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\ServerProtocol.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapClientMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapClientMethod.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapDocumentMethodAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapDocumentServiceAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapException.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapExtension.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapExtensionAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapHeader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapHeaderAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapHeaderCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapHeaderDirection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapHeaderException.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapHttpClientProtocol.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapMessageStage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapParameterStyle.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapRpcMethodAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapRpcServiceAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapServerMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapServerProtocol.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapServiceRoutingStyle.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\SoapUnknownHeader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\TextReturnReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\UrlEncodedParameterWriter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\UrlParameterReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\UrlParameterWriter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\ValueCollectionParameterReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\WebClientAsyncResult.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\WebClientProtocol.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\WebServiceHandler.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\WebServiceHandlerFactory.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\XmlReturnReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Web.Services.Protocols\XmlReturnWriter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/mcs/class/System.Web/System.Web.Phantom/System.Web.Phantom.csproj b/mcs/class/System.Web/System.Web.Phantom/System.Web.Phantom.csproj
deleted file mode 100644
index 089d12b822d..00000000000
--- a/mcs/class/System.Web/System.Web.Phantom/System.Web.Phantom.csproj
+++ /dev/null
@@ -1,79 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{FBFDAD51-74B6-4660-81C0-9C8B6C8D3B47}</ProjectGuid>
-    <ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AssemblyName>System.Web.Phantom</AssemblyName>
-    <JDKName>1.6</JDKName>
-    <GHProjectType>1</GHProjectType>
-    <Version>2.0</Version>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <RootNamespace>System.Web.Phantom</RootNamespace>
-    <jarserver>ipa</jarserver>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug_Java\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;JAVA,NET_2_0,TARGET_JVM,TARGET_J2EE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseAddress>285212672</BaseAddress>
-    <SkipValidation>false</SkipValidation>
-    <KeepIntermediate>false</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release_Java\</OutputPath>
-    <DefineConstants>TRACE;JAVA,NET_2_0,TARGET_JVM,TARGET_J2EE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseAddress>285212672</BaseAddress>
-    <SkipValidation>false</SkipValidation>
-    <KeepIntermediate>false</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\System.Web.UI\IScriptManager.cs">
-      <Link>IScriptManager.cs</Link>
-    </Compile>
-    <Compile Include="..\System.Web\IHttpExtendedHandler.cs">
-      <Link>IHttpExtendedHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\System.Web\IHttpExtendedWorkerRequest.cs">
-      <Link>IHttpExtendedWorkerRequest.cs</Link>
-    </Compile>
-    <Compile Include="Stubs.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="JavaEE, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
-    <Reference Include="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86" />
-    <Reference Include="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86" />
-    <Reference Include="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
-  <Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties REFS-RefInfo-javaee="repository:JavaEE:tomcat:1.3" REFS-JarPath-javaee="" REFS-JarPath-system="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-xml="repository:vmw:framework:2.0" REFS-JarPath-rt="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" REFS-JarPath-system-web="" REFS-RefInfo-system-web="repository:vmw:framework:2.0" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Charting.sln b/mcs/class/System.Windows.Forms.DataVisualization/Charting.sln
deleted file mode 100644
index 55864ee2fb0..00000000000
--- a/mcs/class/System.Windows.Forms.DataVisualization/Charting.sln
+++ /dev/null
@@ -1,66 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Windows.Forms.DataVisualization", "System.Windows.Forms.DataVisualization.csproj", "{73F9BAEA-A04B-4254-A736-D3B8B9947340}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Charting", "Test\Charting\Charting.csproj", "{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoCharting", "Test\MonoCharting\MonoCharting.csproj", "{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChartingTests", "Test\ChartingTests.csproj", "{D318CCA4-B16E-434D-B490-53A810FC949E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{73F9BAEA-A04B-4254-A736-D3B8B9947340}.Release|x86.ActiveCfg = Release|Any CPU
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Debug|x86.ActiveCfg = Debug|x86
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Debug|x86.Build.0 = Debug|x86
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Release|Any CPU.ActiveCfg = Release|x86
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Release|Mixed Platforms.Build.0 = Release|x86
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Release|x86.ActiveCfg = Release|x86
-		{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}.Release|x86.Build.0 = Release|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Debug|x86.ActiveCfg = Debug|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Debug|x86.Build.0 = Debug|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Release|Any CPU.ActiveCfg = Release|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Release|Mixed Platforms.Build.0 = Release|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Release|x86.ActiveCfg = Release|x86
-		{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}.Release|x86.Build.0 = Release|x86
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D318CCA4-B16E-434D-B490-53A810FC949E}.Release|x86.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Test/Charting/Charting.csproj b/mcs/class/System.Windows.Forms.DataVisualization/Test/Charting/Charting.csproj
deleted file mode 100644
index 1cc73fc87c0..00000000000
--- a/mcs/class/System.Windows.Forms.DataVisualization/Test/Charting/Charting.csproj
+++ /dev/null
@@ -1,88 +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)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9E7C5CA0-2297-414C-B2EB-FC5418548E9D}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WindowsFormsApplication1</RootNamespace>
-    <AssemblyName>Charting</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms.DataVisualization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Test/ChartingTests.csproj b/mcs/class/System.Windows.Forms.DataVisualization/Test/ChartingTests.csproj
deleted file mode 100644
index 40a8d4ced76..00000000000
--- a/mcs/class/System.Windows.Forms.DataVisualization/Test/ChartingTests.csproj
+++ /dev/null
@@ -1,66 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D318CCA4-B16E-434D-B490-53A810FC949E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ChartingTests</RootNamespace>
-    <AssemblyName>ChartingTests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\NUnit 2.5.2\bin\net-2.0\framework\nunit.framework.dll</HintPath>
-      <Package>nunit</Package>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms.DataVisualization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationPathPointTest.cs" />
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnovaResultTest.cs" />
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ArrowAnnotationTest.cs" />
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisScaleBreakStyleTest.cs" />
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartElementTest.cs" />
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataPointTest.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Test/MonoCharting/MonoCharting.csproj b/mcs/class/System.Windows.Forms.DataVisualization/Test/MonoCharting/MonoCharting.csproj
deleted file mode 100644
index 48a104f5a03..00000000000
--- a/mcs/class/System.Windows.Forms.DataVisualization/Test/MonoCharting/MonoCharting.csproj
+++ /dev/null
@@ -1,90 +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)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2DF0C530-64FF-4125-B03C-B79F7A5E1F7E}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MonoCharting</RootNamespace>
-    <AssemblyName>MonoCharting</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Charting\Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="..\Charting\Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\System.Windows.Forms.DataVisualization.csproj">
-      <Project>{73F9BAEA-A04B-4254-A736-D3B8B9947340}</Project>
-      <Name>System.Windows.Forms.DataVisualization</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.RTF/rtf.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms.RTF/rtf.csproj
deleted file mode 100644
index f8763b1b5c7..00000000000
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms.RTF/rtf.csproj
+++ /dev/null
@@ -1,200 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{12D60959-776E-41E9-82BE-AA5DF4BB7CAE}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "rtf"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Exe"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "rtf"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = ""
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "1"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = ""
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "1"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System.Drawing"
-                    AssemblyName = "System.Drawing"
-                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
-                />
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Windows.Forms"
-                    AssemblyName = "System.Windows.Forms"
-                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "Charcode.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Charset.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "CharsetFlags.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "CharsetType.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ClassDelegate.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Color.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "DestinationDelegate.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Font.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "KeysInit.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "KeyStruct.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Major.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Minor.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "RTF.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "RTFException.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "StandardCharCode.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "StandardCharName.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Style.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "StyleElement.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "StyleType.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "test.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "TextMap.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "TokenClass.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index 4c6d072bd6e..76ec9ecd8e6 100644
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -49,9 +49,6 @@ xmlfiles_files = \
 EXTRA_DISTFILES = \
 	$(wildcard System.Xml.Serialization/standalone_tests/*.cs) \
 	$(wildcard System.Xml.Serialization/standalone_tests/*.output) \
-	Test/Microsoft.Test.csproj	\
-	Test/Mono.Test.csproj		\
-	Test/MonoMicro.Test.csproj	\
 	Test/XmlFiles/76102.xml		\
 	Test/XmlFiles/79683.dtd		\
 	Test/XmlFiles/496192.xml	\
diff --git a/mcs/class/System.XML/Test/Microsoft.Test.csproj b/mcs/class/System.XML/Test/Microsoft.Test.csproj
deleted file mode 100644
index 99f1015f00e..00000000000
--- a/mcs/class/System.XML/Test/Microsoft.Test.csproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.0.9466"
-        SchemaVersion = "1.0"
-        ProjectGuid = "{D6C51F53-33E2-41DF-981A-33FCFA81CDA7}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "Microsoft.Test"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                RootNamespace = "Test"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "true"
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
-                />
-                <Reference
-                    Name = "NUnitCore"
-                    AssemblyName = "NUnitCore"
-                    HintPath = "..\..\..\nunit\NUnitCore.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AllTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ChangeLog"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "NameTableTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlAttributeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlCDataSectionTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlCommentTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlDeclarationTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlDocumentTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlDocumentTypeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlElementTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlNamespaceManagerTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlNodeListTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlSignificantWhitespaceTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlTextReaderTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlTextWriterTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlWhiteSpaceTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/mcs/class/System.XML/Test/Mono.Test.csproj b/mcs/class/System.XML/Test/Mono.Test.csproj
deleted file mode 100644
index 677a5b82388..00000000000
--- a/mcs/class/System.XML/Test/Mono.Test.csproj
+++ /dev/null
@@ -1,167 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.0.9466"
-        SchemaVersion = "1.0"
-        ProjectGuid = "{D6C51F53-33E2-41DF-981A-33FCFA81CDA7}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "Mono.Test"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                RootNamespace = "Test"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "true"
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
-                />
-                <Reference
-                    Name = "Mono.System.XML"
-                    Project = "{0CB7FB41-3C0F-40E8-ACD3-8C5B8BC35B2C}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "NUnitCore"
-                    AssemblyName = "NUnitCore"
-                    HintPath = "..\..\..\nunit\NUnitCore.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AllTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ChangeLog"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "NameTableTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlAttributeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlCDataSectionTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlCommentTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlDeclarationTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlDocumentTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlDocumentTypeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlElementTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlNamespaceManagerTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlNodeListTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlSignificantWhitespaceTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlTextReaderTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlTextWriterTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlWhiteSpaceTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/mcs/class/System.XML/Test/MonoMicro.Test.csproj b/mcs/class/System.XML/Test/MonoMicro.Test.csproj
deleted file mode 100644
index 0affcdb828d..00000000000
--- a/mcs/class/System.XML/Test/MonoMicro.Test.csproj
+++ /dev/null
@@ -1,428 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{F7734143-3845-4288-B1CA-FE614FFA70F0}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "MonoMicro.Test"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "MonoMicro.Test"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "true"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
-                />
-                <Reference
-                    Name = "nunit.framework"
-                    AssemblyName = "nunit.framework"
-                    HintPath = "..\..\..\..\..\Program Files\NUnit V2.0\bin\nunit.framework.dll"
-                />
-                <Reference
-                    Name = "Mono.System.XML"
-                    Project = "{0CB7FB41-3C0F-40E8-ACD3-8C5B8BC35B2C}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "ChangeLog"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "System.Xml\NameTableTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlAttributeCollectionTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlAttributeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlCDataSectionTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlCharacterDataTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlCharTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlCommentTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlConvertTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlDeclarationTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlDocumentEventTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlDocumentFragmentTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlDocumentTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlDocumentTypeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlElementTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlEntityReferenceTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlEntityTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlNamespaceManagerTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlNodeListTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlNodeReaderTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlNodeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlProcessingInstructionTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlReaderCommonTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlSecureResolverTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlSignificantWhitespaceTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlTextReaderTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlTextTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlTextWriterTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlUrlResolverTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlValidatingReaderTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlWhiteSpaceTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XmlWriterTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XsdParticleValidationTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\XsdValidatingReaderTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\ITest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\util.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\Attr\Attr.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\CharacterData\CharacterData.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\Comment\Comment.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\Document\Document.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\DOMImplementation\DOMImplementation.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\Element\Element.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\NamedNodeMap\NamedNodeMap.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\Node\Node.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\NodeList\NodeList.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml\nist_dom\fundamental\Text\Text.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Schema\XmlSchemaAssertion.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Schema\XmlSchemaBuiltInDatatypeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Schema\XmlSchemaCollectionTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Schema\XmlSchemaComplexTypeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Schema\XmlSchemaDatatypeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Schema\XmlSchemaGroupRefTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Schema\XmlSchemaLengthFacetTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Schema\XmlSchemaTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Serialization\DeserializeTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Serialization\XmlAttributesTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Serialization\XmlReflectionImporterTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Serialization\XmlSerializationWriterTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Serialization\XmlSerializerTestClasses.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Serialization\XmlSerializerTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.XPath\SelectNodesTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.XPath\XPathNavigatorCommonTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.XPath\XPathNavigatorEvaluateTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.XPath\XPathNavigatorMatchesTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.XPath\XPathNavigatorTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Xsl\MsxslScriptTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Xsl\XsltArgumentListTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "System.Xml.Xsl\XslTransformTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.sln b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.sln
deleted file mode 100755
index 338c1908d96..00000000000
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.sln
+++ /dev/null
@@ -1,58 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "xslt", "xslt.vmwcsproj", "{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.core.dll.J2EE", "..\..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Debug_Java = Debug_Java
-		Debug-Strong = Debug-Strong
-		Release = Release
-		Release_Java = Release_Java
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug.ActiveCfg = Debug|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug.Build.0 = Debug|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java.Build.0 = Debug_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug-Strong.ActiveCfg = Debug|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug-Strong.Build.0 = Debug|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release.ActiveCfg = Release_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release.Build.0 = Release_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.ActiveCfg = Release_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.Build.0 = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.ActiveCfg = Debug|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.Build.0 = Debug|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.ActiveCfg = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.Build.0 = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug-Strong.ActiveCfg = Debug|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug-Strong.Build.0 = Debug|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.ActiveCfg = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.Build.0 = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
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
deleted file mode 100644
index 468ccaf4f74..00000000000
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.csproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>xslt</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>xslt</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
-    <OutputPath>.\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE;TARGET_JVM</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>1595</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
-    <OutputPath>bin\Release_Java\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;TARGET_JVM</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>1595</NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>.\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>1595</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="XmlCompare.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="xslttest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XsltTestUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\nunit20\core\nunit.core.dll20.csproj">
-      <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>
-      <Name>nunit.core.dll20</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj">
-      <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
-      <Name>nunit.framework.dll20</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
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
deleted file mode 100644
index f0b0a8ce9ba..00000000000
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.sln
+++ /dev/null
@@ -1,64 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xslt20", "xslt20.csproj", "{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll20", "..\..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll20", "..\..\..\..\..\nunit20\core\nunit.core.dll20.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console20", "..\..\..\..\..\nunit20\nunit-console\nunit-console20.csproj", "{9367EC89-6A38-42BA-9607-0DC288E4BC3A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_Java|Any CPU = Debug_Java|Any CPU
-		Debug|Any CPU = Debug|Any CPU
-		Debug-Strong|Any CPU = Debug-Strong|Any CPU
-		Release_Java|Any CPU = Release_Java|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug-Strong|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug-Strong|Any CPU.Build.0 = Debug|Any CPU
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release|Any CPU.ActiveCfg = Release_Java|Any CPU
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release|Any CPU.Build.0 = Release_Java|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug_Java|Any CPU.ActiveCfg = Debug-Strong|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug_Java|Any CPU.Build.0 = Debug-Strong|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug-Strong|Any CPU.ActiveCfg = Debug-Strong|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug-Strong|Any CPU.Build.0 = Debug-Strong|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release_Java|Any CPU.ActiveCfg = Release|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release_Java|Any CPU.Build.0 = Release|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug_Java|Any CPU.ActiveCfg = Debug-Strong|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug_Java|Any CPU.Build.0 = Debug-Strong|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug-Strong|Any CPU.ActiveCfg = Debug-Strong|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug-Strong|Any CPU.Build.0 = Debug-Strong|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release_Java|Any CPU.ActiveCfg = Release|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release_Java|Any CPU.Build.0 = Release|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug_Java|Any CPU.ActiveCfg = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug_Java|Any CPU.Build.0 = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug-Strong|Any CPU.ActiveCfg = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug-Strong|Any CPU.Build.0 = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release_Java|Any CPU.ActiveCfg = Release|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release_Java|Any CPU.Build.0 = Release|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C.sln b/mcs/class/System.XML/Test/System.Xml/W3C/W3C.sln
deleted file mode 100644
index 19441fa60e6..00000000000
--- a/mcs/class/System.XML/Test/System.Xml/W3C/W3C.sln
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "W3C", "W3C.vmwcsproj", "{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.core.dll.J2EE", "..\..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Debug_Java = Debug_Java
-		Release_Java = Release_Java
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug.ActiveCfg = Debug_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug.Build.0 = Debug_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java.Build.0 = Debug_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.ActiveCfg = Release_Java|.NET
-		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.Build.0 = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET
-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.sln b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.sln
deleted file mode 100644
index cf9dea67f35..00000000000
--- a/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.sln
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "W3C20", "W3C20.csproj", "{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console20", "..\..\..\..\..\nunit20\nunit-console\nunit-console20.csproj", "{9367EC89-6A38-42BA-9607-0DC288E4BC3A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll20", "..\..\..\..\..\nunit20\core\nunit.core.dll20.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll20", "..\..\..\..\..\nunit20\framework\nunit.framework.dll20.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll20", "..\..\..\..\..\nunit20\util\nunit.util.dll20.csproj", "{61CE9CE5-943E-44D4-A381-814DC1406767}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DCE5474-B890-4237-ADAF-4C1375D1FA3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61CE9CE5-943E-44D4-A381-814DC1406767}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61CE9CE5-943E-44D4-A381-814DC1406767}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj b/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
deleted file mode 100644
index 41cffe62c30..00000000000
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3D20F8D4-EE91-4FA5-85D9-4C36E8D68805}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SystemWebTestShim</RootNamespace>
-    <AssemblyName>SystemWebTestShim</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>mono.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_1_1;NET_2_0;TARGET_DOTNET;VISUAL_STUDIO</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="SystemWebTestShim\Adapters.cs" />
-    <Compile Include="SystemWebTestShim\BuildManager.cs" />
-    <Compile Include="SystemWebTestShim\HttpCapabilitiesBase.cs" />
-    <Compile Include="SystemWebTestShim\Page.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="SystemWebTestShim\UrlUtils.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\System.Web\System.Web\System.Web.Testing.csproj">
-      <Project>{BB170E99-8793-4179-A19B-440539F6879F}</Project>
-      <Name>System.Web.Testing</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="mono.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/mcs/mcs.proj b/mcs/mcs.proj
deleted file mode 100644
index d2c830fa85f..00000000000
--- a/mcs/mcs.proj
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="Build">
-    <!-- basic profile -->
-    <MSBuild Projects="build\build.proj"/>
-    <MSBuild Projects="jay\jay2008.vcproj"/>
-    <MSBuild Projects="mcs\gmcs2.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\corlib\corlib.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System\System.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Xml\System.Xml.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System\System.csproj" Targets="Build" Properties="Configuration=Basic_XML_DEP;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Security\Mono.Security.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.CompilerServices.SymbolWriter\Mono.CompilerServices.SymbolWriter.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Core\System.Core.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="tools\gacutil\gacutil.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="tools\security\security.proj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <!-- net_2_0_bootstrap -->
-    <MSBuild Projects="tools\resgen\resgen.csproj" Targets="Build" Properties="Configuration=net_2_0_bootstrap;Platform=AnyCPU"/>
-    <!--<MSBuild Projects="tools\culevel\culevel.csproj" Targets="Build" Properties="Configuration=net_2_0_bootstrap;Platform=AnyCPU"/>-->
-    <!-- net_2_0 -->
-    <MSBuild Projects="class\corlib\corlib.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System\System.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Xml\System.Xml.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.CompilerServices.SymbolWriter\Mono.CompilerServices.SymbolWriter.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Posix\Mono.Posix.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Core\System.Core.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Security\Mono.Security.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System\System.csproj" Targets="Build" Properties="Configuration=net_2_0_XML_DEP;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Security\System.Security.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Configuration\System.Configuration.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System\System.csproj" Targets="Build" Properties="Configuration=net_2_0_ALL_DEP;Platform=AnyCPU"/>
-    <MSBuild Projects="class\I18N\Common\I18N.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\I18N\West\I18N.West.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\I18N\MidEast\I18N.MidEast.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\I18N\Other\I18N.Other.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\I18N\Rare\I18N.Rare.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\I18N\CJK\I18N.CJK.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Drawing\System.Drawing.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Transactions\System.Transactions.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.EnterpriseServices\System.EnterpriseServices.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Data.Tds\Mono.Data.Tds.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Data\System.Data.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Accessibility\Accessibility.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.WebBrowser\Mono.WebBrowser.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Windows.Forms\System.Windows.Forms.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Data.Sqlite\Mono.Data.Sqlite.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-   <!-- <MSBuild Projects="class\System.Web.ApplicationServices\System.Web.ApplicationServices.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web\System.Web.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Web\Mono.Web.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.Services\System.Web.Services.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web\System.Web.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Runtime.Remoting\System.Runtime.Remoting.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Configuration.Install\System.Configuration.Install.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Management\System.Management.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Data.OracleClient\System.Data.OracleClient.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Microsoft.VisualC\Microsoft.VisualC.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Cscompmgd\Cscompmgd.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Design\System.Design.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\PEAPI\PEAPI.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Npgsql\Npgsql.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Commons.Xml.Relaxng\Commons.Xml.Relaxng.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Novell.Directory.Ldap\Novell.Directory.Ldap.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Security.Win32\Mono.Security.Win32.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.DirectoryServices\System.DirectoryServices.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\RabbitMQ.Client\RabbitMQ.Client.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Messaging\Mono.Messaging.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Messaging\System.Messaging.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Messaging.RabbitMQ\Mono.Messaging.RabbitMQ.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.ServiceProcess\System.ServiceProcess.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Drawing.Design\System.Drawing.Design.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Design\System.Design.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Http\Mono.Http.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Cairo\Mono.Cairo.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\IBM.Data.DB2\IBM.Data.DB2.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\CustomMarshalers\CustomMarshalers.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\OpenSystem.C\OpenSystem.C.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Cecil\Mono.Cecil.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Cecil.Mdb\Mono.Cecil.Mdb.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\SystemWebTestShim\SystemWebTestShim.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Microsoft.Build.Framework\Microsoft.Build.Framework.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Microsoft.Build.Utilities\Microsoft.Build.Utilities.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Microsoft.Build.Engine\Microsoft.Build.Engine.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Microsoft.Build.Tasks\Microsoft.Build.Tasks.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Xml.Linq\System.Xml.Linq.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Runtime.Serialization\System.Runtime.Serialization.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Data.DataSetExtensions\System.Data.DataSetExtensions.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Data.Linq\System.Data.Linq.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web\System.Web.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.Abstractions\System.Web.Abstractions.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.Routing\System.Web.Routing.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.IdentityModel\System.IdentityModel.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.IdentityModel.Selectors\System.IdentityModel.Selectors.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.ServiceModel\System.ServiceModel.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.Extensions\System.Web.Extensions.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.Extensions.Design\System.Web.Extensions.Design.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.DynamicData\System.Web.DynamicData.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.ServiceModel.Web\System.ServiceModel.Web.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.Mvc\System.Web.Mvc.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.Mvc2\System.Web.Mvc2.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.C5\Mono.C5.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Management\Mono.Management.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Options\Mono.Options.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Simd\Mono.Simd.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Tasklets\Mono.Tasklets.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.CSharp\Mono.CSharp.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Moonlight.Build.Tasks\Moonlight.Build.Tasks.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\WindowsBase\WindowsBase.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Data.Services\System.Data.Services.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.Extensions_1.0\System.Web.Extensions_1.0.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Web.Extensions.Design_1.0\System.Web.Extensions.Design_1.0.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    -->
-    
-    <!-- nunit -->
-    <MSBuild Projects="ilasm\ilasm.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    <MSBuild Projects="tools\gacutil\gacutil.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>
-    
-  </Target>
-  <Target Name="Clean">
-    <!--<MSBuild Projects="build\build.proj" Targets="Clean" />-->
-    <!--<MSBuild Projects="mcs\mcs\gmcs.proj"/>-->
-    <MSBuild Projects="class\corlib\corlib.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System\System.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Xml\System.Xml.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System\System.csproj" Targets="Clean" Properties="Configuration=Basic_XML_DEP;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.Security\Mono.Security.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\Mono.CompilerServices.SymbolWriter\Mono.CompilerServices.SymbolWriter.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>
-    <MSBuild Projects="class\System.Core\System.Core.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>
-  </Target>
-</Project>
diff --git a/mcs/tools/culevel/culevel.csproj b/mcs/tools/culevel/culevel.csproj
deleted file mode 100644
index 747f4b48756..00000000000
--- a/mcs/tools/culevel/culevel.csproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E2DFB2FB-5133-4471-AE5C-5E4D21266009}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>culevel</RootNamespace>
-    <AssemblyName>culevel</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\class\lib\net_2_0\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\class\lib\net_2_0\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CompileUplevel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/mcs/tools/gacutil/gacutil.csproj b/mcs/tools/gacutil/gacutil.csproj
deleted file mode 100644
index 4419f32aa90..00000000000
--- a/mcs/tools/gacutil/gacutil.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <ResponseFile>$(MSBuildProjectName).exe.sources</ResponseFile>
-    <CodePage>65001</CodePage>
-    <OutputPath>..\..\class\lib\basic\</OutputPath>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic|AnyCPU' ">
-    <DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Security">
-      <HintPath>..\..\class\lib\basic\Mono.Security.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Target Name="BeforeBuild" DependsOnTargets="SetupProject">
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/mcs/tools/linker-analyzer/LinkerAnalyzer.csproj b/mcs/tools/linker-analyzer/LinkerAnalyzer.csproj
deleted file mode 100644
index bf0c4536ddd..00000000000
--- a/mcs/tools/linker-analyzer/LinkerAnalyzer.csproj
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{B64F51B1-2D82-479C-B8F5-8875CDF06D95}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>LinkerAnalyzer</RootNamespace>
-    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
-    <AssemblyName>LinkerAnalyzer</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <UseRefCounting>true</UseRefCounting>
-    <UseSGen>true</UseSGen>
-    <IncludeMonoRuntime>false</IncludeMonoRuntime>
-    <EnablePackageSigning>false</EnablePackageSigning>
-    <CodeSigningKey>Mac Developer</CodeSigningKey>
-    <EnableCodeSigning>false</EnableCodeSigning>
-    <CreatePackage>false</CreatePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <LinkMode>SdkOnly</LinkMode>
-    <UseRefCounting>true</UseRefCounting>
-    <UseSGen>true</UseSGen>
-    <IncludeMonoRuntime>true</IncludeMonoRuntime>
-    <CreatePackage>true</CreatePackage>
-    <CodeSigningKey>Developer ID Application</CodeSigningKey>
-    <EnableCodeSigning>true</EnableCodeSigning>
-    <EnablePackageSigning>false</EnablePackageSigning>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Xamarin.Mac" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-    <Folder Include="Mono.Options\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Info.plist" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="ConsoleDependencyGraph.cs" />
-    <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs">
-      <Link>Mono.Options\Options.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="LinkerAnalyzerCore\LinkerAnalyzerCore.csproj">
-      <Project>{E1B8F203-5251-470E-A573-C9E79B60781B}</Project>
-      <Name>LinkerAnalyzerCore</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/mcs/tools/linker-analyzer/LinkerAnalyzer.sln b/mcs/tools/linker-analyzer/LinkerAnalyzer.sln
deleted file mode 100644
index 1debe4c366c..00000000000
--- a/mcs/tools/linker-analyzer/LinkerAnalyzer.sln
+++ /dev/null
@@ -1,23 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinkerAnalyzer", "LinkerAnalyzer.csproj", "{B64F51B1-2D82-479C-B8F5-8875CDF06D95}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinkerAnalyzerCore", "LinkerAnalyzerCore\LinkerAnalyzerCore.csproj", "{E1B8F203-5251-470E-A573-C9E79B60781B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B64F51B1-2D82-479C-B8F5-8875CDF06D95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B64F51B1-2D82-479C-B8F5-8875CDF06D95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B64F51B1-2D82-479C-B8F5-8875CDF06D95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B64F51B1-2D82-479C-B8F5-8875CDF06D95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1B8F203-5251-470E-A573-C9E79B60781B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1B8F203-5251-470E-A573-C9E79B60781B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1B8F203-5251-470E-A573-C9E79B60781B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1B8F203-5251-470E-A573-C9E79B60781B}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/tools/linker-analyzer/LinkerAnalyzerCore/LinkerAnalyzerCore.csproj b/mcs/tools/linker-analyzer/LinkerAnalyzerCore/LinkerAnalyzerCore.csproj
deleted file mode 100644
index 64275160a35..00000000000
--- a/mcs/tools/linker-analyzer/LinkerAnalyzerCore/LinkerAnalyzerCore.csproj
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{E1B8F203-5251-470E-A573-C9E79B60781B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>LinkerAnalyzer.Core</RootNamespace>
-    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
-    <AssemblyName>LinkerAnalyzerCore</AssemblyName>
-    <UseXamMacFullFramework>true</UseXamMacFullFramework>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <UseRefCounting>false</UseRefCounting>
-    <UseSGen>false</UseSGen>
-    <IncludeMonoRuntime>false</IncludeMonoRuntime>
-    <CreatePackage>false</CreatePackage>
-    <EnableCodeSigning>false</EnableCodeSigning>
-    <EnablePackageSigning>false</EnablePackageSigning>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <UseRefCounting>false</UseRefCounting>
-    <UseSGen>false</UseSGen>
-    <IncludeMonoRuntime>false</IncludeMonoRuntime>
-    <CreatePackage>false</CreatePackage>
-    <EnableCodeSigning>false</EnableCodeSigning>
-    <EnablePackageSigning>false</EnablePackageSigning>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Xamarin.Mac" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Mono.Cecil">
-      <HintPath>..\..\..\git\upstream\cecil\bin\net_4_0_Debug\Mono.Cecil.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DependencyGraph.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/mcs/tools/mono-xmltool/XmlTool.sln b/mcs/tools/mono-xmltool/XmlTool.sln
deleted file mode 100644
index bd604fc850b..00000000000
--- a/mcs/tools/mono-xmltool/XmlTool.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "XmlTool", "XmlTool.vmwcsproj", "{087B262E-5E5C-4A82-BDF0-224557BE6696}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug_Java = Debug_Java
-		Release_Java = Release_Java
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{087B262E-5E5C-4A82-BDF0-224557BE6696}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{087B262E-5E5C-4A82-BDF0-224557BE6696}.Debug_Java.Build.0 = Debug_Java|.NET
-		{087B262E-5E5C-4A82-BDF0-224557BE6696}.Release_Java.ActiveCfg = Release_Java|.NET
-		{087B262E-5E5C-4A82-BDF0-224557BE6696}.Release_Java.Build.0 = Release_Java|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/tools/mono-xmltool/XmlTool.vmwcsproj b/mcs/tools/mono-xmltool/XmlTool.vmwcsproj
deleted file mode 100644
index 9be7abec4bf..00000000000
--- a/mcs/tools/mono-xmltool/XmlTool.vmwcsproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<VisualStudioProject>
-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{087B262E-5E5C-4A82-BDF0-224557BE6696}">
-		<Build>
-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="xmltool" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Exe" PreBuildEvent="" PostBuildEvent="" RootNamespace="XslTransformer" RunPostBuildEvent="OnBuildSuccess" StartupObject="">
-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
-			</Settings>
-			<References>
-				<Reference Name="System" AssemblyName="System" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>
-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>
-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>
-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>
-			</References>
-		</Build>
-		<Files>
-			<Include>
-				<File RelPath="xmltool.cs" SubType="Code" BuildAction="Compile"/>
-			</Include>
-		</Files>
-		<UserProperties REFS.JarPath.system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" project.JDKType="1.5.0_05"/>
-	</CSHARP>
-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>
diff --git a/mcs/tools/mono-xmltool/XmlTool20.csproj b/mcs/tools/mono-xmltool/XmlTool20.csproj
deleted file mode 100755
index 724b7838be7..00000000000
--- a/mcs/tools/mono-xmltool/XmlTool20.csproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A6E5B975-62B2-4DF5-93B5-396E59C2EFB5}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>XmlTool</RootNamespace>
-    <AssemblyName>XmlTool</AssemblyName>
-    <JDKName>1.5.0_05</JDKName>
-    <GHProjectType>1</GHProjectType>
-    <Version>2.0</Version>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">
-    <OutputPath>bin\Release_Java20\</OutputPath>
-    <DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <SkipValidation>false</SkipValidation>
-    <KeepIntermediate>false</KeepIntermediate>
-    <GHProjectType>1</GHProjectType>
-    <PreCompile>false</PreCompile>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <ApplicationServerType>
-    </ApplicationServerType>
-    <Version>2.0</Version>
-    <JDKName>1.5.0_05</JDKName>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug_Java20\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <SkipValidation>True</SkipValidation>
-    <KeepIntermediate>False</KeepIntermediate>
-    <GHProjectType>1</GHProjectType>
-    <PreCompile>false</PreCompile>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <ApplicationServerType>
-    </ApplicationServerType>
-    <Version>2.0</Version>
-    <JDKName>1.5.0_05</JDKName>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug_Java\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseAddress>285212672</BaseAddress>
-    <NoStdLib>false</NoStdLib>
-    <SkipValidation>True</SkipValidation>
-    <KeepIntermediate>False</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release_Java\</OutputPath>
-    <DefineConstants>TRACE;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoStdLib>false</NoStdLib>
-    <BaseAddress>285212672</BaseAddress>
-    <SkipValidation>false</SkipValidation>
-    <KeepIntermediate>false</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="xmltool.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
-  <Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.jar" REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar" REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/mcs/tools/mono-xmltool/XmlTool20.sln b/mcs/tools/mono-xmltool/XmlTool20.sln
deleted file mode 100644
index 4ebd8a7861d..00000000000
--- a/mcs/tools/mono-xmltool/XmlTool20.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlTool20", "XmlTool20.csproj", "{B2E6CE91-6C6A-449F-ADD8-544A6AE336AA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B2E6CE91-6C6A-449F-ADD8-544A6AE336AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2E6CE91-6C6A-449F-ADD8-544A6AE336AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2E6CE91-6C6A-449F-ADD8-544A6AE336AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2E6CE91-6C6A-449F-ADD8-544A6AE336AA}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/mcs/tools/xbuild/Test/xbuild.tests/xbuild.tests.csproj b/mcs/tools/xbuild/Test/xbuild.tests/xbuild.tests.csproj
deleted file mode 100644
index 381dd821b1d..00000000000
--- a/mcs/tools/xbuild/Test/xbuild.tests/xbuild.tests.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{929D9BCD-2280-4B6D-AD69-0FD089E344C2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>xbuild.tests</RootNamespace>
-    <AssemblyName>xbuild.tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\xbuild.csproj">
-      <Project>{89938F1A-C851-41D5-96D2-C329E00887B6}</Project>
-      <Name>xbuild</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties InternalTargetFrameworkVersion="3.5" />
-    </MonoDevelop>
-  </ProjectExtensions>
-  <ItemGroup>
-    <Compile Include="ParametersTest.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/mcs/tools/xbuild/xbuild.csproj b/mcs/tools/xbuild/xbuild.csproj
deleted file mode 100644
index df1a4e1ad53..00000000000
--- a/mcs/tools/xbuild/xbuild.csproj
+++ /dev/null
@@ -1,77 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{89938F1A-C851-41D5-96D2-C329E00887B6}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>xbuild</RootNamespace>
-    <AssemblyName>xbuild</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMS|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\class\Microsoft.Build.Framework\Mono.XBuild.Framework/AssemblyLoadInfo.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="CommandLineException.cs" />
-    <Compile Include="ErrorUtilities.cs" />
-    <Compile Include="LoggerInfo.cs" />
-    <Compile Include="Main.cs" />
-    <Compile Include="Parameters.cs" />
-    <Compile Include="SolutionParser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Configuration)' == 'DebugMS' ">
-    <Reference Include="Microsoft.Build.Engine" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Configuration)' != 'DebugMS' ">
-    <ProjectReference Include="..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.csproj">
-      <Project>{49CC9B64-E28A-4818-97F9-301E14B383B9}</Project>
-      <Name>Microsoft.Build.Engine</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/mcs/tools/xbuild/xbuild.sln b/mcs/tools/xbuild/xbuild.sln
deleted file mode 100644
index a0815a59650..00000000000
--- a/mcs/tools/xbuild/xbuild.sln
+++ /dev/null
@@ -1,50 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Engine", "..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.csproj", "{49CC9B64-E28A-4818-97F9-301E14B383B9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xbuild", "xbuild.csproj", "{89938F1A-C851-41D5-96D2-C329E00887B6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Engine.Test", "..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.Test.csproj", "{A2F451CD-8701-434A-A562-EF1809E2DB7D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xbuild.tests", "Test\xbuild.tests\xbuild.tests.csproj", "{929D9BCD-2280-4B6D-AD69-0FD089E344C2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		DebugMS|Any CPU = DebugMS|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.DebugMS|Any CPU.ActiveCfg = DebugMS|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.DebugMS|Any CPU.Build.0 = DebugMS|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.DebugMS|Any CPU.ActiveCfg = DebugMS|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.DebugMS|Any CPU.Build.0 = DebugMS|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.DebugMS|Any CPU.ActiveCfg = Debug|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.DebugMS|Any CPU.Build.0 = Debug|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.DebugMS|Any CPU.ActiveCfg = DebugMS|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.DebugMS|Any CPU.Build.0 = DebugMS|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = ..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.csproj
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal