Merge branch 'master' into mono4-continuations_fix

author: Kelly Washington <kelly@lindenlab.com> 2016-07-08 19:20:07 +0300
committer: Kelly Washington <kelly@lindenlab.com> 2016-07-08 19:20:07 +0300
commit: 9bf8d670fb9e8c223df4f4c11f4c935610b33320 (patch)
tree: 535d9e7c2e8a462ab10e56be13778882ae182395 /mcs/class
parent: 436c2cf1b39f50a17efe7a1e1cc1ae75286fa641 (diff)
parent: f16741a60aabbf2bc856a8b616fd3369b74107f7 (diff)
735 files changed, 26013 insertions, 35827 deletions
diff --git a/mcs/class/Accessibility/Accessibility-net_4_x.csproj b/mcs/class/Accessibility/Accessibility-net_4_x.csproj
index a46a581c8d8..50cdfcf6868 100644
--- a/mcs/class/Accessibility/Accessibility-net_4_x.csproj
+++ b/mcs/class/Accessibility/Accessibility-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -57,15 +60,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
index d2101be8f53..2539a5b4b18 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -93,15 +96,16 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Cscompmgd/Cscompmgd-net_4_x.csproj b/mcs/class/Cscompmgd/Cscompmgd-net_4_x.csproj
index 049aece64a9..2c40504aa63 100644
--- a/mcs/class/Cscompmgd/Cscompmgd-net_4_x.csproj
+++ b/mcs/class/Cscompmgd/Cscompmgd-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -60,15 +63,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj b/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj
index 3e68f2387ae..bf2bc3fb533 100644
--- a/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj
+++ b/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -61,15 +64,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives-net_4_x.csproj b/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives-net_4_x.csproj
new file mode 100644
index 00000000000..ef4329f1ed1
--- /dev/null
+++ b/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{699E0DB5-EDD0-4E6A-87C9-D396DCDAF620}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>Microsoft.Win32.Primitives</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj
new file mode 100644
index 00000000000..1bca67282f6
--- /dev/null
+++ b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{7B15C4D7-8C02-408E-9EFB-5E9E9FB4410D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>Microsoft.Win32.Registry.AccessControl</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry-net_4_x.csproj b/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry-net_4_x.csproj
new file mode 100644
index 00000000000..5189fe3c1ad
--- /dev/null
+++ b/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{160B5B14-7A25-458E-B83F-35632C832866}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>Microsoft.Win32.Registry</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.AppContext/Facades_System.AppContext-net_4_x.csproj b/mcs/class/Facades/System.AppContext/Facades_System.AppContext-net_4_x.csproj
new file mode 100644
index 00000000000..3980a552ddc
--- /dev/null
+++ b/mcs/class/Facades/System.AppContext/Facades_System.AppContext-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{B6B7A903-D696-43CF-AC42-39DCAAB00B9D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.AppContext</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent-net_4_x.csproj b/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent-net_4_x.csproj
new file mode 100644
index 00000000000..eee52ccc352
--- /dev/null
+++ b/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{EFD0287C-3651-4D42-B8CA-430776CB1E6D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Collections.Concurrent</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric-net_4_x.csproj b/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric-net_4_x.csproj
new file mode 100644
index 00000000000..a7e0139702f
--- /dev/null
+++ b/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{5F686C07-72CE-4A42-93B1-52B31227C3BB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Collections.NonGeneric</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized-net_4_x.csproj b/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized-net_4_x.csproj
new file mode 100644
index 00000000000..44e2fc91c58
--- /dev/null
+++ b/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{5A238E60-587C-4C5C-8CA4-0443B1DBF1F6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Collections.Specialized</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Collections/Facades_System.Collections-net_4_x.csproj b/mcs/class/Facades/System.Collections/Facades_System.Collections-net_4_x.csproj
new file mode 100644
index 00000000000..c3eb239218a
--- /dev/null
+++ b/mcs/class/Facades/System.Collections/Facades_System.Collections-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{2597261D-EC05-4333-928D-1CA44AB1A5D2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Collections</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations-net_4_x.csproj b/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations-net_4_x.csproj
new file mode 100644
index 00000000000..a0d3c1b52b0
--- /dev/null
+++ b/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{B26700A5-4A9A-4358-8C84-51AD67C706BA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ComponentModel.Annotations</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_x.csproj">
+      <Project>{8F86C287-38A5-49F8-BE6D-1E0E3D74AF39}</Project>
+      <Name>System.ComponentModel.DataAnnotations-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync-net_4_x.csproj b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync-net_4_x.csproj
new file mode 100644
index 00000000000..cbeca4b5886
--- /dev/null
+++ b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{6871A822-F21C-4C0E-B97B-178FF6C3DB46}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives-net_4_x.csproj b/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives-net_4_x.csproj
new file mode 100644
index 00000000000..65e0f7e3271
--- /dev/null
+++ b/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{1DF9021C-DC67-4D7B-BEC9-10D7FBC12972}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ComponentModel.Primitives</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter-net_4_x.csproj b/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter-net_4_x.csproj
new file mode 100644
index 00000000000..aea55676326
--- /dev/null
+++ b/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{FC19760B-00FF-4242-9760-9C8E9C87CCFB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ComponentModel.TypeConverter</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel-net_4_x.csproj b/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel-net_4_x.csproj
new file mode 100644
index 00000000000..a1a92d79df8
--- /dev/null
+++ b/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{3FA73846-3666-4769-B431-1A7538B08F39}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ComponentModel</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Console/Facades_System.Console-net_4_x.csproj b/mcs/class/Facades/System.Console/Facades_System.Console-net_4_x.csproj
new file mode 100644
index 00000000000..c42832bf3a4
--- /dev/null
+++ b/mcs/class/Facades/System.Console/Facades_System.Console-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{6207AADB-0592-4B52-B71E-3565196EE893}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Console</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common-net_4_x.csproj b/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common-net_4_x.csproj
new file mode 100644
index 00000000000..493303cc15e
--- /dev/null
+++ b/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{360CDD70-6108-4406-9433-7BB178B0C3E3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Data.Common</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Data/System.Data-net_4_x.csproj">
+      <Project>{EC439BB8-FFED-4A32-A05D-2FA3A70CAD64}</Project>
+      <Name>System.Data-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient-net_4_x.csproj b/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient-net_4_x.csproj
new file mode 100644
index 00000000000..3427bb006e9
--- /dev/null
+++ b/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient-net_4_x.csproj
@@ -0,0 +1,102 @@
+<?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>{575873BD-22DA-4A36-ABBD-B074EFEAB3AD}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Data.SqlClient</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Data/System.Data-net_4_x.csproj">
+      <Project>{EC439BB8-FFED-4A32-A05D-2FA3A70CAD64}</Project>
+      <Name>System.Data-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts-net_4_x.csproj
new file mode 100644
index 00000000000..72f03e89c83
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{8892480E-A4C6-4C4C-8722-21C5483F8851}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.Contracts</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug-net_4_x.csproj
new file mode 100644
index 00000000000..5de4c3cd3b7
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{7221EF5D-7340-4E8C-99F0-9EE9C55AA189}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.Debug</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo-net_4_x.csproj
new file mode 100644
index 00000000000..e8db26624c3
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{D81BCBD3-415D-4309-A116-0B475D8A2FA8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.FileVersionInfo</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.PerformanceCounter/Facades_System.Diagnostics.PerformanceCounter-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.PerformanceCounter/Facades_System.Diagnostics.PerformanceCounter-net_4_x.csproj
new file mode 100644
index 00000000000..a9534e3cb63
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.PerformanceCounter/Facades_System.Diagnostics.PerformanceCounter-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{BA0C64F1-3762-437D-8B58-75F68A5B4E7E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.PerformanceCounter</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process-net_4_x.csproj
new file mode 100644
index 00000000000..210e44530fa
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{BFE6F5CE-725C-4F96-8AC6-F66B7C56E972}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.Process</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace-net_4_x.csproj
new file mode 100644
index 00000000000..9d1c6f14752
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{871BE2C6-2F56-4E05-93E8-9B3FDD4711DB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.StackTrace</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener-net_4_x.csproj
new file mode 100644
index 00000000000..fb2f1485d87
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{EE8443AB-125D-4055-981A-143FB827C23C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.TextWriterTraceListener</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools-net_4_x.csproj
new file mode 100644
index 00000000000..5d1e6d7135d
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{5B299463-3E19-48C1-8625-31E12E1CC146}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.Tools</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent-net_4_x.csproj
new file mode 100644
index 00000000000..f31a1fc6a55
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{6460F8E8-775E-46B6-99E5-B48390591515}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.TraceEvent</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource-net_4_x.csproj
new file mode 100644
index 00000000000..7003052edfd
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{530F1E68-3237-49E6-8D3B-06332F5AC055}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.TraceSource</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing-net_4_x.csproj
new file mode 100644
index 00000000000..73d08a19bd1
--- /dev/null
+++ b/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{B33966AB-7211-43B4-B5C0-3F818869CB08}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Diagnostics.Tracing</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs b/mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs
index ca09028ce16..832c003b52e 100644
--- a/mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs
+++ b/mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs
@@ -29,6 +29,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventOpcode))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventSource))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventSourceAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventSourceSettings))]
 //[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventSourceException))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventTask))]
 //[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventWrittenEventArgs))]
diff --git a/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime-net_4_x.csproj b/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime-net_4_x.csproj
new file mode 100644
index 00000000000..076b4d9bfa0
--- /dev/null
+++ b/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{E48CEF36-3218-477B-A8B5-014519207FF2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Dynamic.Runtime</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars-net_4_x.csproj b/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars-net_4_x.csproj
new file mode 100644
index 00000000000..d0aa63ef3cf
--- /dev/null
+++ b/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{BC71DA11-382F-459A-B3C3-F2F4267974FB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Globalization.Calendars</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj
new file mode 100644
index 00000000000..66212877264
--- /dev/null
+++ b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{B875622B-BEA2-4D1C-8242-3A1FCECF5890}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Globalization.Extensions</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Globalization/Facades_System.Globalization-net_4_x.csproj b/mcs/class/Facades/System.Globalization/Facades_System.Globalization-net_4_x.csproj
new file mode 100644
index 00000000000..d3117287fbc
--- /dev/null
+++ b/mcs/class/Facades/System.Globalization/Facades_System.Globalization-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{5F313CA5-F0FC-4EA3-AC8D-8EF1C7FC8ABE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Globalization</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile-net_4_x.csproj b/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile-net_4_x.csproj
new file mode 100644
index 00000000000..4423a9dc9a4
--- /dev/null
+++ b/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{A8EB5499-FA67-4049-AA0A-241D82DA975C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.Compression.ZipFile</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj">
+      <Project>{9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}</Project>
+      <Name>System.IO.Compression.FileSystem-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl-net_4_x.csproj b/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl-net_4_x.csproj
new file mode 100644
index 00000000000..0f9d44c9cd4
--- /dev/null
+++ b/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{321A53F3-A681-4CA5-A093-1C6650243F6A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.FileSystem.AccessControl</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo-net_4_x.csproj b/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo-net_4_x.csproj
new file mode 100644
index 00000000000..5edbbbb8034
--- /dev/null
+++ b/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{121F835D-CD32-4C19-ABA7-25EF4B84773F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.FileSystem.DriveInfo</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives-net_4_x.csproj b/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives-net_4_x.csproj
new file mode 100644
index 00000000000..98c67e82710
--- /dev/null
+++ b/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{5DF20007-FD1D-4BD8-A492-D1C4F7CAD2BF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.FileSystem.Primitives</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher-net_4_x.csproj b/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher-net_4_x.csproj
new file mode 100644
index 00000000000..75fe3913f4e
--- /dev/null
+++ b/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{44647FAA-F785-44DE-B6B2-ABC2B9768233}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.FileSystem.Watcher</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem-net_4_x.csproj b/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem-net_4_x.csproj
new file mode 100644
index 00000000000..34784bd92b7
--- /dev/null
+++ b/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{3CBF9A55-86B6-4E0B-A73E-E352C79D85E8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.FileSystem</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage-net_4_x.csproj b/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage-net_4_x.csproj
new file mode 100644
index 00000000000..866e14f1a16
--- /dev/null
+++ b/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{A9B2D389-B9E5-4B0F-8115-2AADF285D217}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.IsolatedStorage</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles-net_4_x.csproj b/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles-net_4_x.csproj
new file mode 100644
index 00000000000..3e44aef4606
--- /dev/null
+++ b/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{18639F0F-74F1-4B61-81BF-D60B651F542A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.MemoryMappedFiles</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes-net_4_x.csproj b/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes-net_4_x.csproj
new file mode 100644
index 00000000000..71c4350a6e7
--- /dev/null
+++ b/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{D835F3A9-C4FE-4162-8AB5-DC26D06AC81F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.Pipes</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream-net_4_x.csproj b/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream-net_4_x.csproj
new file mode 100644
index 00000000000..c65751b5388
--- /dev/null
+++ b/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{981E765A-9D68-4653-9079-69BFCD97F086}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO.UnmanagedMemoryStream</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.IO/Facades_System.IO-net_4_x.csproj b/mcs/class/Facades/System.IO/Facades_System.IO-net_4_x.csproj
new file mode 100644
index 00000000000..da00e74eff7
--- /dev/null
+++ b/mcs/class/Facades/System.IO/Facades_System.IO-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{6C8B94F6-E589-472C-80CA-BD55DAFAC523}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.IO</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions-net_4_x.csproj b/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions-net_4_x.csproj
new file mode 100644
index 00000000000..e7c6951666b
--- /dev/null
+++ b/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{24ADB02E-2E84-4EF4-BDD4-F20C87AEA6A3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Linq.Expressions</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel-net_4_x.csproj b/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel-net_4_x.csproj
new file mode 100644
index 00000000000..de83417856b
--- /dev/null
+++ b/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{CFF3822F-E829-4AEF-899A-963C4EAF6941}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Linq.Parallel</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable-net_4_x.csproj b/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable-net_4_x.csproj
new file mode 100644
index 00000000000..3aa8b75ec1f
--- /dev/null
+++ b/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{49E80FC1-1707-4715-8D94-CBDC79B007E9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Linq.Queryable</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Linq/Facades_System.Linq-net_4_x.csproj b/mcs/class/Facades/System.Linq/Facades_System.Linq-net_4_x.csproj
new file mode 100644
index 00000000000..9c29c3428fd
--- /dev/null
+++ b/mcs/class/Facades/System.Linq/Facades_System.Linq-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{9F1C9D98-4C32-4698-B26F-10A38B5073B0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Linq</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager-net_4_x.csproj b/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager-net_4_x.csproj
new file mode 100644
index 00000000000..b14fcb89dc5
--- /dev/null
+++ b/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{B6DBC302-E9DB-4464-979C-6D714B436A7E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.AuthenticationManager</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache-net_4_x.csproj b/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache-net_4_x.csproj
new file mode 100644
index 00000000000..5ff7c8612a0
--- /dev/null
+++ b/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{101D931B-24CE-44CE-8140-8B183D5CC46E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.Cache</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.Http.WebRequestHandler/Facades_System.Net.Http.WebRequestHandler-net_4_x.csproj b/mcs/class/Facades/System.Net.Http.WebRequestHandler/Facades_System.Net.Http.WebRequestHandler-net_4_x.csproj
new file mode 100644
index 00000000000..c49aa56c8a2
--- /dev/null
+++ b/mcs/class/Facades/System.Net.Http.WebRequestHandler/Facades_System.Net.Http.WebRequestHandler-net_4_x.csproj
@@ -0,0 +1,102 @@
+<?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>{ACA10642-1D5B-443D-99BE-65C31491C54F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.Http.WebRequestHandler</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Net.Http.WebRequest/System.Net.Http.WebRequest-net_4_x.csproj">
+      <Project>{A98B5CC3-EAFC-4EFD-ABC6-2F2A65BE98F5}</Project>
+      <Name>System.Net.Http.WebRequest-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Net.Http/System.Net.Http-net_4_x.csproj">
+      <Project>{F1636C0A-FC68-4362-918F-9CCC789FED13}</Project>
+      <Name>System.Net.Http-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener-net_4_x.csproj b/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener-net_4_x.csproj
new file mode 100644
index 00000000000..9c59776987c
--- /dev/null
+++ b/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{CC7A11AC-ACAA-4707-BEF1-1106938F19C7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.HttpListener</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail-net_4_x.csproj b/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail-net_4_x.csproj
new file mode 100644
index 00000000000..f38a0d52aa5
--- /dev/null
+++ b/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{074DF29D-D38E-4FB9-86A0-18F47615CE72}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.Mail</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution-net_4_x.csproj b/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution-net_4_x.csproj
new file mode 100644
index 00000000000..35e6e9a6d32
--- /dev/null
+++ b/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{1219DA91-575A-45EA-9CC9-1471648A025F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.NameResolution</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation-net_4_x.csproj b/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation-net_4_x.csproj
new file mode 100644
index 00000000000..042d7ace4fc
--- /dev/null
+++ b/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{B6AE3A72-1756-46BF-9105-C4D815A5C044}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.NetworkInformation</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives-net_4_x.csproj b/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives-net_4_x.csproj
new file mode 100644
index 00000000000..aa320054391
--- /dev/null
+++ b/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{79BB52C8-198A-4238-B2F6-62CEEBD7D228}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.Primitives</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests-net_4_x.csproj b/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests-net_4_x.csproj
new file mode 100644
index 00000000000..9d81ac99708
--- /dev/null
+++ b/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{538C60BD-0652-4780-AA7C-338C2DD82448}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.Requests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security-net_4_x.csproj b/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security-net_4_x.csproj
new file mode 100644
index 00000000000..346a8c821b9
--- /dev/null
+++ b/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{601F297E-1242-4BC4-BD06-1111CE65D658}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.Security</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint-net_4_x.csproj b/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint-net_4_x.csproj
new file mode 100644
index 00000000000..db14b8d3b4a
--- /dev/null
+++ b/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{B0CF71F6-DCD4-4C7B-BE36-BF9CB0CB366C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.ServicePoint</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets-net_4_x.csproj b/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets-net_4_x.csproj
new file mode 100644
index 00000000000..ca762d98f2d
--- /dev/null
+++ b/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{FC7570DA-CAE1-40AF-9EB4-9C9566746023}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.Sockets</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities-net_4_x.csproj b/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities-net_4_x.csproj
new file mode 100644
index 00000000000..1372878cd18
--- /dev/null
+++ b/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{6413D947-5660-473A-8C2C-9DF40BF8AEE1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.Utilities</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection-net_4_x.csproj b/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection-net_4_x.csproj
new file mode 100644
index 00000000000..3a298830e16
--- /dev/null
+++ b/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{A1B6CFFB-432C-4CB1-9A60-97B3CC859583}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.WebHeaderCollection</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client-net_4_x.csproj b/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client-net_4_x.csproj
new file mode 100644
index 00000000000..11199656414
--- /dev/null
+++ b/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{5B58ED88-02A5-469A-82A0-DF97F3A5FBB0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.WebSockets.Client</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets-net_4_x.csproj b/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets-net_4_x.csproj
new file mode 100644
index 00000000000..0103faa7236
--- /dev/null
+++ b/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{C46AD937-B0E8-4AB6-B98C-C8C37A746ED7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Net.WebSockets</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel-net_4_x.csproj b/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel-net_4_x.csproj
new file mode 100644
index 00000000000..e1230f83e0f
--- /dev/null
+++ b/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{D14B21CE-AC35-445E-930F-9C7F6E032EE8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ObjectModel</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Private.CoreLib.InteropServices/Facades_System.Private.CoreLib.InteropServices-net_4_x.csproj b/mcs/class/Facades/System.Private.CoreLib.InteropServices/Facades_System.Private.CoreLib.InteropServices-net_4_x.csproj
new file mode 100644
index 00000000000..c81a0356846
--- /dev/null
+++ b/mcs/class/Facades/System.Private.CoreLib.InteropServices/Facades_System.Private.CoreLib.InteropServices-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{5D05F5E2-7378-4A35-B1A3-76ABEB4A71C3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Private.CoreLib.InteropServices</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Private.CoreLib.Threading/Facades_System.Private.CoreLib.Threading-net_4_x.csproj b/mcs/class/Facades/System.Private.CoreLib.Threading/Facades_System.Private.CoreLib.Threading-net_4_x.csproj
new file mode 100644
index 00000000000..df6c913f466
--- /dev/null
+++ b/mcs/class/Facades/System.Private.CoreLib.Threading/Facades_System.Private.CoreLib.Threading-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{642A1B9E-1A2F-4C55-B184-E22F8C2E95B5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Private.CoreLib.Threading</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration-net_4_x.csproj b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration-net_4_x.csproj
new file mode 100644
index 00000000000..3f6502b6e7a
--- /dev/null
+++ b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{ACF5E339-FB52-48E0-A859-2CE75756DFE8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Reflection.Emit.ILGeneration</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight-net_4_x.csproj b/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight-net_4_x.csproj
new file mode 100644
index 00000000000..28c20187cf4
--- /dev/null
+++ b/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{03B29131-9D1A-4446-92F2-237F9EF70C5C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Reflection.Emit.Lightweight</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit-net_4_x.csproj b/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit-net_4_x.csproj
new file mode 100644
index 00000000000..e407d0fd9c7
--- /dev/null
+++ b/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{5327CF02-204D-45CD-A68D-3D836470E439}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Reflection.Emit</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions-net_4_x.csproj b/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions-net_4_x.csproj
new file mode 100644
index 00000000000..5a41690bc62
--- /dev/null
+++ b/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{B6D0F01A-1585-464E-850A-502EB4BBA8A2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Reflection.Extensions</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives-net_4_x.csproj b/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives-net_4_x.csproj
new file mode 100644
index 00000000000..9b883b5f9d7
--- /dev/null
+++ b/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{D60D1AB4-D664-4B1F-9724-962A2D205B07}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Reflection.Primitives</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions-net_4_x.csproj b/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions-net_4_x.csproj
new file mode 100644
index 00000000000..2030414734b
--- /dev/null
+++ b/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{C315A617-25A4-447F-AA4F-0E0E7E35F919}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Reflection.TypeExtensions</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Reflection/Facades_System.Reflection-net_4_x.csproj b/mcs/class/Facades/System.Reflection/Facades_System.Reflection-net_4_x.csproj
new file mode 100644
index 00000000000..98be695bc27
--- /dev/null
+++ b/mcs/class/Facades/System.Reflection/Facades_System.Reflection-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{BE1CD06E-F08E-46EE-9DFD-91E1557F4121}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Reflection</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter-net_4_x.csproj b/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter-net_4_x.csproj
new file mode 100644
index 00000000000..eaafdd2b4b6
--- /dev/null
+++ b/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{2D720AF7-7104-46EF-93BC-B8BA133B6BF6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Resources.ReaderWriter</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager-net_4_x.csproj b/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager-net_4_x.csproj
new file mode 100644
index 00000000000..e40ceea6809
--- /dev/null
+++ b/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{9F980E30-92CE-466A-BCB1-2C2F1E8FC09D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Resources.ResourceManager</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC-net_4_x.csproj b/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC-net_4_x.csproj
new file mode 100644
index 00000000000..f3b9b2dadbd
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{C1D26AE7-071A-4092-9866-0EE2D09CF342}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime.CompilerServices.VisualC</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions-net_4_x.csproj b/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions-net_4_x.csproj
new file mode 100644
index 00000000000..f00748c40fa
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{1215B717-BE9D-4D53-AEB9-35522519BC75}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime.Extensions</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles-net_4_x.csproj b/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles-net_4_x.csproj
new file mode 100644
index 00000000000..d29f79f2d6c
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{87C01EDD-05AF-4E1A-8EEE-27D7B83689EC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime.Handles</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime-net_4_x.csproj b/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime-net_4_x.csproj
new file mode 100644
index 00000000000..0dddc7ef0a7
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{521A60CF-50DF-4EF1-88B2-418BD39BDEC4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime.InteropServices.WindowsRuntime</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices-net_4_x.csproj b/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices-net_4_x.csproj
new file mode 100644
index 00000000000..7011c5559d7
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{71A8C7C9-ED84-44E5-8814-F5FA5DA6EC5A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime.InteropServices</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics-net_4_x.csproj b/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics-net_4_x.csproj
new file mode 100644
index 00000000000..a82e8d24fb4
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{AEB47FF6-C50D-4985-A57F-17F71F63694A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime.Numerics</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Numerics/System.Numerics-net_4_x.csproj">
+      <Project>{BD2FFDDC-BD89-4041-82F5-A696C941C7BE}</Project>
+      <Name>System.Numerics-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json-net_4_x.csproj b/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json-net_4_x.csproj
new file mode 100644
index 00000000000..18a14af836b
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{88B512E6-3E9D-4F87-A9E4-5F9239848665}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime.Serialization.Json</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj">
+      <Project>{D845AD9D-3CCB-49CB-9543-028678E94938}</Project>
+      <Name>System.Runtime.Serialization-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives-net_4_x.csproj b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives-net_4_x.csproj
new file mode 100644
index 00000000000..71204dcabbd
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{49BB9015-6989-4BD0-AF82-9184BE637D57}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime.Serialization.Primitives</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj">
+      <Project>{D845AD9D-3CCB-49CB-9543-028678E94938}</Project>
+      <Name>System.Runtime.Serialization-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml-net_4_x.csproj b/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml-net_4_x.csproj
new file mode 100644
index 00000000000..058a3e64219
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{C948B3D4-0BEE-4363-B4A7-635A169C8D63}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime.Serialization.Xml</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj">
+      <Project>{D845AD9D-3CCB-49CB-9543-028678E94938}</Project>
+      <Name>System.Runtime.Serialization-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Runtime/Facades_System.Runtime-net_4_x.csproj b/mcs/class/Facades/System.Runtime/Facades_System.Runtime-net_4_x.csproj
new file mode 100644
index 00000000000..d88f7bba8c6
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime/Facades_System.Runtime-net_4_x.csproj
@@ -0,0 +1,102 @@
+<?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>{CFB32425-69C5-425B-BF9A-66CB3AC52D71}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Runtime</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj">
+      <Project>{9091B5ED-8AFF-4B93-801A-9A33E0895A2B}</Project>
+      <Name>System.ComponentModel.Composition-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl-net_4_x.csproj b/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl-net_4_x.csproj
new file mode 100644
index 00000000000..546f03f9c7c
--- /dev/null
+++ b/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{4867DFE7-C028-4518-B420-27C3E4582D0C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.AccessControl</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims-net_4_x.csproj b/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims-net_4_x.csproj
new file mode 100644
index 00000000000..341cad800ee
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{4874E167-6B23-4FD6-B51D-048417A8054B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Claims</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes-net_4_x.csproj
new file mode 100644
index 00000000000..3c274abb796
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{DB39DD76-4609-45D1-9615-57D4E436D7F1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.DeriveBytes</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding-net_4_x.csproj
new file mode 100644
index 00000000000..20640b091c8
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{8B19E0DB-E0EA-4BED-B4E7-AED8A4ED0C62}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.Encoding</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes-net_4_x.csproj
new file mode 100644
index 00000000000..a523ca99263
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{38BA78A4-9614-4000-80A7-DFCE31F10721}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.Encryption.Aes</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman-net_4_x.csproj
new file mode 100644
index 00000000000..268dc0f5926
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{6499F7E3-64F3-495B-9900-E2D0AD47414F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.Encryption.ECDiffieHellman</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa-net_4_x.csproj
new file mode 100644
index 00000000000..1608821c77b
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{EFA0AABF-7830-4804-A92D-F6F31F86B826}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.Encryption.ECDsa</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption-net_4_x.csproj
new file mode 100644
index 00000000000..c331d66a40a
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{EDF9D7E8-5BAC-4264-BB98-1AE586B0A889}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.Encryption</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms-net_4_x.csproj
new file mode 100644
index 00000000000..098c162409a
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{0DBEDE3A-F06D-4C61-89DF-193C13393F7A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.Hashing.Algorithms</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing-net_4_x.csproj
new file mode 100644
index 00000000000..9865a1540f8
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{C48B1038-4774-4D49-9D34-79DBBA725AA0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.Hashing</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData-net_4_x.csproj
new file mode 100644
index 00000000000..53e18fa4825
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{66B88E44-F7DA-4C83-B028-A49D4D3EBD16}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.ProtectedData</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Security/System.Security-net_4_x.csproj">
+      <Project>{3ED36717-A9D1-4289-8949-9B7F39766DEB}</Project>
+      <Name>System.Security-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA-net_4_x.csproj
new file mode 100644
index 00000000000..1f6584376e9
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{18EE2788-AC59-4A0C-A902-C6B64D285BB6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.RSA</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator-net_4_x.csproj
new file mode 100644
index 00000000000..3b0e5112389
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{C87878D2-CDEF-4EC9-8C94-C1381144F4EC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.RandomNumberGenerator</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates-net_4_x.csproj
new file mode 100644
index 00000000000..0a126a61c73
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{C2E71C2B-A806-4FEB-AE2D-A5BE884E3BA7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Cryptography.X509Certificates</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows-net_4_x.csproj b/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows-net_4_x.csproj
new file mode 100644
index 00000000000..18aa2ae6185
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{47977802-4193-48DC-AA0F-58D18AEDA405}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Principal.Windows</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal-net_4_x.csproj b/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal-net_4_x.csproj
new file mode 100644
index 00000000000..53c26f634d1
--- /dev/null
+++ b/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{9040CA8B-4352-4621-A2B3-5C32A383DE15}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.Principal</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj
new file mode 100644
index 00000000000..7e2fc1e0a86
--- /dev/null
+++ b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{57C02AD3-1118-4982-BCE3-53158D30F4E9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Security.SecureString</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex-net_4_x.csproj b/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex-net_4_x.csproj
new file mode 100644
index 00000000000..3a098dcdfc2
--- /dev/null
+++ b/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{DE25A333-91AE-4F33-B483-A01D1D3D1675}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ServiceModel.Duplex</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_x.csproj">
+      <Project>{FE596C31-BDA2-4850-8F79-F8F4DF70F44A}</Project>
+      <Name>System.ServiceModel-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http-net_4_x.csproj b/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http-net_4_x.csproj
new file mode 100644
index 00000000000..d830d0e0843
--- /dev/null
+++ b/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{4EE0B25C-F7D7-40A9-AE37-5B874791D3C1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ServiceModel.Http</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_x.csproj">
+      <Project>{FE596C31-BDA2-4850-8F79-F8F4DF70F44A}</Project>
+      <Name>System.ServiceModel-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp-net_4_x.csproj b/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp-net_4_x.csproj
new file mode 100644
index 00000000000..0b25b6be19e
--- /dev/null
+++ b/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{0F83D60D-5AAA-425C-BC4E-01CA2018905C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ServiceModel.NetTcp</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_x.csproj">
+      <Project>{FE596C31-BDA2-4850-8F79-F8F4DF70F44A}</Project>
+      <Name>System.ServiceModel-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives-net_4_x.csproj b/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives-net_4_x.csproj
new file mode 100644
index 00000000000..1508ff5d41a
--- /dev/null
+++ b/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{524B10FC-880D-4131-8CAE-027BC3A68B6F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ServiceModel.Primitives</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_x.csproj">
+      <Project>{FE596C31-BDA2-4850-8F79-F8F4DF70F44A}</Project>
+      <Name>System.ServiceModel-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security-net_4_x.csproj b/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security-net_4_x.csproj
new file mode 100644
index 00000000000..05cafee86eb
--- /dev/null
+++ b/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{F937A550-0A4A-4A10-9FD9-E8DE7696671F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ServiceModel.Security</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_x.csproj">
+      <Project>{FE596C31-BDA2-4850-8F79-F8F4DF70F44A}</Project>
+      <Name>System.ServiceModel-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController-net_4_x.csproj b/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController-net_4_x.csproj
new file mode 100644
index 00000000000..4eedc26e62d
--- /dev/null
+++ b/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{8C71A924-2561-434B-A792-2F84ABA1C0C2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.ServiceProcess.ServiceController</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.ServiceProcess/System.ServiceProcess-net_4_x.csproj">
+      <Project>{CF24A609-AEF3-4E7A-95FC-C7A3CEAA7CC3}</Project>
+      <Name>System.ServiceProcess-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions-net_4_x.csproj b/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions-net_4_x.csproj
new file mode 100644
index 00000000000..c478e7918cc
--- /dev/null
+++ b/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{28CEA696-8466-4826-9128-B83318184EF4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Text.Encoding.Extensions</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding-net_4_x.csproj b/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding-net_4_x.csproj
new file mode 100644
index 00000000000..5c8474d8caa
--- /dev/null
+++ b/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{0CD67EE4-42D8-43A6-880F-2C038E368C98}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Text.Encoding</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions-net_4_x.csproj b/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions-net_4_x.csproj
new file mode 100644
index 00000000000..3128965240d
--- /dev/null
+++ b/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{490EF039-5913-4181-84CD-1F882968FC8C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Text.RegularExpressions</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj
new file mode 100644
index 00000000000..2a7daad7c16
--- /dev/null
+++ b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{FB663BC8-162E-43E7-9674-ECD2BEE82CC1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Threading.AccessControl</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped-net_4_x.csproj b/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped-net_4_x.csproj
new file mode 100644
index 00000000000..00de778e120
--- /dev/null
+++ b/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{E8BFEFD2-AAB9-45E6-8523-1F6AEB1918A2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Threading.Overlapped</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel-net_4_x.csproj b/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel-net_4_x.csproj
new file mode 100644
index 00000000000..70915d9a5db
--- /dev/null
+++ b/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{0F8CA9A9-62A4-4829-925E-002F0B93EE79}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Threading.Tasks.Parallel</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks-net_4_x.csproj b/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks-net_4_x.csproj
new file mode 100644
index 00000000000..3052af6fdcd
--- /dev/null
+++ b/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{F322318E-D053-45C9-AFDF-2AEEE1E0E006}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Threading.Tasks</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread-net_4_x.csproj b/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread-net_4_x.csproj
new file mode 100644
index 00000000000..58a1e3e48a4
--- /dev/null
+++ b/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{4D9EF694-5260-432D-BA34-503FFBE43B6C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Threading.Thread</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool-net_4_x.csproj b/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool-net_4_x.csproj
new file mode 100644
index 00000000000..081c415cfe0
--- /dev/null
+++ b/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{95B411AA-B13F-4621-B020-7F797E1F39F0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Threading.ThreadPool</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer-net_4_x.csproj b/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer-net_4_x.csproj
new file mode 100644
index 00000000000..a0450e1ff2d
--- /dev/null
+++ b/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{30F7C900-122A-42A6-9669-D5606B9105A5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Threading.Timer</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Threading/Facades_System.Threading-net_4_x.csproj b/mcs/class/Facades/System.Threading/Facades_System.Threading-net_4_x.csproj
new file mode 100644
index 00000000000..0b49733d39b
--- /dev/null
+++ b/mcs/class/Facades/System.Threading/Facades_System.Threading-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{35258CFB-0308-493D-B2BD-B044EAFD5AD1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Threading</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Core/System.Core-net_4_x.csproj">
+      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
+      <Name>System.Core-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter-net_4_x.csproj b/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter-net_4_x.csproj
new file mode 100644
index 00000000000..b607038b511
--- /dev/null
+++ b/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{2C447238-E7CE-4AF2-9A6C-EDC8E02E554B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Xml.ReaderWriter</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument-net_4_x.csproj b/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument-net_4_x.csproj
new file mode 100644
index 00000000000..6dfebc018ae
--- /dev/null
+++ b/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{D8643E47-F2D5-447B-840B-25FEB84C9EEC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Xml.XDocument</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Xml.Linq/System.Xml.Linq-net_4_x.csproj">
+      <Project>{526286D5-38D9-4579-B001-471440D57752}</Project>
+      <Name>System.Xml.Linq-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument-net_4_x.csproj b/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument-net_4_x.csproj
new file mode 100644
index 00000000000..6fe69f7e13d
--- /dev/null
+++ b/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{38F046A2-EEBD-4FE7-B70E-636F5DB4BBF3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Xml.XPath.XDocument</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Xml.Linq/System.Xml.Linq-net_4_x.csproj">
+      <Project>{526286D5-38D9-4579-B001-471440D57752}</Project>
+      <Name>System.Xml.Linq-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath-net_4_x.csproj b/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath-net_4_x.csproj
new file mode 100644
index 00000000000..fcddfd588d8
--- /dev/null
+++ b/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{5C3F0B44-E169-4441-91F9-7285048F4946}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Xml.XPath</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument-net_4_x.csproj b/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument-net_4_x.csproj
new file mode 100644
index 00000000000..adc60f7e829
--- /dev/null
+++ b/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{D7F840DE-EDFD-4DB5-ACDB-9328AB7E6C6C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Xml.XmlDocument</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer-net_4_x.csproj b/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer-net_4_x.csproj
new file mode 100644
index 00000000000..c4df512148f
--- /dev/null
+++ b/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer-net_4_x.csproj
@@ -0,0 +1,94 @@
+<?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>{E95FA58F-8086-45FF-8BD3-5A1FAF776709}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Xml.XmlSerializer</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives-net_4_x.csproj b/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives-net_4_x.csproj
new file mode 100644
index 00000000000..3e95b77fbd1
--- /dev/null
+++ b/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives-net_4_x.csproj
@@ -0,0 +1,98 @@
+<?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>{653C4BDE-F194-4A4F-A1CE-1FF955DE43D6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
+    <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Xml.Xsl.Primitives</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <NoWarn>1699,1616,1699</NoWarn>
+    <Optimize>true</Optimize>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/I18N/CJK/I18N.CJK-net_4_x.csproj b/mcs/class/I18N/CJK/I18N.CJK-net_4_x.csproj
index 15b009c9590..c6c9d3a44bb 100644
--- a/mcs/class/I18N/CJK/I18N.CJK-net_4_x.csproj
+++ b/mcs/class/I18N/CJK/I18N.CJK-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -67,15 +70,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/I18N/Common/I18N-net_4_x.csproj b/mcs/class/I18N/Common/I18N-net_4_x.csproj
index 8bbb45cf7f9..75ff7a5aac9 100644
--- a/mcs/class/I18N/Common/I18N-net_4_x.csproj
+++ b/mcs/class/I18N/Common/I18N-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -63,15 +66,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/I18N/MidEast/I18N.MidEast-net_4_x.csproj b/mcs/class/I18N/MidEast/I18N.MidEast-net_4_x.csproj
index 21884dd3fbf..1afa51aef32 100644
--- a/mcs/class/I18N/MidEast/I18N.MidEast-net_4_x.csproj
+++ b/mcs/class/I18N/MidEast/I18N.MidEast-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -62,15 +65,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/I18N/Other/I18N.Other-net_4_x.csproj b/mcs/class/I18N/Other/I18N.Other-net_4_x.csproj
index 896c1475e7d..824b31774d5 100644
--- a/mcs/class/I18N/Other/I18N.Other-net_4_x.csproj
+++ b/mcs/class/I18N/Other/I18N.Other-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -64,15 +67,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/I18N/Rare/I18N.Rare-net_4_x.csproj b/mcs/class/I18N/Rare/I18N.Rare-net_4_x.csproj
index 124e9588822..abde280e27d 100644
--- a/mcs/class/I18N/Rare/I18N.Rare-net_4_x.csproj
+++ b/mcs/class/I18N/Rare/I18N.Rare-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -92,15 +95,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/I18N/West/I18N.West-net_4_x.csproj b/mcs/class/I18N/West/I18N.West-net_4_x.csproj
index 60341bd6478..95900687116 100644
--- a/mcs/class/I18N/West/I18N.West-net_4_x.csproj
+++ b/mcs/class/I18N/West/I18N.West-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -70,15 +73,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_x.csproj b/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_x.csproj
index e141796aea1..1479ae7ddb8 100644
--- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_x.csproj
+++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -78,15 +81,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_x.csproj b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_x.csproj
index 7fdb5a0385f..6f7047f15c0 100644
--- a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_x.csproj
+++ b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -103,15 +106,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
index 005752baf98..fb545562ffa 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
@@ -1035,7 +1035,7 @@ namespace Microsoft.Build.BuildEngine {
 			evaluatedProperties.AddProperty (new BuildProperty ("OS", OS, PropertyType.Environment));
 #if XBUILD_12
 			// see http://msdn.microsoft.com/en-us/library/vstudio/hh162058(v=vs.120).aspx
-			if (effective_tools_version == "12.0") {
+			if (effective_tools_version == "12.0" || effective_tools_version == "14.0") {
 				evaluatedProperties.AddProperty (new BuildProperty ("MSBuildToolsPath32", toolsPath, PropertyType.Reserved));
 
 				var frameworkToolsPath = ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version451);
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_x.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_x.csproj
index b7afd2cd670..652aab45f53 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_x.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -130,15 +133,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -169,18 +171,6 @@
       <Project>{8E5728E0-CEAF-431F-963E-EB1DEE15C506}</Project>
       <Name>Microsoft.Build.Utilities-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System/System-net_4_x.csproj">
-      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
-      <Name>System-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.Core/System.Core-net_4_x.csproj">
-      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
-      <Name>System.Core-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.XML/System.Xml-net_4_x.csproj">
-      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
-      <Name>System.Xml-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_x.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_x.csproj
index d2a2cd77392..ad57c7d514e 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_x.csproj
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -115,15 +118,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -138,10 +140,6 @@
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System/System-net_4_x.csproj">
-      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
-      <Name>System-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_x.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_x.csproj
index 9bd62c80a9d..d051dbefb94 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_x.csproj
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -175,15 +178,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -226,22 +228,6 @@
       <Project>{3FA2C1F8-62D9-421D-8EEE-B4E651B8588C}</Project>
       <Name>Mono.XBuild.Tasks-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System/System-net_4_x.csproj">
-      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
-      <Name>System-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.Core/System.Core-net_4_x.csproj">
-      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
-      <Name>System.Core-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.XML/System.Xml-net_4_x.csproj">
-      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
-      <Name>System.Xml-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_x.csproj">
-      <Project>{108227C7-8ED9-4483-949D-07BF0DA1A201}</Project>
-      <Name>System.Windows.Forms-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
index f5758df8e1f..3bdf7111df8 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
@@ -128,6 +128,10 @@ namespace Microsoft.Build.Tasks {
 			relatedFiles = tempRelatedFiles.Values.ToArray ();
 			resolvedDependencyFiles = tempResolvedDepFiles.Values.ToArray ();
 
+#if XBUILD_14
+			DependsOnSystemRuntime = resolvedDependencyFiles.Any (x => Path.GetFileName (x.ItemSpec) == "System.Runtime.dll").ToString ();
+#endif
+
 			tempResolvedFiles.Clear ();
 			tempCopyLocalFiles.Clear ();
 			tempSatelliteFiles.Clear ();
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_x.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_x.csproj
index 87290f52837..1e5e1913b43 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_x.csproj
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -75,15 +78,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -110,18 +112,6 @@
       <Project>{5E39A911-F4E6-4B4B-B8AC-111BB1DD80C6}</Project>
       <Name>Microsoft.Build.Framework-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System/System-net_4_x.csproj">
-      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
-      <Name>System-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.Core/System.Core-net_4_x.csproj">
-      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
-      <Name>System.Core-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.XML/System.Xml-net_4_x.csproj">
-      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
-      <Name>System.Xml-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ProcessWrapper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ProcessWrapper.cs
index 1674ff8b5dc..ddd58939912 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ProcessWrapper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ProcessWrapper.cs
@@ -74,6 +74,7 @@ namespace Microsoft.Build.Utilities
 		public void WaitForOutput (int milliseconds)
 		{
 			CheckDisposed ();
+			WaitForExit (milliseconds);
 			WaitHandle.WaitAll (new WaitHandle[] { endEventOut, endEventErr, endEventExit }, milliseconds);
 		}
 
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj b/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
index 7b8f9830f2b..24dd6dd3751 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
+++ b/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -163,15 +166,16 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.jay > $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.cs
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.jay > $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.cs
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -202,26 +206,6 @@
       <Project>{5E39A911-F4E6-4B4B-B8AC-111BB1DD80C6}</Project>
       <Name>Microsoft.Build.Framework-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System/System-net_4_x.csproj">
-      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
-      <Name>System-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.Core/System.Core-net_4_x.csproj">
-      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
-      <Name>System.Core-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.XML/System.Xml-net_4_x.csproj">
-      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
-      <Name>System.Xml-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_x.csproj">
-      <Project>{75DFF196-FA56-48CD-9A1A-CEA3BEC618AB}</Project>
-      <Name>Microsoft.Build.Engine-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_x.csproj">
-      <Project>{5E39A911-F4E6-4B4B-B8AC-111BB1DD80C6}</Project>
-      <Name>Microsoft.Build.Framework-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_x.csproj b/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_x.csproj
index 84ec489f37a..4b2bc7d98a7 100644
--- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_x.csproj
+++ b/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -79,15 +82,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_x.csproj b/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_x.csproj
index 9bd3a2ab82c..8fe58e637bd 100644
--- a/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_x.csproj
+++ b/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -66,15 +69,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
index 498cf09f808..4b6ac0cc472 100644
--- a/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
@@ -43,7 +43,6 @@ using System.Security;
 [assembly: ComVisible (false)]
 [assembly: AssemblyFileVersion ("1.0.20105.407")]
 [assembly: AssemblyVersion ("1.0.0.0")]
-[assembly: TargetFramework (".NETFramework,Version=v4.0", FrameworkDisplayName=".NET Framework 4")]
 [assembly: AllowPartiallyTrustedCallers]
 [assembly: CompilationRelaxations (8)]
 [assembly: AssemblyTitle ("Microsoft.Web.Infrastructure")]
diff --git a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj
index f85b1433aca..e68b8bf4ab6 100644
--- a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj
+++ b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -62,15 +65,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.C5/Mono.C5-net_4_x.csproj b/mcs/class/Mono.C5/Mono.C5-net_4_x.csproj
index 7db3bcbeead..1f86305857f 100644
--- a/mcs/class/Mono.C5/Mono.C5-net_4_x.csproj
+++ b/mcs/class/Mono.C5/Mono.C5-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -86,15 +89,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj
index b36796d2439..36c99153b49 100644
--- a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -111,15 +114,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.CSharp/Test/Evaluator/ExpressionsTest.cs b/mcs/class/Mono.CSharp/Test/Evaluator/ExpressionsTest.cs
index 74fc4a03cf2..8c414dad79f 100644
--- a/mcs/class/Mono.CSharp/Test/Evaluator/ExpressionsTest.cs
+++ b/mcs/class/Mono.CSharp/Test/Evaluator/ExpressionsTest.cs
@@ -120,7 +120,8 @@ namespace MonoTests.EvaluatorTest
 			Evaluator.Run ("var a = new int[]{1,2,3};");
 
 			object res = Evaluator.Evaluate ("from x in a select x + 1;");
-			CollectionAssert.AreEqual (new int[] { 2, 3, 4 }, ((IEnumerable<int>) res).ToArray ());
+
+			Assert.AreEqual (new int[] { 2, 3, 4 }, ((IEnumerable<int>) res).ToArray ());
 		}
 
 		[Test]
@@ -201,4 +202,4 @@ namespace MonoTests.EvaluatorTest
 		}
 
 	}
-}
-\ No newline at end of file
+}
diff --git a/mcs/class/Mono.Cairo/Mono.Cairo-net_4_x.csproj b/mcs/class/Mono.Cairo/Mono.Cairo-net_4_x.csproj
index 424e9aa068b..51868debb9f 100644
--- a/mcs/class/Mono.Cairo/Mono.Cairo-net_4_x.csproj
+++ b/mcs/class/Mono.Cairo/Mono.Cairo-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -109,15 +112,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_x.csproj b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_x.csproj
index 1eb2e95230a..c4aee220b49 100644
--- a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_x.csproj
+++ b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -65,15 +68,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Cecil/Mono.Cecil-net_4_x.csproj b/mcs/class/Mono.Cecil/Mono.Cecil-net_4_x.csproj
index 874426343ba..f1cbfb1d8fe 100644
--- a/mcs/class/Mono.Cecil/Mono.Cecil-net_4_x.csproj
+++ b/mcs/class/Mono.Cecil/Mono.Cecil-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -185,15 +188,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_x.csproj b/mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_x.csproj
index bf01a814a9e..e2169fc9aeb 100644
--- a/mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_x.csproj
+++ b/mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -430,15 +433,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_x.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_x.csproj
index c39e13e6255..0b59fa3d3c9 100644
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_x.csproj
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -61,15 +64,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Data.Sqlite/Makefile b/mcs/class/Mono.Data.Sqlite/Makefile
index a5453d47d27..35eb5c1bb81 100644
--- a/mcs/class/Mono.Data.Sqlite/Makefile
+++ b/mcs/class/Mono.Data.Sqlite/Makefile
@@ -42,5 +42,5 @@ $(PREBUILT): %.prebuilt: %
 	cp $* $@
 
 $(RESX_RESOURCES): %.resources: %.resx
-	$(RESGEN) $< || cp $@.prebuilt $@
+	$(RESGEN) -useSourcePath $< || cp $@.prebuilt $@
 
diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
index a6f0c58e77d..7a1ee0ced12 100644
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -85,15 +88,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -125,7 +127,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="resources/SR.resources">
+    <EmbeddedResource Include="resources/SR.resources.prebuilt">
       <LogicalName>SR.resources</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="resources/SQLiteCommand.bmp">
diff --git a/mcs/class/Mono.Data.Sqlite/Test/SqliteDataReaderTest.cs b/mcs/class/Mono.Data.Sqlite/Test/SqliteDataReaderTest.cs
index 5fc27764535..262c68e191d 100644
--- a/mcs/class/Mono.Data.Sqlite/Test/SqliteDataReaderTest.cs
+++ b/mcs/class/Mono.Data.Sqlite/Test/SqliteDataReaderTest.cs
@@ -178,7 +178,7 @@ namespace MonoTests.Mono.Data.Sqlite
 			}
 		}
 
-		void AddParameter (System.Data.Common.DbCommand cm, string name, object value)
+		void AddParameter (global::System.Data.Common.DbCommand cm, string name, object value)
 		{
 			var param = cm.CreateParameter ();
 			param.ParameterName = ":" + name;
diff --git a/mcs/class/Mono.Data.Sqlite/Test/SqliteParameterUnitTests.cs b/mcs/class/Mono.Data.Sqlite/Test/SqliteParameterUnitTests.cs
index 7f6af225caf..b03b61a4867 100644
--- a/mcs/class/Mono.Data.Sqlite/Test/SqliteParameterUnitTests.cs
+++ b/mcs/class/Mono.Data.Sqlite/Test/SqliteParameterUnitTests.cs
@@ -61,7 +61,7 @@ namespace MonoTests.Mono.Data.Sqlite
 			textP.Value=builder.ToString();
 			floatP.Value=Convert.ToInt64(random.Next(999));
 			integerP.Value=random.Next(999);
-			blobP.Value=System.Text.Encoding.UTF8.GetBytes("\u05D0\u05D1\u05D2" + builder.ToString());
+			blobP.Value=global::System.Text.Encoding.UTF8.GetBytes("\u05D0\u05D1\u05D2" + builder.ToString());
 			
 			SqliteCommand selectCmd = new SqliteCommand("SELECT * from t1", _conn);
 
@@ -79,7 +79,7 @@ namespace MonoTests.Mono.Data.Sqlite
 					
 					object compareValue;
 					if (blobP.Value is byte[])
-						compareValue = System.Text.Encoding.UTF8.GetString ((byte[])blobP.Value);
+						compareValue = global::System.Text.Encoding.UTF8.GetString ((byte[])blobP.Value);
 					else
 						compareValue = blobP.Value;
 					Assert.AreEqual(reader["b"], compareValue);
diff --git a/mcs/class/Mono.Data.Sqlite/monodroid_Mono.Data.Sqlite_test.dll.exclude.sources b/mcs/class/Mono.Data.Sqlite/monodroid_Mono.Data.Sqlite_test.dll.exclude.sources
new file mode 100644
index 00000000000..cc310ba93b0
--- /dev/null
+++ b/mcs/class/Mono.Data.Sqlite/monodroid_Mono.Data.Sqlite_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monodroid_Mono.Data.Sqlite_test.dll.new-exclude.sources
diff --git a/mcs/class/Mono.Data.Sqlite/monodroid_Mono.Data.Sqlite_test.dll.new-exclude.sources b/mcs/class/Mono.Data.Sqlite/monodroid_Mono.Data.Sqlite_test.dll.new-exclude.sources
new file mode 100644
index 00000000000..99a8ffef646
--- /dev/null
+++ b/mcs/class/Mono.Data.Sqlite/monodroid_Mono.Data.Sqlite_test.dll.new-exclude.sources
@@ -0,0 +1,2 @@
+SqliteDataReaderTest.cs
+SqliteParameterUnitTests.cs
diff --git a/mcs/class/Mono.Data.Sqlite/monodroid_Mono.Data.Sqlite_test.dll.sources b/mcs/class/Mono.Data.Sqlite/monodroid_Mono.Data.Sqlite_test.dll.sources
new file mode 100644
index 00000000000..80f57882c50
--- /dev/null
+++ b/mcs/class/Mono.Data.Sqlite/monodroid_Mono.Data.Sqlite_test.dll.sources
@@ -0,0 +1 @@
+#include Mono.Data.Sqlite_test.dll.sources
diff --git a/mcs/class/Mono.Data.Sqlite/resources/SR.resx b/mcs/class/Mono.Data.Sqlite/resources/SR.resx
index 9851beb1a81..082a3e024a7 100644
--- a/mcs/class/Mono.Data.Sqlite/resources/SR.resx
+++ b/mcs/class/Mono.Data.Sqlite/resources/SR.resx
@@ -119,12 +119,12 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="DataTypes" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>resources/DataTypes.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>DataTypes.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="Keywords" xml:space="preserve">
     <value>ALL,ALTER,AND,AS,AUTOINCREMENT,BETWEEN,BY,CASE,CHECK,COLLATE,COMMIT,CONSTRAINT,CREATE,CROSS,DEFAULT,DEFERRABLE,DELETE,DISTINCT,DROP,ELSE,ESCAPE,EXCEPT,FOREIGN,FROM,FULL,GROUP,HAVING,IN,INDEX,INNER,INSERT,INTERSECT,INTO,IS,ISNULL,JOIN,LEFT,LIMIT,NATURAL,NOT,NOTNULL,NULL,ON,OR,ORDER,OUTER,PRIMARY,REFERENCES,RIGHT,ROLLBACK,SELECT,SET,TABLE,THEN,TO,TRANSACTION,UNION,UNIQUE,UPDATE,USING,VALUES,WHEN,WHERE</value>
   </data>
   <data name="MetaDataCollections" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>resources/MetaDataCollections.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>MetaDataCollections.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
-</root>
-\ No newline at end of file
+</root>
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_x.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_x.csproj
index 1e85a5b2f67..a1b59026c1d 100644
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_x.csproj
+++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -91,15 +94,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_x.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_x.csproj
index 9af797177d0..51d78f17c2f 100644
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_x.csproj
+++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -134,15 +137,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs
index 150738e6633..4b9d569b1ad 100644
--- a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs
+++ b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs
@@ -419,6 +419,9 @@ public class Tests : TestsBase, ITest2
 		ss_step_through ();
 		ss_non_user_code ();
 		ss_recursive (1);
+		ss_recursive2 (1);
+		ss_recursive2 (1);
+		ss_recursive_chaotic ();
 		ss_fp_clobber ();
 	}
 
@@ -568,6 +571,92 @@ public class Tests : TestsBase, ITest2
 		ss_recursive (n + 1);
 	}
 
+	// Breakpoint will be placed here
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_recursive2_trap ()
+	{
+	}
+
+	public static void ss_recursive2_at (string s)
+	{
+		// Console.WriteLine (s);
+	}
+
+	// This method is used both for a step over and step out test.
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_recursive2 (int x)
+	{
+		ss_recursive2_at ( "ss_recursive2 in " + x);
+		if (x < 5) {
+			int next = x + 1;
+			ss_recursive2_at ("ss_recursive2 descend " + x);
+			ss_recursive2_trap ();
+			ss_recursive2 (next);
+		}
+		ss_recursive2_at ("ss_recursive2 out " + x);
+	}
+
+	// Breakpoint will be placed here
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_recursive_chaotic_trap ()
+	{
+	}
+
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_recursive_chaotic_at (bool exiting, string at, int n)
+	{
+//		string indent = "";
+//		for (int count = 5 - n; count > 0; count--)
+//			indent += "\t";
+//		Console.WriteLine (indent + (exiting ? "<--" : "-->") + " " + at + " " + n);
+	}
+
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_recursive_chaotic_fizz (int n)
+	{
+		ss_recursive_chaotic_at (false, "fizz", n);
+		if (n > 0) {
+			int next = n - 1;
+			ss_recursive_chaotic_buzz (next);
+			ss_recursive_chaotic_fizzbuzz (next);
+		} else {
+			ss_recursive_chaotic_trap ();
+		}
+		ss_recursive_chaotic_at (true, "fizz", n);
+	}
+
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_recursive_chaotic_buzz (int n)
+	{
+		ss_recursive_chaotic_at (false, "buzz", n);
+		if (n > 0) {
+			int next = n - 1;
+			ss_recursive_chaotic_fizz (next);
+			ss_recursive_chaotic_fizzbuzz (next);
+		}
+		ss_recursive_chaotic_at (true, "buzz", n);
+	}
+
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_recursive_chaotic_fizzbuzz (int n)
+	{
+		ss_recursive_chaotic_at (false, "fizzbuzz", n);
+		if (n > 0) {
+			int next = n - 1;
+			ss_recursive_chaotic_fizz (next);
+			ss_recursive_chaotic_buzz (next);
+			ss_recursive_chaotic_fizzbuzz (next);
+		}
+		ss_recursive_chaotic_at (true, "fizzbuzz", n);
+	}
+
+	// Call a complex tree of recursive calls that has tripped up "step out" in the past.
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_recursive_chaotic ()
+	{
+		ss_recursive_chaotic_fizz (5);
+	}
+
 	[MethodImplAttribute (MethodImplOptions.NoInlining)]
 	public static void ss_fp_clobber () {
 		double v = ss_fp_clobber_1 (5.0);
diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs
index 086c6f5f9aa..c0af12cb38a 100644
--- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs
+++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs
@@ -42,6 +42,17 @@ public class DebuggerTests
 	public static string runtime = Environment.GetEnvironmentVariable ("DBG_RUNTIME");
 	public static string agent_args = Environment.GetEnvironmentVariable ("DBG_AGENT_ARGS");
 
+	// Not currently used, but can be useful when debugging individual tests.
+	void StackTraceDump (Event e)
+	{
+		int i = 0;
+		foreach (var frame in e.Thread.GetFrames ())
+		{
+			i++;
+			Console.WriteLine ("Frame " + i + ", " + frame.Method.Name);
+		}
+	}
+
 	Event GetNextEvent () {
 		var es = vm.GetNextEventSet ();
 		Assert.AreEqual (1, es.Events.Length);
@@ -124,6 +135,140 @@ public class DebuggerTests
 		return (e as BreakpointEvent);
 	}
 
+	class ReusableBreakpoint {
+		DebuggerTests owner;
+		public string method_name;
+		public BreakpointEventRequest req;
+		public BreakpointEvent lastEvent = null;
+		public ReusableBreakpoint (DebuggerTests owner, string method_name)
+		{
+			this.owner = owner;
+			this.method_name = method_name;
+			MethodMirror m = owner.entry_point.DeclaringType.GetMethod (method_name);
+			Assert.IsNotNull (m);
+			req = owner.vm.SetBreakpoint (m, m.ILOffsets [0]);
+		}
+
+		public void Continue ()
+		{
+			bool survived = false;
+
+			try {
+				Event e = null;
+
+				while (true) {
+					owner.vm.Resume ();
+					e = owner.GetNextEvent ();
+					if (e is BreakpointEvent)
+						break;
+				}
+
+				Assert.IsInstanceOfType (typeof (BreakpointEvent), e);
+				Assert.AreEqual (method_name, (e as BreakpointEvent).Method.Name);
+
+				lastEvent = e as BreakpointEvent;
+
+				survived = true;
+			} finally {
+				if (!survived) { // Ensure cleanup if we triggered an assert
+					Disable ();
+				}
+			}
+		}
+
+		public void Disable ()
+		{
+			req.Disable ();
+		}
+	}
+
+	/* One of the tests executes a complex tree of recursive functions.
+	   The only good way to specify how its behavior should appear from this side
+	   is to just run the function tree once over here and record what it does. */
+	public struct RecursiveChaoticPoint
+	{
+		public bool breakpoint;
+		public string name;
+		public int depth;
+
+		public RecursiveChaoticPoint (bool breakpoint, string name, int depth)
+		{
+			this.breakpoint = breakpoint;
+			this.name = name;
+			this.depth = depth;
+		}
+	}
+
+	// The breakpoint is placed here in dtest-app.cs
+	public static void ss_recursive_chaotic_trap (int n, List<RecursiveChaoticPoint> trace, ref bool didLast, ref bool didAny)
+	{
+		// Depth is calculated as:
+		// Main + single_stepping + ss_recursive_chaotic + (n is 5 at outermost frame and 0 at innermost frame) + ss_recursive_chaotic_trap
+		trace.Add (new RecursiveChaoticPoint (true, "ss_recursive_chaotic_trap", 5 - n + 5));
+		didLast = true;
+	}
+
+	public static void ss_recursive_chaotic_at (string at, int n, List<RecursiveChaoticPoint> trace, ref bool didLast, ref bool didAny)
+	{
+		// This will be called after every return from a function. The other function will return whether "step out" is currently active, and it will be passed in here as didLast.
+		if (didLast) {
+			// Depth is calculated as:
+			// Main + single_stepping + ss_recursive_chaotic + (n is 5 at outermost frame and 0 at innermost frame)
+			trace.Add (new RecursiveChaoticPoint (false, "ss_recursive_chaotic_" + at, 5 - n + 4));
+			didAny = true;
+			didLast = false;
+		}
+	}
+
+	public static bool ss_recursive_chaotic_fizz (int n, List<RecursiveChaoticPoint> trace)
+	{
+		bool didLast = false, didAny = false;
+		if (n > 0) {
+			int next = n - 1;
+			didLast = ss_recursive_chaotic_buzz (next, trace);
+			ss_recursive_chaotic_at ("fizz", n, trace, ref didLast, ref didAny);
+			didLast = ss_recursive_chaotic_fizzbuzz (next, trace);
+			ss_recursive_chaotic_at ("fizz", n, trace, ref didLast, ref didAny);
+		} else {
+			ss_recursive_chaotic_trap (n, trace, ref didLast, ref didAny);
+			ss_recursive_chaotic_at ("fizz", n, trace, ref didLast, ref didAny);
+		}
+		return didAny;
+	}
+
+	public static bool ss_recursive_chaotic_buzz (int n, List<RecursiveChaoticPoint> trace)
+	{
+		bool didLast = false, didAny = false;
+		if (n > 0) {
+			int next = n - 1;
+			didLast = ss_recursive_chaotic_fizz (next, trace);
+			ss_recursive_chaotic_at ("buzz", n, trace, ref didLast, ref didAny);
+			didLast = ss_recursive_chaotic_fizzbuzz (next, trace);
+			ss_recursive_chaotic_at ("buzz", n, trace, ref didLast, ref didAny);
+		}
+		return didAny;
+	}
+
+	public static bool ss_recursive_chaotic_fizzbuzz (int n, List<RecursiveChaoticPoint> trace)
+	{
+		bool didLast = false, didAny = false;
+		if (n > 0) {
+			int next = n - 1;
+			didLast = ss_recursive_chaotic_fizz (next, trace);
+			ss_recursive_chaotic_at ("fizzbuzz", n, trace, ref didLast, ref didAny);
+			didLast = ss_recursive_chaotic_buzz (next, trace);
+			ss_recursive_chaotic_at ("fizzbuzz", n, trace, ref didLast, ref didAny);
+			didLast = ss_recursive_chaotic_fizzbuzz (next, trace);
+			ss_recursive_chaotic_at ("fizzbuzz", n, trace, ref didLast, ref didAny);
+		}
+		return didAny;
+	}
+
+	public static void trace_ss_recursive_chaotic (List<RecursiveChaoticPoint> trace)
+	{
+		ss_recursive_chaotic_fizz (5, trace);
+	}
+
 	Event single_step (ThreadMirror t) {
 		var req = vm.CreateStepRequest (t);
 		req.Enable ();
@@ -372,11 +517,28 @@ public class DebuggerTests
 		Assert.AreEqual (m2.Name, (e as BreakpointEvent).Method.Name);
 	}
 
+	// Assert we have stepped to a location
 	void assert_location (Event e, string method) {
 		Assert.IsTrue (e is StepEvent);
 		Assert.AreEqual (method, (e as StepEvent).Method.Name);
 	}
 
+	// Assert we have breakpointed at a location
+	void assert_location_at_breakpoint (Event e, string method) {
+		Assert.IsTrue (e is BreakpointEvent);
+		Assert.AreEqual (method, (e as BreakpointEvent).Method.Name);
+	}
+
+	// Assert we have stepped to or breakpointed at a location
+	void assert_location_allow_breakpoint (Event e, string method) {
+		if (e is StepEvent)
+			Assert.AreEqual (method, (e as StepEvent).Method.Name);
+		else if (e is BreakpointEvent)
+			Assert.AreEqual (method, (e as BreakpointEvent).Method.Name);
+		else
+			Assert.Fail ("Neither step nor breakpoint event");
+	}
+
 	StepEventRequest create_step (Event e) {
 		var req = vm.CreateStepRequest (e.Thread);
 		step_req = req;
@@ -624,6 +786,95 @@ public class DebuggerTests
 		AssertValue (1, f.GetValue (f.Method.GetLocal ("n")));
 		req.Disable ();
 
+		// Check that step-over stops correctly when inner frames with recursive functions contain breakpoints
+		e = run_until ("ss_recursive2");
+		ReusableBreakpoint breakpoint = new ReusableBreakpoint (this, "ss_recursive2_trap");
+		try {
+			breakpoint.Continue ();
+			e = breakpoint.lastEvent;
+			req = create_step (e);
+			for (int c = 1; c <= 4; c++) {
+				// The first five times we try to step over this function, the breakpoint will stop us
+				assert_location_at_breakpoint (e, "ss_recursive2_trap");
+
+				req.Disable ();
+				req = create_step (e);
+				req.Size = StepSize.Line;
+
+				e = step_out ();
+				assert_location (e, "ss_recursive2");
+
+				// Stack should consist of Main + single_stepping + (1 ss_recursive2 frame per loop iteration)
+				Assert.AreEqual (c+2, e.Thread.GetFrames ().Length);
+				e = step_over_or_breakpoint ();
+			}
+			// At this point we should have escaped the breakpoints and this will be a normal step stop
+			assert_location (e, "ss_recursive2");
+			Assert.AreEqual (6, e.Thread.GetFrames ().Length);
+		} finally {
+			req.Disable ();
+			breakpoint.Disable ();
+		}
+
+		// Check that step-out stops correctly when inner frames with recursive functions contain breakpoints
+		e = run_until ("ss_recursive2");
+		breakpoint = new ReusableBreakpoint (this, "ss_recursive2_trap");
+		try {
+			breakpoint.Continue ();
+			e = breakpoint.lastEvent;
+			req = create_step (e);
+			for (int c = 1; c <= 4; c++) {
+				// The first five times we try to step over this function, the breakpoint will stop us
+				assert_location_at_breakpoint (e, "ss_recursive2_trap");
+
+				req.Disable ();
+				req = create_step (e);
+				req.Size = StepSize.Line;
+
+				e = step_out ();
+				assert_location (e, "ss_recursive2");
+
+				// Stack should consist of Main + single_stepping + (1 ss_recursive2 frame per loop iteration)
+				Assert.AreEqual (c+2, e.Thread.GetFrames ().Length);
+				e = step_out_or_breakpoint ();
+			}
+			for (int c = 3; c >= 1; c--) {
+				assert_location (e, "ss_recursive2");
+				Assert.AreEqual (c + 2, e.Thread.GetFrames ().Length);
+
+				e = step_out ();
+			}
+		} finally {
+			req.Disable ();
+			breakpoint.Disable ();
+		}
+
+		// Test step out with a really complicated call tree
+		List<RecursiveChaoticPoint> trace = new List<RecursiveChaoticPoint>();
+		trace_ss_recursive_chaotic (trace);
+		e = run_until ("ss_recursive_chaotic");
+		try {
+			breakpoint = new ReusableBreakpoint (this, "ss_recursive_chaotic_trap");
+			breakpoint.Continue ();
+			e = breakpoint.lastEvent;
+			foreach (RecursiveChaoticPoint point in trace)
+			{
+				if (point.breakpoint)
+					assert_location_at_breakpoint (e, point.name);
+				else
+					assert_location (e, point.name);
+				Assert.AreEqual (point.depth, e.Thread.GetFrames ().Length);
+
+				req.Disable ();
+				req = create_step (e);
+				req.Size = StepSize.Line;
+				e = step_out_or_breakpoint ();
+			}
+		} finally {
+			req.Disable ();
+			breakpoint.Disable ();
+		}
+
 		// Check that single stepping doesn't clobber fp values
 		e = run_until ("ss_fp_clobber");
 		req = create_step (e);
@@ -1424,7 +1675,7 @@ public class DebuggerTests
 
 		TypeMirror t = o.Type;
 
-		Assert.AreEqual ("MonoType", t.GetTypeObject ().Type.Name);
+		Assert.AreEqual ("RuntimeType", t.GetTypeObject ().Type.Name);
 	}
 
 	[Test]
@@ -1625,6 +1876,27 @@ public class DebuggerTests
 		return step_once ();
 	}
 
+	Event step_once_or_breakpoint () {
+		vm.Resume ();
+		var e = GetNextEvent ();
+		Assert.IsTrue (e is StepEvent || e is BreakpointEvent);
+		return e;
+	}
+
+	Event step_over_or_breakpoint () {
+		step_req.Disable ();
+		step_req.Depth = StepDepth.Over;
+		step_req.Enable ();
+		return step_once_or_breakpoint ();
+	}
+
+	Event step_out_or_breakpoint () {
+		step_req.Disable ();
+		step_req.Depth = StepDepth.Out;
+		step_req.Enable ();
+		return step_once_or_breakpoint ();
+	}
+
 	[Test]
 	public void Locals () {
 		var be = run_until ("locals1");
diff --git a/mcs/class/Mono.Http/Mono.Http-net_4_x.csproj b/mcs/class/Mono.Http/Mono.Http-net_4_x.csproj
index 510ad8aa6d6..781affa962a 100644
--- a/mcs/class/Mono.Http/Mono.Http-net_4_x.csproj
+++ b/mcs/class/Mono.Http/Mono.Http-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -66,15 +69,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Management/Mono.Management-net_4_x.csproj b/mcs/class/Mono.Management/Mono.Management-net_4_x.csproj
index 7da8011cea1..9aa0a5dffaf 100644
--- a/mcs/class/Mono.Management/Mono.Management-net_4_x.csproj
+++ b/mcs/class/Mono.Management/Mono.Management-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -57,15 +60,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_x.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_x.csproj
index f778bc30496..40771592cda 100644
--- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_x.csproj
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -64,15 +67,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Messaging/Mono.Messaging-net_4_x.csproj b/mcs/class/Mono.Messaging/Mono.Messaging-net_4_x.csproj
index 1a269cc8a2a..8b83f632390 100644
--- a/mcs/class/Mono.Messaging/Mono.Messaging-net_4_x.csproj
+++ b/mcs/class/Mono.Messaging/Mono.Messaging-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -81,15 +84,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Options/Mono.Options-net_4_x.csproj b/mcs/class/Mono.Options/Mono.Options-net_4_x.csproj
index 3fbd425d132..d8f8685ff49 100644
--- a/mcs/class/Mono.Options/Mono.Options-net_4_x.csproj
+++ b/mcs/class/Mono.Options/Mono.Options-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -57,15 +60,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_x.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-net_4_x.csproj
index c3e431f2985..f5de89dfdd4 100644
--- a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_x.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -66,15 +69,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Posix/Mono.Posix-build.csproj b/mcs/class/Mono.Posix/Mono.Posix-build.csproj
deleted file mode 100644
index bd86ea420d5..00000000000
--- a/mcs/class/Mono.Posix/Mono.Posix-build.csproj
+++ /dev/null
@@ -1,136 +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>{AA347918-40BB-4762-8A7F-B94836255127}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,618,612</NoWarn>
-    <OutputPath>./../../class/lib/build</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>Mono.Posix</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,618,612</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,618,612</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Posix\Catalog.cs" />
-    <Compile Include=".\Mono.Posix\PeerCred.cs" />
-    <Compile Include=".\Mono.Posix\Syscall.cs" />
-    <Compile Include=".\Mono.Posix\UnixEndPoint.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSink.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSinkProvider.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryCore.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSink.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSinkProvider.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixChannel.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientChannel.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSink.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSinkProvider.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixConnectionPool.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixMessageIO.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerChannel.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerTransportSink.cs" />
-    <Compile Include=".\Mono.Unix.Native\CdeclFunction.cs" />
-    <Compile Include=".\Mono.Unix.Native\FileNameMarshaler.cs" />
-    <Compile Include=".\Mono.Unix.Native\MapAttribute.cs" />
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.cs" />
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.generated.cs" />
-    <Compile Include=".\Mono.Unix.Native\RealTimeSignum.cs" />
-    <Compile Include=".\Mono.Unix.Native\Stdlib.cs" />
-    <Compile Include=".\Mono.Unix.Native\Syscall.cs" />
-    <Compile Include=".\Mono.Unix.Native\TypeAttributes.cs" />
-    <Compile Include=".\Mono.Unix\AbstractUnixEndPoint.cs" />
-    <Compile Include=".\Mono.Unix\Catalog.cs" />
-    <Compile Include=".\Mono.Unix\FileAccessPattern.cs" />
-    <Compile Include=".\Mono.Unix\FileAccessPermissions.cs" />
-    <Compile Include=".\Mono.Unix\FileHandleOperations.cs" />
-    <Compile Include=".\Mono.Unix\FileSpecialAttributes.cs" />
-    <Compile Include=".\Mono.Unix\FileTypes.cs" />
-    <Compile Include=".\Mono.Unix\PeerCred.cs" />
-    <Compile Include=".\Mono.Unix\StdioFileStream.cs" />
-    <Compile Include=".\Mono.Unix\UnixClient.cs" />
-    <Compile Include=".\Mono.Unix\UnixDirectoryInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixDriveInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixEncoding.cs" />
-    <Compile Include=".\Mono.Unix\UnixEndPoint.cs" />
-    <Compile Include=".\Mono.Unix\UnixEnvironment.cs" />
-    <Compile Include=".\Mono.Unix\UnixFileInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixFileSystemInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixGroupInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixIOException.cs" />
-    <Compile Include=".\Mono.Unix\UnixListener.cs" />
-    <Compile Include=".\Mono.Unix\UnixMarshal.cs" />
-    <Compile Include=".\Mono.Unix\UnixPath.cs" />
-    <Compile Include=".\Mono.Unix\UnixPipes.cs" />
-    <Compile Include=".\Mono.Unix\UnixProcess.cs" />
-    <Compile Include=".\Mono.Unix\UnixSignal.cs" />
-    <Compile Include=".\Mono.Unix\UnixStream.cs" />
-    <Compile Include=".\Mono.Unix\UnixSymbolicLinkInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixUserInfo.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-build.csproj">
-      <Project>{2BDF80D1-6F06-4908-B351-835292B7A9B9}</Project>
-      <Name>corlib\corlib-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System\System-build-1.csproj">
-      <Project>{ACA4A790-62B2-4D59-B96C-CE17F8F6BE58}</Project>
-      <Name>System\System-build-1</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/Mono.Posix/Mono.Posix-net_4_x.csproj b/mcs/class/Mono.Posix/Mono.Posix-net_4_x.csproj
index 899695ca396..51e6db7e1d8 100644
--- a/mcs/class/Mono.Posix/Mono.Posix-net_4_x.csproj
+++ b/mcs/class/Mono.Posix/Mono.Posix-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618,612</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -110,15 +113,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixEncodingTest.cs b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixEncodingTest.cs
index 1edf3f08289..2f0747294d3 100644
--- a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixEncodingTest.cs
+++ b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixEncodingTest.cs
@@ -1001,7 +1001,7 @@ namespace MonoTests.Mono.Unix {
 
 			Assert.AreEqual (end.Length, bytes.Length, prefix + ": byte length");
 
-			for (int i = 0; i < Math.Min (bytes.Length, end.Length); ++i)
+			for (int i = 0; i < global::System.Math.Min (bytes.Length, end.Length); ++i)
 				Assert.AreEqual (end [i], bytes [i], prefix + ": byte " + i);
 
 			int cc = unix.GetCharCount (end, 0, end.Length);
@@ -1012,7 +1012,7 @@ namespace MonoTests.Mono.Unix {
 
 			Assert.AreEqual (start.Length, r, prefix + ": chars length");
 
-			for (int i = 0; i < Math.Min (r, start.Length); ++i) {
+			for (int i = 0; i < global::System.Math.Min (r, start.Length); ++i) {
 				Assert.AreEqual (start [i], chars [i], prefix + ": char " + i);
 			}
 		}
diff --git a/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.exclude.sources b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.exclude.sources
new file mode 100644
index 00000000000..0facffb101d
--- /dev/null
+++ b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.exclude.sources
@@ -0,0 +1,2 @@
+#include monodroid_Mono.Posix_test.dll.new-exclude.sources
+Mono.Unix.Android/TestHelper.cs
diff --git a/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.new-exclude.sources b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.new-exclude.sources
new file mode 100644
index 00000000000..ed7337437ac
--- /dev/null
+++ b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.new-exclude.sources
@@ -0,0 +1,3 @@
+Mono.Unix.Native/SocketTest.cs
+Mono.Unix/UnixEndPointTest.cs
+Mono.Unix/UnixListenerTest.cs
diff --git a/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.sources b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.sources
new file mode 100644
index 00000000000..3af39dbfb09
--- /dev/null
+++ b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.sources
@@ -0,0 +1 @@
+#include Mono.Posix_test.dll.sources
diff --git a/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet-net_4_x.csproj b/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet-net_4_x.csproj
index 5199a373e5b..115c3f25a7f 100644
--- a/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet-net_4_x.csproj
+++ b/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,1030</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -64,15 +67,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Security.Providers.NewSystemSource/Mono.Security.Providers.NewSystemSource-net_4_x.csproj b/mcs/class/Mono.Security.Providers.NewSystemSource/Mono.Security.Providers.NewSystemSource-net_4_x.csproj
index 9df975f3276..771d99fc965 100644
--- a/mcs/class/Mono.Security.Providers.NewSystemSource/Mono.Security.Providers.NewSystemSource-net_4_x.csproj
+++ b/mcs/class/Mono.Security.Providers.NewSystemSource/Mono.Security.Providers.NewSystemSource-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,1030</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -31,7 +34,7 @@
     <DebugType>full</DebugType>
     <NoWarn>1699,1030</NoWarn>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP;MONO_SECURITY_ALIAS;MONO;FEATURE_PAL;MONO_FEATURE_NEW_TLS;MONO_FEATURE_NEW_SYSTEM_SOURCE;DISABLE_CAS_USE</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP;MONO;FEATURE_PAL;MONO_FEATURE_NEW_TLS;MONO_FEATURE_NEW_SYSTEM_SOURCE;DISABLE_CAS_USE;MONO_SECURITY_ALIAS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -39,7 +42,7 @@
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699,1030</NoWarn>
     <Optimize>true</Optimize>
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP;MONO_SECURITY_ALIAS;MONO;FEATURE_PAL;MONO_FEATURE_NEW_TLS;MONO_FEATURE_NEW_SYSTEM_SOURCE;DISABLE_CAS_USE</DefineConstants>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP;MONO;FEATURE_PAL;MONO_FEATURE_NEW_TLS;MONO_FEATURE_NEW_SYSTEM_SOURCE;DISABLE_CAS_USE;MONO_SECURITY_ALIAS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -51,21 +54,21 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\mscorlib\InternalApis\NDP_Common\inc\PinnableBufferCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LoggingObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_NTAuthentication.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_SecureChannel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_SslSessionsCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Logging.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\_FixedSizeReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\_HelperAsyncResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\_SslState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\_SslStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\SslStream.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\mscorlib\InternalApis\NDP_Common\inc\PinnableBufferCache.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LoggingObject.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_NTAuthentication.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_SecureChannel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_SslSessionsCache.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Logging.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\_FixedSizeReader.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\_HelperAsyncResults.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\_SslState.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\_SslStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\SslStream.cs" />
     <Compile Include="..\System\Mono.Net.Security\CallbackHelpers.cs" />
     <Compile Include="..\System\Mono.Net.Security\IMonoTlsProvider.cs" />
     <Compile Include="..\System\Mono.Net.Security\MonoTlsProviderFactory.cs" />
@@ -89,15 +92,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Security.Providers.NewTls/Mono.Security.Providers.NewTls-net_4_x.csproj b/mcs/class/Mono.Security.Providers.NewTls/Mono.Security.Providers.NewTls-net_4_x.csproj
index 211791b19e4..158b0957982 100644
--- a/mcs/class/Mono.Security.Providers.NewTls/Mono.Security.Providers.NewTls-net_4_x.csproj
+++ b/mcs/class/Mono.Security.Providers.NewTls/Mono.Security.Providers.NewTls-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,1030</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -70,15 +73,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls-net_4_x.csproj b/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls-net_4_x.csproj
index 7439af9be77..32ceb300355 100644
--- a/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls-net_4_x.csproj
+++ b/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,1030</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -130,15 +133,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_x.csproj b/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_x.csproj
index 2be8ede9fc3..6eb3f05da22 100644
--- a/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_x.csproj
+++ b/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -67,15 +70,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD2Test.cs b/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD2Test.cs
index a6a92f06430..65b46010fc3 100644
--- a/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD2Test.cs
+++ b/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD2Test.cs
@@ -31,9 +31,9 @@ public class MD2Test {
 		if ((array1 == null) && (array2 == null))
 			return;
 		if (array1 == null)
-			Assertion.Fail (msg + " -> First array is NULL");
+			Assert.Fail (msg + " -> First array is NULL");
 		if (array2 == null)
-			Assertion.Fail (msg + " -> Second array is NULL");
+			Assert.Fail (msg + " -> Second array is NULL");
         
 		bool a = (array1.Length == array2.Length);
 		if (a) {
@@ -48,7 +48,7 @@ public class MD2Test {
 			msg += " -> Expected " + BitConverter.ToString (array1, 0);
 			msg += " is different than " + BitConverter.ToString (array2, 0);
 		}
-		Assertion.Assert (msg, a);
+		Assert.IsTrue (a, msg);
 	}
 
 	// MD2 ("") = 8350e5a3e24c153df2275c9f80692773
@@ -208,7 +208,7 @@ public class MD2Test {
 		for (int i=0; i < input.Length - 1; i++)
 			hash.TransformBlock (input, i, 1, copy, i);
 		byte[] output = hash.TransformFinalBlock (input, input.Length - 1, 1);
-		Assertion.AssertEquals (testName + ".e.1", input [input.Length - 1], output [0]);
+		Assert.AreEqual (input [input.Length - 1], output [0], testName + ".e.1");
 		AssertEquals (testName + ".e.2", result, hash.Hash);
 		// required or next operation will still return old hash
 		hash.Initialize ();
@@ -218,9 +218,9 @@ public class MD2Test {
 	public virtual void StaticInfo () 
 	{
 		string className = hash.ToString ();
-		Assertion.AssertEquals (className + ".HashSize", 128, hash.HashSize);
-		Assertion.AssertEquals (className + ".InputBlockSize", 1, hash.InputBlockSize);
-		Assertion.AssertEquals (className + ".OutputBlockSize", 1, hash.OutputBlockSize);
+		Assert.AreEqual (128, hash.HashSize, className + ".HashSize",);
+		Assert.AreEqual (1, hash.InputBlockSize, className + ".InputBlockSize");
+		Assert.AreEqual (1, hash.OutputBlockSize, className + ".OutputBlockSize");
 	}
 }
 
diff --git a/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD4Test.cs b/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD4Test.cs
index 308b689b91c..111035eb5ac 100644
--- a/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD4Test.cs
+++ b/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD4Test.cs
@@ -31,9 +31,9 @@ public class MD4Test {
 		if ((array1 == null) && (array2 == null))
 			return;
 		if (array1 == null)
-			Assertion.Fail (msg + " -> First array is NULL");
+			Assert.Fail (msg + " -> First array is NULL");
 		if (array2 == null)
-			Assertion.Fail (msg + " -> Second array is NULL");
+			Assert.Fail (msg + " -> Second array is NULL");
 
 		bool a = (array1.Length == array2.Length);
 		if (a) {
@@ -48,7 +48,7 @@ public class MD4Test {
 			msg += " -> Expected " + BitConverter.ToString (array1, 0);
 			msg += " is different than " + BitConverter.ToString (array2, 0);
 		}
-		Assertion.Assert (msg, a);
+		Assert.IsTrue (a, msg);
 	}
 
 	// MD4 ("") = 31d6cfe0d16ae931b73c59d7e0c089c0
@@ -208,7 +208,7 @@ public class MD4Test {
 		for (int i=0; i < input.Length - 1; i++)
 			hash.TransformBlock (input, i, 1, copy, i);
 		byte[] output = hash.TransformFinalBlock (input, input.Length - 1, 1);
-		Assertion.AssertEquals (testName + ".e.1", input [input.Length - 1], output [0]);
+		Assert.AreEqual (input [input.Length - 1], output [0], testName + ".e.1");
 		AssertEquals (testName + ".e.2", result, hash.Hash);
 		// required or next operation will still return old hash
 		hash.Initialize ();
@@ -218,9 +218,9 @@ public class MD4Test {
 	public virtual void StaticInfo () 
 	{
 		string className = hash.ToString ();
-		Assertion.AssertEquals (className + ".HashSize", 128, hash.HashSize);
-		Assertion.AssertEquals (className + ".InputBlockSize", 1, hash.InputBlockSize);
-		Assertion.AssertEquals (className + ".OutputBlockSize", 1, hash.OutputBlockSize);
+		Assert.AreEqual (128, hash.HashSize, className + ".HashSize");
+		Assert.AreEqual (1, hash.InputBlockSize, className + ".InputBlockSize");
+		Assert.AreEqual (1, hash.OutputBlockSize, className + ".OutputBlockSize");
 	}
 }
 
diff --git a/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD5Test.cs b/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD5Test.cs
index 1eb70789380..a5796e910d7 100644
--- a/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD5Test.cs
+++ b/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/MD5Test.cs
@@ -33,9 +33,9 @@ public class MD5Test {
 		if ((array1 == null) && (array2 == null))
 			return;
 		if (array1 == null)
-			Assertion.Fail (msg + " -> First array is NULL");
+			Assert.Fail (msg + " -> First array is NULL");
 		if (array2 == null)
-			Assertion.Fail (msg + " -> Second array is NULL");
+			Assert.Fail (msg + " -> Second array is NULL");
 
 		bool a = (array1.Length == array2.Length);
 		if (a) {
@@ -50,7 +50,7 @@ public class MD5Test {
 			msg += " -> Expected " + BitConverter.ToString (array1, 0);
 			msg += " is different than " + BitConverter.ToString (array2, 0);
 		}
-		Assertion.Assert (msg, a);
+		Assert.IsTrue (a, msg);
 	}
 
 	// MD5 ("") = d41d8cd98f00b204e9800998ecf8427e
@@ -210,7 +210,7 @@ public class MD5Test {
 		for (int i=0; i < input.Length - 1; i++)
 			hash.TransformBlock (input, i, 1, copy, i);
 		byte[] output = hash.TransformFinalBlock (input, input.Length - 1, 1);
-		Assertion.AssertEquals (testName + ".e.1", input [input.Length - 1], output [0]);
+		Assert.AreEqual (input [input.Length - 1], output [0], testName + ".e.1");
 		AssertEquals (testName + ".e.2", result, hash.Hash);
 		// required or next operation will still return old hash
 		hash.Initialize ();
@@ -220,9 +220,9 @@ public class MD5Test {
 	public virtual void StaticInfo () 
 	{
 		string className = hash.ToString ();
-		Assertion.AssertEquals (className + ".HashSize", 128, hash.HashSize);
-		Assertion.AssertEquals (className + ".InputBlockSize", 1, hash.InputBlockSize);
-		Assertion.AssertEquals (className + ".OutputBlockSize", 1, hash.OutputBlockSize);
+		Assert.AreEqual (128, hash.HashSize, className + ".HashSize");
+		Assert.AreEqual (1, hash.InputBlockSize, className + ".InputBlockSize");
+		Assert.AreEqual (1, hash.OutputBlockSize, className + ".OutputBlockSize");
 	}
 }
 
diff --git a/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/SHA1Test.cs b/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/SHA1Test.cs
index 0ef2206f50b..358beca8d06 100644
--- a/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/SHA1Test.cs
+++ b/mcs/class/Mono.Security.Win32/Test/Mono.Security.Cryptography/SHA1Test.cs
@@ -33,9 +33,9 @@ public class SHA1Test {
 		if ((array1 == null) && (array2 == null))
 			return;
 		if (array1 == null)
-			Assertion.Fail (msg + " -> First array is NULL");
+			Assert.Fail (msg + " -> First array is NULL");
 		if (array2 == null)
-			Assertion.Fail (msg + " -> Second array is NULL");
+			Assert.Fail (msg + " -> Second array is NULL");
 
 		bool a = (array1.Length == array2.Length);
 		if (a) {
@@ -48,7 +48,7 @@ public class SHA1Test {
 		}
 		msg += " -> Expected " + BitConverter.ToString (array1, 0);
 		msg += " is different than " + BitConverter.ToString (array2, 0);
-		Assertion.Assert (msg, a);
+		Assert.IsTrue (a, msg);
 	}
 
 	[SetUp]
@@ -63,12 +63,12 @@ public class SHA1Test {
 	{
 		// test all values static for SHA1
 		string className = hash.ToString ();
-		Assertion.AssertEquals (className + ".HashSize", 160, hash.HashSize);
-		Assertion.AssertEquals (className + ".InputBlockSize", 1, hash.InputBlockSize);
-		Assertion.AssertEquals (className + ".OutputBlockSize", 1, hash.OutputBlockSize);
-		Assertion.AssertEquals (className + ".CanReuseTransform", true, hash.CanReuseTransform);
-		Assertion.AssertEquals (className + ".CanTransformMultipleBlocks", true, hash.CanTransformMultipleBlocks);
-		Assertion.AssertEquals (className + ".ToString()", "Mono.Security.Cryptography.SHA1CryptoServiceProvider", className);
+		Assert.AreEqual (className + ".HashSize", 160, hash.HashSize);
+		Assert.AreEqual (className + ".InputBlockSize", 1, hash.InputBlockSize);
+		Assert.AreEqual (className + ".OutputBlockSize", 1, hash.OutputBlockSize);
+		Assert.AreEqual (className + ".CanReuseTransform", true, hash.CanReuseTransform);
+		Assert.AreEqual (className + ".CanTransformMultipleBlocks", true, hash.CanTransformMultipleBlocks);
+		Assert.AreEqual (className + ".ToString()", "Mono.Security.Cryptography.SHA1CryptoServiceProvider", className);
 	}
 
 	// First test, we hash the string "abc"
diff --git a/mcs/class/Mono.Security/Mono.Security-basic.csproj b/mcs/class/Mono.Security/Mono.Security-basic.csproj
deleted file mode 100644
index d9695b4d076..00000000000
--- a/mcs/class/Mono.Security/Mono.Security-basic.csproj
+++ /dev/null
@@ -1,211 +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>{4615469E-37C9-4D64-9231-67594EA75E4F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,1030</NoWarn>
-    <OutputPath>./../../class/lib/basic</OutputPath>
-    <NoStdLib>False</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>Mono.Security</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,1030</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;BOOTSTRAP_BASIC</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,1030</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;BOOTSTRAP_BASIC</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />
-    <Compile Include=".\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />
-    <Compile Include=".\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />
-    <Compile Include=".\Mono.Math.Prime\ConfidenceFactor.cs" />
-    <Compile Include=".\Mono.Math.Prime\PrimalityTests.cs" />
-    <Compile Include=".\Mono.Math\BigInteger.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeBase.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeFormatter.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\PrivateKey.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\SoftwarePublisherCertificate.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\ARC4Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\CryptoConvert.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\CryptoTools.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DHKeyGeneration.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DHParameters.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellman.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellmanManaged.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\KeyPairPersistence.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD2.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD2Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD4.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD4Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD5SHA1.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\PKCS1.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\PKCS8.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\RC4.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\RSAManaged.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\SHA224.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\SHA224Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\SymmetricTransform.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\TlsHMAC.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse2.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\MessageBase.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmAuthLevel.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmSettings.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type1Message.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type2Message.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type3Message.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\Alert.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuite.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientContext.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientSessionCache.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ContentType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\Context.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\DebugHelper.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\HandshakeState.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\HttpsClientStream.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\RecordProtocol.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityParameters.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerContext.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslCipherSuite.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslClientStream.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslServerStream.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslStreamBase.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsClientSettings.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsException.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsServerSettings.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsStream.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\CertificatePoliciesExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\CRLDistributionPointsExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\ExtendedKeyUsageExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\GeneralNames.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyAttributesExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\NetscapeCertTypeExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\PrivateKeyUsagePeriodExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectAltNameExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />
-    <Compile Include=".\Mono.Security.X509\PKCS12.cs" />
-    <Compile Include=".\Mono.Security.X509\X501Name.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Builder.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Certificate.cs" />
-    <Compile Include=".\Mono.Security.X509\X509CertificateBuilder.cs" />
-    <Compile Include=".\Mono.Security.X509\X509CertificateCollection.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Chain.cs" />
-    <Compile Include=".\Mono.Security.X509\X509ChainStatusFlags.cs" />
-    <Compile Include=".\Mono.Security.X509\X509CRL.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Extension.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Extensions.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Store.cs" />
-    <Compile Include=".\Mono.Security.X509\X509StoreManager.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Stores.cs" />
-    <Compile Include=".\Mono.Security.X509\X520Attributes.cs" />
-    <Compile Include=".\Mono.Security\ASN1.cs" />
-    <Compile Include=".\Mono.Security\ASN1Convert.cs" />
-    <Compile Include=".\Mono.Security\BitConverterLE.cs" />
-    <Compile Include=".\Mono.Security\PKCS7.cs" />
-    <Compile Include=".\Mono.Security\StrongName.cs" />
-    <Compile Include=".\Mono.Xml\MiniParser.cs" />
-    <Compile Include=".\Mono.Xml\SecurityParser.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="..\System\System-basic-1.csproj">
-      <Project>{CE10AD5A-9645-496F-8369-7B687E84456B}</Project>
-      <Name>System\System-basic-1</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/Mono.Security/Mono.Security-build.csproj b/mcs/class/Mono.Security/Mono.Security-build.csproj
deleted file mode 100644
index 0b1020964fb..00000000000
--- a/mcs/class/Mono.Security/Mono.Security-build.csproj
+++ /dev/null
@@ -1,215 +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>{B826C748-252D-4C0F-8A6C-C8DADE270C3F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,1030</NoWarn>
-    <OutputPath>./../../class/lib/build</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>Mono.Security</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,1030</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,1030</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />
-    <Compile Include=".\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />
-    <Compile Include=".\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />
-    <Compile Include=".\Mono.Math.Prime\ConfidenceFactor.cs" />
-    <Compile Include=".\Mono.Math.Prime\PrimalityTests.cs" />
-    <Compile Include=".\Mono.Math\BigInteger.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeBase.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeFormatter.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\PrivateKey.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\SoftwarePublisherCertificate.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\ARC4Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\CryptoConvert.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\CryptoTools.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DHKeyGeneration.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DHParameters.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellman.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellmanManaged.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\KeyPairPersistence.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD2.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD2Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD4.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD4Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD5SHA1.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\PKCS1.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\PKCS8.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\RC4.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\RSAManaged.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\SHA224.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\SHA224Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\SymmetricTransform.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\TlsHMAC.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse2.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\MessageBase.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmAuthLevel.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmSettings.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type1Message.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type2Message.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type3Message.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\Alert.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuite.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientContext.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientSessionCache.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ContentType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\Context.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\DebugHelper.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\HandshakeState.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\HttpsClientStream.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\RecordProtocol.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityParameters.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerContext.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslCipherSuite.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslClientStream.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslServerStream.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslStreamBase.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsClientSettings.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsException.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsServerSettings.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsStream.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\CertificatePoliciesExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\CRLDistributionPointsExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\ExtendedKeyUsageExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\GeneralNames.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyAttributesExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\NetscapeCertTypeExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\PrivateKeyUsagePeriodExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectAltNameExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />
-    <Compile Include=".\Mono.Security.X509\PKCS12.cs" />
-    <Compile Include=".\Mono.Security.X509\X501Name.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Builder.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Certificate.cs" />
-    <Compile Include=".\Mono.Security.X509\X509CertificateBuilder.cs" />
-    <Compile Include=".\Mono.Security.X509\X509CertificateCollection.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Chain.cs" />
-    <Compile Include=".\Mono.Security.X509\X509ChainStatusFlags.cs" />
-    <Compile Include=".\Mono.Security.X509\X509CRL.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Extension.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Extensions.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Store.cs" />
-    <Compile Include=".\Mono.Security.X509\X509StoreManager.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Stores.cs" />
-    <Compile Include=".\Mono.Security.X509\X520Attributes.cs" />
-    <Compile Include=".\Mono.Security\ASN1.cs" />
-    <Compile Include=".\Mono.Security\ASN1Convert.cs" />
-    <Compile Include=".\Mono.Security\BitConverterLE.cs" />
-    <Compile Include=".\Mono.Security\PKCS7.cs" />
-    <Compile Include=".\Mono.Security\StrongName.cs" />
-    <Compile Include=".\Mono.Xml\MiniParser.cs" />
-    <Compile Include=".\Mono.Xml\SecurityParser.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-build.csproj">
-      <Project>{2BDF80D1-6F06-4908-B351-835292B7A9B9}</Project>
-      <Name>corlib\corlib-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System\System-build-1.csproj">
-      <Project>{ACA4A790-62B2-4D59-B96C-CE17F8F6BE58}</Project>
-      <Name>System\System-build-1</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj b/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj
index a4e12fac117..e6e48767bf6 100644
--- a/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj
+++ b/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,1030,3009</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -211,15 +214,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Security/Mono.Security.Cryptography/RSAManaged.cs b/mcs/class/Mono.Security/Mono.Security.Cryptography/RSAManaged.cs
index 7240fa54809..17648d70869 100644
--- a/mcs/class/Mono.Security/Mono.Security.Cryptography/RSAManaged.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Cryptography/RSAManaged.cs
@@ -93,7 +93,7 @@ namespace Mono.Security.Cryptography {
 			// p and q values should have a length of half the strength in bits
 			int pbitlength = ((KeySize + 1) >> 1);
 			int qbitlength = (KeySize - pbitlength);
-			const uint uint_e = 17;
+			const uint uint_e = 65537;
 			e = uint_e; // fixed
 	
 			// generate p, prime and (p-1) relatively prime to e
diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/CipherSuiteFactory.cs b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/CipherSuiteFactory.cs
index 13573cbaab1..68a21e1d54b 100644
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/CipherSuiteFactory.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/CipherSuiteFactory.cs
@@ -40,65 +40,16 @@ namespace Mono.Security.Protocol.Tls
 
 		public static CipherSuiteCollection GetSupportedCiphers (bool server, SecurityProtocolType protocol)
 		{
-			CipherSuiteCollection suites;
 			switch (protocol) {
 			case SecurityProtocolType.Default:
 			case SecurityProtocolType.Tls:				
-				suites = CipherSuiteFactory.GetTls1SupportedCiphers ();
-				break;
+				return CipherSuiteFactory.GetTls1SupportedCiphers ();
 			case SecurityProtocolType.Ssl3:
-				suites = CipherSuiteFactory.GetSsl3SupportedCiphers ();
-				break;
+				return CipherSuiteFactory.GetSsl3SupportedCiphers ();
 			case SecurityProtocolType.Ssl2:
 			default:
 				throw new NotSupportedException ("Unsupported security protocol type");
 			}
-
-			IEnumerable<string> list = null;
-#if INSIDE_SYSTEM
-			// if SSL/TLS support is built-in System.dll (e.g. monotouch) then we can access ServicePointManager
-			// extension directly
-			var cb = server ? ServicePointManager.ServerCipherSuitesCallback : ServicePointManager.ClientCipherSuitesCallback;
-			if (cb == null)
-				return suites; // e.g. no callback was set
-
-			list = cb ((System.Net.SecurityProtocolType) (int) protocol, suites.GetNames ());
-#elif !BOOTSTRAP_BASIC
-			// Mono.Security must work on MS.NET so it cannot depend on any Mono-specific extensions
-			PropertyInfo pi = null;
-			if (server) {
-				if (server_callback == null)
-					server_callback = spm.GetProperty ("ServerCipherSuitesCallback", BindingFlags.Static | BindingFlags.Public);
-				pi = server_callback;
-			} else {
-				if (client_callback == null)
-					client_callback = spm.GetProperty ("ClientCipherSuitesCallback", BindingFlags.Static | BindingFlags.Public);
-				pi = client_callback;
-			}
-			if (pi == null)
-				return suites; // e.g. MS runtime - return every supported suites
-
-			var cb = (Delegate) pi.GetGetMethod ().Invoke (null, null);
-			if (cb == null)
-				return suites; // e.g. no callback was set - return every supported suites
-
-			list = (IEnumerable<string>) cb.DynamicInvoke (new object[] { 
-				(System.Net.SecurityProtocolType) (int) protocol, suites.GetNames () 
-			});
-#else
-			// TODO: right now the callback is only available when using System.Net.* types for SSL/TLS
-			return suites;
-#endif
-			CipherSuiteCollection allowed = new CipherSuiteCollection (protocol);
-			if (list != null) {
-				foreach (var name in list) {
-					// add any supported (ignore unknowns) ciphers requested by the callback
-					var cipher = suites [name];
-					if (cipher != null)
-						allowed.Add (cipher);
-				}
-			}
-			return allowed;
 		}
 
 		#region Private Static Methods
diff --git a/mcs/class/Mono.Security/Test/Mono.Math/BigIntegerSetTest.cs b/mcs/class/Mono.Security/Test/Mono.Math/BigIntegerSetTest.cs
index 989adb7697a..56cec328adb 100644
--- a/mcs/class/Mono.Security/Test/Mono.Math/BigIntegerSetTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Math/BigIntegerSetTest.cs
@@ -22,7 +22,7 @@ namespace MonoTests.Mono.Math {
 
 		protected void Expect (BigInteger actual, BigInteger expected) 
 		{
-			Assertion.AssertEquals (Name, expected, actual);
+			Assert.AreEqual (expected, actual, Name);
 		}
 	}
 }
diff --git a/mcs/class/Mono.Security/Test/Mono.Math/PrimeTestingTest.cs b/mcs/class/Mono.Security/Test/Mono.Math/PrimeTestingTest.cs
index 4cf969f69d0..2abf162a89c 100644
--- a/mcs/class/Mono.Security/Test/Mono.Math/PrimeTestingTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Math/PrimeTestingTest.cs
@@ -81,12 +81,12 @@ namespace MonoTests.Mono.Math {
 
 		private void ExpectComposite (BigInteger bi)
 		{
-			Assertion.AssertEquals (false, bi.IsProbablePrime ());
+			Assert.AreEqual (false, bi.IsProbablePrime ());
 		}
 
 		private void ExpectPrime (BigInteger bi)
 		{
-			Assertion.AssertEquals (true, bi.IsProbablePrime ());
+			Assert.AreEqual (true, bi.IsProbablePrime ());
 		}
 	}
 
@@ -195,7 +195,7 @@ namespace MonoTests.Mono.Math {
 	// Adapted from http://lists.ximian.com/archives/public/mono-devel-list/2003-November/003026.html
 	// Note: these primes are taken from RFC 2412 [http://www.faqs.org/rfcs/rfc2412.html]
 	[TestFixture]
-	public class Rfc2412WellTestedPrimes : Assertion {
+	public class Rfc2412WellTestedPrimes {
 
 		// E.1. Well-Known Group 1:  A 768 bit prime
 		[Test]
@@ -203,8 +203,8 @@ namespace MonoTests.Mono.Math {
 		{
 			string prime = "1552518092300708935130918131258481755631334049434514313202351194902966239949102107258669453876591642442910007680288864229150803718918046342632727613031282983744380820890196288509170691316593175367469551763119843371637221007210577919";
 			BigInteger bi = BigInteger.Parse (prime);
-			Assert ("isProbablePrime-768", bi.IsProbablePrime ());
-			AssertEquals ("ToString()", prime, bi.ToString ());
+			Assert.IsTrue (bi.IsProbablePrime (), "isProbablePrime-768");
+			Assert.AreEqual (prime, bi.ToString (), "ToString()");
 		}
 
 		// E.2. Well-Known Group 2:  A 1024 bit prime
@@ -213,8 +213,8 @@ namespace MonoTests.Mono.Math {
 		{
 			string prime = "179769313486231590770839156793787453197860296048756011706444423684197180216158519368947833795864925541502180565485980503646440548199239100050792877003355816639229553136239076508735759914822574862575007425302077447712589550957937778424442426617334727629299387668709205606050270810842907692932019128194467627007";
 			BigInteger bi = BigInteger.Parse (prime);
-			Assert ("isProbablePrime-1024", bi.IsProbablePrime ());
-			AssertEquals ("ToString()", prime, bi.ToString ());
+			Assert.IsTrue (bi.IsProbablePrime (), "isProbablePrime-1024");
+			Assert.AreEqual (prime, bi.ToString (), "ToString()");
 		}
 
 		// Note: E.3 and E.4 are for Elliptic Curve Groups
@@ -225,8 +225,8 @@ namespace MonoTests.Mono.Math {
 		{
 			string prime = "2410312426921032588552076022197566074856950548502459942654116941958108831682612228890093858261341614673227141477904012196503648957050582631942730706805009223062734745341073406696246014589361659774041027169249453200378729434170325843778659198143763193776859869524088940195577346119843545301547043747207749969763750084308926339295559968882457872412993810129130294592999947926365264059284647209730384947211681434464714438488520940127459844288859336526896320919633919";
 			BigInteger bi = BigInteger.Parse (prime);
-			Assert ("isProbablePrime-1536", bi.IsProbablePrime ());
-			AssertEquals ("ToString()", prime, bi.ToString ());
+			Assert.IsTrue (bi.IsProbablePrime (), "isProbablePrime-1536");
+			Assert.AreEqual (prime, bi.ToString (), "ToString()");
 		}
 	}
 
diff --git a/mcs/class/Mono.Security/Test/Mono.Math/SearchGeneratorTest.cs b/mcs/class/Mono.Security/Test/Mono.Math/SearchGeneratorTest.cs
index 80434f9983c..e77246dc956 100644
--- a/mcs/class/Mono.Security/Test/Mono.Math/SearchGeneratorTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Math/SearchGeneratorTest.cs
@@ -34,7 +34,7 @@ namespace MonoTests.Mono.Math {
 			ContextData ctx = (ContextData)Context;
 
 			
-			Assertion.AssertEquals (ctx.bits, bits);
+			Assert.AreEqual (ctx.bits, bits);
 			uint d = ctx.testData;
 
 			for (uint i = (uint)bits - 2; d > 0; i--, d >>= 1)
@@ -65,7 +65,7 @@ namespace MonoTests.Mono.Math {
 				Assert.IsTrue (p.TestBit (1));
 				uint d = ctx.testData;
 				for (uint j = 128 - 2; d > 0; j--, d >>= 1)
-					Assertion.AssertEquals ((d&1) == 1, p.TestBit (j));
+					Assert.AreEqual ((d&1) == 1, p.TestBit (j));
 			}
 		}
 	}
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/PrivateKeyTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/PrivateKeyTest.cs
index 0f529496e11..8696657715e 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/PrivateKeyTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/PrivateKeyTest.cs
@@ -68,7 +68,7 @@ namespace MonoTests.Mono.Security.Authenticode {
 // makecert -n "CN=PVK1" -sv 1.pvk 1.cer
 
 [TestFixture]
-public class PrivateKeyTest : Assertion {
+public class PrivateKeyTest {
 
 	// because most crypto stuff works with byte[] buffers
 	static public void AssertEquals (string msg, byte[] array1, byte[] array2) 
@@ -76,9 +76,9 @@ public class PrivateKeyTest : Assertion {
 		if ((array1 == null) && (array2 == null))
 			return;
 		if (array1 == null)
-			Fail (msg + " -> First array is NULL");
+			Assert.Fail (msg + " -> First array is NULL");
 		if (array2 == null)
-			Fail (msg + " -> Second array is NULL");
+			Assert.Fail (msg + " -> Second array is NULL");
 
 		bool a = (array1.Length == array2.Length);
 		if (a) {
@@ -93,7 +93,7 @@ public class PrivateKeyTest : Assertion {
 			msg += " -> Expected " + BitConverter.ToString (array1, 0);
 			msg += " is different than " + BitConverter.ToString (array2, 0);
 		}
-		Assert (msg, a);
+		Assert.IsTrue (a, msg);
 	}
 
 	string testfile;
@@ -152,10 +152,10 @@ public class PrivateKeyTest : Assertion {
 	{
 		WriteBuffer (nopwd);
 		PrivateKey pvk = PrivateKey.CreateFromFile (testfile);
-		AssertNotNull ("msnopwd.RSA", pvk.RSA);
-		Assert ("msnopwd.Encrypted", !pvk.Encrypted);
-		Assert ("msnopwd.Weak", pvk.Weak);
-		AssertEquals ("msnopwd.KeyType", 2, pvk.KeyType);
+		Assert.IsNotNull (pvk.RSA, "msnopwd.RSA");
+		Assert.IsTrue (!pvk.Encrypted, "msnopwd.Encrypted");
+		Assert.IsTrue (pvk.Weak, "msnopwd.Weak");
+		Assert.AreEqual (2, pvk.KeyType, "msnopwd.KeyType");
 	}
 
 	// this will convert a PVK file without a password to a PVK file
@@ -168,11 +168,11 @@ public class PrivateKeyTest : Assertion {
 		string rsa1 = pvk.RSA.ToXmlString (true);
 		pvk.Save (testfile, "password");
 		pvk = PrivateKey.CreateFromFile (testfile, "password");
-		AssertNotNull ("topwd.RSA", pvk.RSA);
+		Assert.IsNotNull (pvk.RSA, "topwd.RSA");
 		string rsa2 = pvk.RSA.ToXmlString (true);
-		AssertEquals ("topwd.RSA identical", rsa1, rsa2);
-		Assert ("topwd.Encrypted", pvk.Encrypted);
-		Assert ("topwd.Weak", pvk.Weak);
+		Assert.AreEqual (rsa1, rsa2, "topwd.RSA identical");
+		Assert.IsTrue (pvk.Encrypted, "topwd.Encrypted");
+		Assert.IsTrue (pvk.Weak, "topwd.Weak");
 	}
 
 	// this will convert a PVK file without a password to a PVK file
@@ -186,11 +186,11 @@ public class PrivateKeyTest : Assertion {
 		pvk.Weak = false; // we want strong crypto
 		pvk.Save (testfile, "password");
 		pvk = PrivateKey.CreateFromFile (testfile, "password");
-		AssertNotNull ("topwd.RSA", pvk.RSA);
+		Assert.IsNotNull (pvk.RSA, "topwd.RSA");
 		string rsa2 = pvk.RSA.ToXmlString (true);
-		AssertEquals ("topwd.RSA identical", rsa1, rsa2);
-		Assert ("topwd.Encrypted", pvk.Encrypted);
-		Assert ("topwd.Weak", !pvk.Weak);
+		Assert.AreEqual (rsa1, rsa2, "topwd.RSA identical");
+		Assert.IsTrue (pvk.Encrypted, "topwd.Encrypted");
+		Assert.IsTrue (!pvk.Weak, "topwd.Weak");
 	}
 
 	static byte[] pwd = { 
@@ -229,9 +229,9 @@ public class PrivateKeyTest : Assertion {
 	{
 		WriteBuffer (pwd);
 		PrivateKey pvk = PrivateKey.CreateFromFile (testfile, "password");
-		AssertNotNull ("mspwd.RSA", pvk.RSA);
-		Assert ("mspwd.Encrypted", pvk.Encrypted);
-		Assert ("mspwd.Weak", pvk.Weak);
+		Assert.IsNotNull (pvk.RSA, "mspwd.RSA");
+		Assert.IsTrue (pvk.Encrypted, "mspwd.Encrypted");
+		Assert.IsTrue (pvk.Weak, "mspwd.Weak");
 	}
 
 	// this will convert a PVK file with a password to a PVK file
@@ -244,11 +244,11 @@ public class PrivateKeyTest : Assertion {
 		string rsa1 = pvk.RSA.ToXmlString (true);
 		pvk.Save (testfile);
 		pvk = PrivateKey.CreateFromFile (testfile);
-		AssertNotNull ("nomorepwd.RSA", pvk.RSA);
+		Assert.IsNotNull (pvk.RSA, "nomorepwd.RSA");
 		string rsa2 = pvk.RSA.ToXmlString (true);
-		AssertEquals ("nomorepwd.RSA identical", rsa1, rsa2);
-		Assert ("nomorepwd.Encrypted", !pvk.Encrypted);
-		Assert ("nomorepwd.Weak", pvk.Weak);
+		Assert.AreEqual (rsa1, rsa2, "nomorepwd.RSA identical");
+		Assert.IsTrue (!pvk.Encrypted, "nomorepwd.Encrypted");
+		Assert.IsTrue (pvk.Weak, "nomorepwd.Weak");
 	}
 	
 	[Test]
@@ -261,11 +261,11 @@ public class PrivateKeyTest : Assertion {
 		pvk.Save (testfile, "mono");
 
 		pvk = PrivateKey.CreateFromFile (testfile, "mono");
-		AssertNotNull ("new.RSA", pvk.RSA);
+		Assert.IsNotNull (pvk.RSA, "new.RSA");
 		string rsa2 = pvk.RSA.ToXmlString (true);
-		AssertEquals ("new.RSA identical", rsa1, rsa2);
-		Assert ("new.Encrypted", pvk.Encrypted);
-		Assert ("new.Weak", !pvk.Weak);
+		Assert.AreEqual (rsa1, rsa2, "new.RSA identical");
+		Assert.IsTrue (pvk.Encrypted, "new.Encrypted");
+		Assert.IsTrue (!pvk.Weak, "new.Weak");
 	}
 
 	[Test]
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/CryptoConvertTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/CryptoConvertTest.cs
index 38ecbc3b235..a527208839a 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/CryptoConvertTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/CryptoConvertTest.cs
@@ -15,7 +15,7 @@ using Mono.Security.Cryptography;
 namespace MonoTests.Mono.Security.Cryptography {
 
 	[TestFixture]
-	public class CryptoConvertTest : Assertion {
+	public class CryptoConvertTest {
 
 		// because most crypto stuff works with byte[] buffers
 		static public void AssertEquals (string msg, byte[] array1, byte[] array2) 
@@ -23,9 +23,9 @@ namespace MonoTests.Mono.Security.Cryptography {
 			if ((array1 == null) && (array2 == null))
 				return;
 			if (array1 == null)
-				Fail (msg + " -> First array is NULL");
+				Assert.Fail (msg + " -> First array is NULL");
 			if (array2 == null)
-				Fail (msg + " -> Second array is NULL");
+				Assert.Fail (msg + " -> Second array is NULL");
 	        
 			bool a = (array1.Length == array2.Length);
 			if (a) {
@@ -38,7 +38,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 			}
 			msg += " -> Expected " + BitConverter.ToString (array1, 0);
 			msg += " is different than " + BitConverter.ToString (array2, 0);
-			Assert (msg, a);
+			Assert.IsTrue (a, msg);
 		}
 
 		// strongname generated using "sn -k unit.snk"
@@ -163,16 +163,16 @@ namespace MonoTests.Mono.Security.Cryptography {
 		{
 			// keypair
 			RSA rsa = CryptoConvert.FromCapiKeyBlob (strongName, 0);
-			AssertEquals ("KeyPair", strongNameString, rsa.ToXmlString (true));
-			AssertEquals ("PublicKey-1", strongNamePublicKeyString, rsa.ToXmlString (false));
+			Assert.AreEqual (strongNameString, rsa.ToXmlString (true), "KeyPair");
+			Assert.AreEqual (strongNamePublicKeyString, rsa.ToXmlString (false), "PublicKey-1");
 
 			// public key (direct)
 			rsa = CryptoConvert.FromCapiKeyBlob (strongNamePublicKey, 12);
-			AssertEquals ("PublicKey-2", strongNamePublicKeyString, rsa.ToXmlString (false));
+			Assert.AreEqual (strongNamePublicKeyString, rsa.ToXmlString (false), "PublicKey-2");
 
 			// public key (indirect - inside header)
 			rsa = CryptoConvert.FromCapiKeyBlob (strongNamePublicKey, 0);
-			AssertEquals ("PublicKey-3", strongNamePublicKeyString, rsa.ToXmlString (false));
+			Assert.AreEqual (strongNamePublicKeyString, rsa.ToXmlString (false), "PublicKey-3");
 		}
 
 		[Test]
@@ -201,7 +201,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 		public void FromCapiPrivateKeyBlob () 
 		{
 			RSA rsa = CryptoConvert.FromCapiPrivateKeyBlob (strongName, 0);
-			AssertEquals ("KeyPair", strongNameString, rsa.ToXmlString (true));
+			Assert.AreEqual (strongNameString, rsa.ToXmlString (true), "KeyPair");
 		}
 
 		[Test]
@@ -229,7 +229,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 		public void FromCapiPublicKeyBlob () 
 		{
 			RSA rsa = CryptoConvert.FromCapiPublicKeyBlob (strongNamePublicKey, 12);
-			AssertEquals ("PublicKey", strongNamePublicKeyString, rsa.ToXmlString (false));
+			Assert.AreEqual (strongNamePublicKeyString, rsa.ToXmlString (false), "PublicKey");
 		}
 
 		[Test]
@@ -262,12 +262,12 @@ namespace MonoTests.Mono.Security.Cryptography {
 			AssertEquals ("RSA-KeyPair", strongName, keypair);
 
 			byte[] publicKey = CryptoConvert.ToCapiKeyBlob (rsa, false);
-			AssertEquals ("RSA-PublicKey", BitConverter.ToString (strongNamePublicKey, 12), BitConverter.ToString (publicKey));
+			Assert.AreEqual (BitConverter.ToString (strongNamePublicKey, 12), BitConverter.ToString (publicKey), "RSA-PublicKey");
 			
 			AsymmetricAlgorithm dsa = DSA.Create ();
 			dsa.FromXmlString (dsaKeyPairString);
 			AssertEquals ("DSA-KeyPair", dsaPrivBlob, CryptoConvert.ToCapiKeyBlob (dsa, true));
-			AssertEquals ("DSA-PublicKey", BitConverter.ToString (dsaPubBlob), BitConverter.ToString (CryptoConvert.ToCapiKeyBlob (dsa, false)));
+			Assert.AreEqual (BitConverter.ToString (dsaPubBlob), BitConverter.ToString (CryptoConvert.ToCapiKeyBlob (dsa, false)), "DSA-PublicKey");
 		}
 
 		[Test]
@@ -279,7 +279,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 			AssertEquals ("KeyPair", strongName, keypair);
 
 			byte[] publicKey = CryptoConvert.ToCapiKeyBlob (rsa, false);
-			AssertEquals ("PublicKey", BitConverter.ToString (strongNamePublicKey, 12), BitConverter.ToString (publicKey));
+			Assert.AreEqual (BitConverter.ToString (strongNamePublicKey, 12), BitConverter.ToString (publicKey), "PublicKey");
 		}
 
 		[Test]
@@ -323,11 +323,11 @@ namespace MonoTests.Mono.Security.Cryptography {
 			// full keypair
 			rsa.FromXmlString (strongNameString);
 			byte[] publicKey = CryptoConvert.ToCapiPublicKeyBlob (rsa);
-			AssertEquals ("PublicKey-1", BitConverter.ToString (strongNamePublicKey, 12), BitConverter.ToString (publicKey));
+			Assert.AreEqual (BitConverter.ToString (strongNamePublicKey, 12), BitConverter.ToString (publicKey), "PublicKey-1");
 			// public key only
 			rsa.FromXmlString (strongNamePublicKeyString);
 			publicKey = CryptoConvert.ToCapiPublicKeyBlob (rsa);
-			AssertEquals ("PublicKey-2", BitConverter.ToString (strongNamePublicKey, 12), BitConverter.ToString (publicKey));
+			Assert.AreEqual (BitConverter.ToString (strongNamePublicKey, 12), BitConverter.ToString (publicKey), "PublicKey-2");
 		}
 
 		/* DSA key tests */
@@ -419,8 +419,8 @@ namespace MonoTests.Mono.Security.Cryptography {
 		public void FromCapiKeyBlobDSA ()
 		{
 			DSA dsa = CryptoConvert.FromCapiKeyBlobDSA (dsaPrivBlob);
-			AssertEquals ("KeyPair", dsaKeyPairString, dsa.ToXmlString (true));
-			AssertEquals ("PublicKey", dsaPubKeyString, dsa.ToXmlString (false));
+			Assert.AreEqual (dsaKeyPairString, dsa.ToXmlString (true), "KeyPair");
+			Assert.AreEqual (dsaPubKeyString, dsa.ToXmlString (false), "PublicKey");
 		}
 
 		[Test]
@@ -449,7 +449,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 		public void FromCapiPrivateKeyBlobDSA ()
 		{
 			DSA dsa = CryptoConvert.FromCapiPrivateKeyBlobDSA (dsaPrivBlob, 0);
-			AssertEquals ("KeyPair", dsaKeyPairString, dsa.ToXmlString (true));
+			Assert.AreEqual (dsaKeyPairString, dsa.ToXmlString (true), "KeyPair");
 		}
 
 		[Test]
@@ -478,7 +478,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 		public void FromCapiPublicKeyBlobDSA ()
 		{
 			DSA dsa = CryptoConvert.FromCapiPublicKeyBlobDSA (dsaPubBlob, 0);
-			AssertEquals ("PublicKey", dsaPubKeyString, dsa.ToXmlString (false));
+			Assert.AreEqual (dsaPubKeyString, dsa.ToXmlString (false), "PublicKey");
 		}
 
 		[Test]
@@ -512,7 +512,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 			AssertEquals ("KeyPair", dsaPrivBlob, keypair);
 
 			byte[] pubkey = CryptoConvert.ToCapiKeyBlob (dsa, false);
-			AssertEquals ("PublicKey", BitConverter.ToString (dsaPubBlob), BitConverter.ToString (pubkey));
+			Assert.AreEqual (BitConverter.ToString (dsaPubBlob), BitConverter.ToString (pubkey), "PublicKey");
 		}
 
 		[Test]
@@ -548,20 +548,20 @@ namespace MonoTests.Mono.Security.Cryptography {
 			// full keypair
 			dsa.FromXmlString (dsaKeyPairString);
 			byte[] pubkey = CryptoConvert.ToCapiPublicKeyBlob (dsa);
-			AssertEquals ("PublicKey-1", BitConverter.ToString (dsaPubBlob), BitConverter.ToString (pubkey));
+			Assert.AreEqual (BitConverter.ToString (dsaPubBlob), BitConverter.ToString (pubkey), "PublicKey-1");
 
 			// public key only
 			dsa.FromXmlString (dsaPubKeyString);
 			pubkey = CryptoConvert.ToCapiPublicKeyBlob (dsa);
-			AssertEquals ("PublicKey-2", BitConverter.ToString (dsaPubBlob), BitConverter.ToString (pubkey));
+			Assert.AreEqual (BitConverter.ToString (dsaPubBlob), BitConverter.ToString (pubkey), "PublicKey-2");
 		}
 
 		[Test]
 		public void FromHex () 
 		{
-			AssertNull ("FromHex(null)", CryptoConvert.FromHex (null));
+			Assert.IsNull (CryptoConvert.FromHex (null), "FromHex(null)");
 			string result = BitConverter.ToString (CryptoConvert.FromHex ("0123456789aBcDeF"));
-			AssertEquals ("0123456789abcdef", "01-23-45-67-89-AB-CD-EF", result);
+			Assert.AreEqual ("01-23-45-67-89-AB-CD-EF", result, "0123456789abcdef");
 		}
 
 		[Test]
@@ -581,9 +581,9 @@ namespace MonoTests.Mono.Security.Cryptography {
 		[Test]
 		public void ToHex () 
 		{
-			AssertNull ("FromHex(null)", CryptoConvert.FromHex (null));
+			Assert.IsNull (CryptoConvert.FromHex (null), "FromHex(null)");
 			byte[] data = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
-			AssertEquals ("0123456789abcdef", "0123456789ABCDEF", CryptoConvert.ToHex (data));
+			Assert.AreEqual ("0123456789ABCDEF", CryptoConvert.ToHex (data), "0123456789abcdef");
 		}
 		
 		[Test]
@@ -595,8 +595,8 @@ namespace MonoTests.Mono.Security.Cryptography {
 			RSA rsa = CryptoConvert.FromCapiKeyBlob (strongNameNUnit, 0);
 			// note the bad D parameters !!!
 			// this only works because CRT is being used
-			AssertEquals ("KeyPair", "<RSAKeyValue><Modulus>rB8h0TaMs8fWA+5WMdcjOjejCZwhYwuFHUZPS0cC9TOG6FJtvlHPpZLQAg0xfLr2SivPRol1Xw9SqhuaYQNJA7sAaOb8Rvgmx93XbmcNotY9ob4TGaesk+M8VsdexsIJ3WlyLbmRlf0EjT52nboyauEL3UC85zkMjW1LNb8LSs8=</Modulus><Exponent>AQAB</Exponent><P>2d4pGForvc792ztFxhNuzxIihDnXp+qK9F8t/NduhRBdu+JXK4d8a9EGwzpMxLUPlHjCZfXRraZiSQszkH+nzQ==</P><Q>yj9BeGmOrucOUCNZYTtXI0ykzz+1g+cVMSxi+6xzoLEOqmdE4gjcWaxak4MF1+pIR6UycnNa/jg1LBl7MKxpCw==</Q><DP>cMkAjznG4Sjx4/dIRKU0vP/PXJIxIR1bN+y5+uVvsnTpgWVH6SHneE0qahCZQ0/UM/Fb+bqLBJFY2iVxWUGslQ==</DP><DQ>gz6TXPGbLzMv3Z9i5C8e+ABHv1pHj6ZI4VU9kraxfmkH7FsBn3FClUq8qJdRFnGpoBy65Pyo4upUzx5mDAsGSw==</DQ><InverseQ>x+UShV+0d9cicoiB9fkSLqpLDyF4dYzVu0uqX0eCcoGJpk19jtSaMI3Eo8VN6MJAW1zrRy+MA1Fqb9qeThLqZQ==</InverseQ><D>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</D></RSAKeyValue>", rsa.ToXmlString (true));
-			AssertEquals ("PublicKey", "<RSAKeyValue><Modulus>rB8h0TaMs8fWA+5WMdcjOjejCZwhYwuFHUZPS0cC9TOG6FJtvlHPpZLQAg0xfLr2SivPRol1Xw9SqhuaYQNJA7sAaOb8Rvgmx93XbmcNotY9ob4TGaesk+M8VsdexsIJ3WlyLbmRlf0EjT52nboyauEL3UC85zkMjW1LNb8LSs8=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>", rsa.ToXmlString (false));
+			Assert.AreEqual ("<RSAKeyValue><Modulus>rB8h0TaMs8fWA+5WMdcjOjejCZwhYwuFHUZPS0cC9TOG6FJtvlHPpZLQAg0xfLr2SivPRol1Xw9SqhuaYQNJA7sAaOb8Rvgmx93XbmcNotY9ob4TGaesk+M8VsdexsIJ3WlyLbmRlf0EjT52nboyauEL3UC85zkMjW1LNb8LSs8=</Modulus><Exponent>AQAB</Exponent><P>2d4pGForvc792ztFxhNuzxIihDnXp+qK9F8t/NduhRBdu+JXK4d8a9EGwzpMxLUPlHjCZfXRraZiSQszkH+nzQ==</P><Q>yj9BeGmOrucOUCNZYTtXI0ykzz+1g+cVMSxi+6xzoLEOqmdE4gjcWaxak4MF1+pIR6UycnNa/jg1LBl7MKxpCw==</Q><DP>cMkAjznG4Sjx4/dIRKU0vP/PXJIxIR1bN+y5+uVvsnTpgWVH6SHneE0qahCZQ0/UM/Fb+bqLBJFY2iVxWUGslQ==</DP><DQ>gz6TXPGbLzMv3Z9i5C8e+ABHv1pHj6ZI4VU9kraxfmkH7FsBn3FClUq8qJdRFnGpoBy65Pyo4upUzx5mDAsGSw==</DQ><InverseQ>x+UShV+0d9cicoiB9fkSLqpLDyF4dYzVu0uqX0eCcoGJpk19jtSaMI3Eo8VN6MJAW1zrRy+MA1Fqb9qeThLqZQ==</InverseQ><D>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</D></RSAKeyValue>", rsa.ToXmlString (true), "KeyPair");
+			Assert.AreEqual ("<RSAKeyValue><Modulus>rB8h0TaMs8fWA+5WMdcjOjejCZwhYwuFHUZPS0cC9TOG6FJtvlHPpZLQAg0xfLr2SivPRol1Xw9SqhuaYQNJA7sAaOb8Rvgmx93XbmcNotY9ob4TGaesk+M8VsdexsIJ3WlyLbmRlf0EjT52nboyauEL3UC85zkMjW1LNb8LSs8=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>", rsa.ToXmlString (false), "PublicKey");
 		}
 	}
 }
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/DiffieHellmanManagedTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/DiffieHellmanManagedTest.cs
index 2a38eb819dc..a0d3caf1f7d 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/DiffieHellmanManagedTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/DiffieHellmanManagedTest.cs
@@ -24,7 +24,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 	//	http://www.ietf.org/rfc/rfc2631.txt
 
 	[TestFixture]
-	public class DiffieHellmanManagedTest : Assertion {
+	public class DiffieHellmanManagedTest {
 
 		// because most crypto stuff works with byte[] buffers
 		static public void AssertEquals (string msg, byte[] array1, byte[] array2) 
@@ -32,9 +32,9 @@ namespace MonoTests.Mono.Security.Cryptography {
 			if ((array1 == null) && (array2 == null))
 				return;
 			if (array1 == null)
-				Assertion.Fail (msg + " -> First array is NULL");
+				Assert.Fail (msg + " -> First array is NULL");
 			if (array2 == null)
-				Assertion.Fail (msg + " -> Second array is NULL");
+				Assert.Fail (msg + " -> Second array is NULL");
 
 			bool a = (array1.Length == array2.Length);
 			if (a) {
@@ -49,7 +49,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 				msg += " -> Expected " + BitConverter.ToString (array1, 0);
 				msg += " is different than " + BitConverter.ToString (array2, 0);
 			}
-			Assertion.Assert (msg, a);
+			Assert.IsTrue (a, msg);
 		}
 
 		[Test]
@@ -70,7 +70,7 @@ namespace MonoTests.Mono.Security.Cryptography {
 			// let the second DH instance compute the shared secret using the first DH public key
 			byte[] dh2k = dh2.DecryptKeyExchange (ke1);
 			// both shared secrets are the same
-			AssertEquals ("Shared Secret", dh1k, dh2k);
+			Assert.AreEqual (dh1k, dh2k, "Shared Secret");
 		}
 
 		// TODO: More is needed !
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/PKCS8Test.cs b/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/PKCS8Test.cs
index 42f7584e1c9..8ec9779b2db 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/PKCS8Test.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.Cryptography/PKCS8Test.cs
@@ -19,7 +19,7 @@ using NUnit.Framework;
 namespace MonoTests.Mono.Security.Cryptography {
 
 	[TestFixture]
-	public class PKCS8Test : Assertion {
+	public class PKCS8Test {
 
 		static public byte[] pkcs8_der = { 0x30, 0x82, 0x02, 0xB2, 0x30, 0x1C, 0x06, 0x0A, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x0C, 0x01, 0x03, 0x30, 0x0E, 0x04, 0x08, 0x86, 0x2A, 0xA9, 0x71, 0x6D, 0xA4, 0xB8, 0x2D, 0x02, 0x02, 0x07, 0xD0, 0x04, 0x82, 0x02, 0x90, 0x90, 0x14, 0xB5, 0xF0, 0xB6, 0x86, 0x56, 0xCB, 0xFA, 0x63, 0xAD, 0x9F, 0x5A, 0x59, 0x6C, 0xAD, 0x00, 0x3C, 0x37, 0x8A, 0xC3, 0x88, 0x58, 0x8B, 0xD7, 0x48, 0x53, 0x7A, 0xC8, 0x5B, 0x0D, 0x98, 0xDD, 0x8B, 0xB3, 0xEC, 0x4C, 0xAC, 0x61, 0x18, 0xE3, 0x5E, 0x47, 0xAD, 0xC7, 0x92, 0xBC, 0xD3, 0x00, 0x07, 0xFF, 0x1A, 0x68, 0x74, 0x45, 0x8E, 0xD8, 0x7C, 0x9F, 0x18, 0x7B, 0xD7, 0xC8, 
 			0x47, 0xBA, 0x6B, 0x19, 0xF2, 0xBF, 0x7E, 0x51, 0x0B, 0x4B, 0x43, 0xE8, 0xB9, 0x56, 0x7E, 0xD0, 0x74, 0xC7, 0xDE, 0x76, 0xDB, 0xFF, 0x5C, 0x6B, 0x53, 0xBE, 0x31, 0x06, 0xAE, 0x6C, 0x8F, 0xDC, 0x49, 0x04, 0x71, 0x74, 0xEE, 0xB8, 0x06, 0xCB, 0xAD, 0x86, 0xB4, 0x4E, 0xB9, 0x46, 0xA1, 0x03, 0x5E, 0x0E, 0xA7, 0xC7, 0x37, 0x6B, 0xB0, 0x8D, 0x2D, 0x81, 0x1F, 0xE3, 0xC2, 0x05, 0xDE, 0xEF, 0x51, 0x07, 0x70, 0x6E, 0x35, 0x9A, 0xAD, 0x19, 0x5E, 0xAF, 0xEB, 0x7F, 0xEF, 0xE4, 0xAB, 0x07, 0xF3, 0xF6, 0xEA, 0xFA, 0x0E, 0x83, 0x65, 0x06, 0x3C, 0xF3, 0xBD, 0x96, 0x08, 0x14, 0xC5, 0x34, 0x26, 0xED, 0xC0, 0x10, 
@@ -32,13 +32,13 @@ namespace MonoTests.Mono.Security.Cryptography {
 		[Test]
 		public void EncryptedPrivateKey_Farscape () 
 		{
-			AssertEquals ("PKCS8.GetType", PKCS8.KeyInfo.EncryptedPrivateKey, PKCS8.GetType (pkcs8_der));
+			Assert.AreEqual (PKCS8.KeyInfo.EncryptedPrivateKey, PKCS8.GetType (pkcs8_der), "PKCS8.GetType");
 			PKCS8.EncryptedPrivateKeyInfo p8 = new PKCS8.EncryptedPrivateKeyInfo (pkcs8_der);
-			AssertEquals ("Algorithm", "1.2.840.113549.1.12.1.3", p8.Algorithm);
-			AssertEquals ("EncryptedData", "90-14-B5-F0-B6-86-56-CB-FA-63-AD-9F-5A-59-6C-AD-00-3C-37-8A-C3-88-58-8B-D7-48-53-7A-C8-5B-0D-98-DD-8B-B3-EC-4C-AC-61-18-E3-5E-47-AD-C7-92-BC-D3-00-07-FF-1A-68-74-45-8E-D8-7C-9F-18-7B-D7-C8-47-BA-6B-19-F2-BF-7E-51-0B-4B-43-E8-B9-56-7E-D0-74-C7-DE-76-DB-FF-5C-6B-53-BE-31-06-AE-6C-8F-DC-49-04-71-74-EE-B8-06-CB-AD-86-B4-4E-B9-46-A1-03-5E-0E-A7-C7-37-6B-B0-8D-2D-81-1F-E3-C2-05-DE-EF-51-07-70-6E-35-9A-AD-19-5E-AF-EB-7F-EF-E4-AB-07-F3-F6-EA-FA-0E-83-65-06-3C-F3-BD-96-08-14-C5-34-26-ED-C0-10-CC-AE-2D-8F-BE-ED-98-0D-88-1B-1E-C7-37-F0-FC-DB-3C-E3-1B-66-52-45-6E-05-A6-D9-12-23-05-5F-E3-9F-7D-21-9B-2E-3E-9E-3C-EE-D1-9B-55-DE-57-60-A5-24-2D-C7-94-EC-FC-B1-6A-65-BD-85-02-5C-58-AA-5A-6A-F3-AC-6B-DD-0E-63-B2-4B-5B-67-3D-C3-BF-E4-C8-EF-3F-89-5A-CD-6D-EF-05-22-2B-72-FF-80-7A-DD-F1-59-A7-6F-00-B1-BD-4D-88-D6-E4-8A-DD-A9-FC-D9-01-0A-65-8E-52-F9-7E-20-72-67-0D-5B-EE-67-5B-46-4A-15-A2-6F-15-2B-5B-9A-93-12-4F-F4-AD-49-D0-11-F1-7E-40-DE-32-96-2E-B3-E8-71-60-27-6E-A2-71-83-C7-FE-0E-8B-31-06-64-E1-19-02-B9-44-25-0C-94-64-7E-5F-89-4D-7E-99-0B-91-B8-22-A5-33-92-D3-49-07-1D-C6-25-4A-D7-6D-E2-94-3F-FA-10-72-59-62-F5-C6-D4-3A-EE-8F-BC-9C-BC-FC-C7-37-BF-7C-A0-67-B0-FF-0F-29-A0-A2-71-6B-21-00-F4-54-D9-3D-1B-CE-F4-FE-6F-F5-21-CB-47-58-17-F6-45-2F-A0-3B-8B-D9-B8-8A-33-3F-16-E0-C7-8A-B8-11-2F-A8-7E-7D-A7-7B-65-27-89-3C-67-4D-D5-70-28-76-60-96-68-BF-FB-CD-49-E0-8A-7C-6F-76-06-48-6D-63-67-8A-47-82-5E-7F-0E-AC-46-B6-BC-0A-6D-E2-1A-3A-20-A5-C7-81-71-6E-2B-16-97-D4-FA-C0-DD-72-5B-9F-A3-43-F4-85-B1-C6-A8-E0-62-81-5D-A5-07-29-6A-6A-2D-E1-1D-BE-12-6D-42-58-6F-4E-30-3D-BF-32-11-38-BC-36-76-60-FC-57-2F-D3-9E-C4-1A-92-EA-DE-85-FD-E7-AA-30-A6-97-2C-36-3B-3B-0E-92-52-FF-42-D7-62-6C-C1-3A-E7-1B-4E-13-8C-95-B3-4B-A7-9E-42-75-A8-CA-63-76-C4-45-74-96-43-D8-86-82-BE-37-FF-9B-EB-B7-18-A1-2F-E3-6C-08-E8-11-96-8C-5E-9E-2B-E7-DB-7D-54-E1-DB-1E-D3-8F-B5-19-4B-B2-16-DB-CF-EC-88-0B-6C-3C-E4-F2-C4-FF-4D-3E-53-52-3A-81-0B-6E-AC-95-EA-5A-6E-4D-83-23-82-C9-90-02-74-10-2A-6C-FB-97-4F-5F-70-8E-F0-B9", 
-				BitConverter.ToString (p8.EncryptedData));
-			AssertEquals ("Salt", "86-2A-A9-71-6D-A4-B8-2D", BitConverter.ToString (p8.Salt));
-			AssertEquals ("IterationCount", 2000, p8.IterationCount);
+			Assert.AreEqual ("1.2.840.113549.1.12.1.3", p8.Algorithm, "Algorithm");
+			Assert.AreEqual ("90-14-B5-F0-B6-86-56-CB-FA-63-AD-9F-5A-59-6C-AD-00-3C-37-8A-C3-88-58-8B-D7-48-53-7A-C8-5B-0D-98-DD-8B-B3-EC-4C-AC-61-18-E3-5E-47-AD-C7-92-BC-D3-00-07-FF-1A-68-74-45-8E-D8-7C-9F-18-7B-D7-C8-47-BA-6B-19-F2-BF-7E-51-0B-4B-43-E8-B9-56-7E-D0-74-C7-DE-76-DB-FF-5C-6B-53-BE-31-06-AE-6C-8F-DC-49-04-71-74-EE-B8-06-CB-AD-86-B4-4E-B9-46-A1-03-5E-0E-A7-C7-37-6B-B0-8D-2D-81-1F-E3-C2-05-DE-EF-51-07-70-6E-35-9A-AD-19-5E-AF-EB-7F-EF-E4-AB-07-F3-F6-EA-FA-0E-83-65-06-3C-F3-BD-96-08-14-C5-34-26-ED-C0-10-CC-AE-2D-8F-BE-ED-98-0D-88-1B-1E-C7-37-F0-FC-DB-3C-E3-1B-66-52-45-6E-05-A6-D9-12-23-05-5F-E3-9F-7D-21-9B-2E-3E-9E-3C-EE-D1-9B-55-DE-57-60-A5-24-2D-C7-94-EC-FC-B1-6A-65-BD-85-02-5C-58-AA-5A-6A-F3-AC-6B-DD-0E-63-B2-4B-5B-67-3D-C3-BF-E4-C8-EF-3F-89-5A-CD-6D-EF-05-22-2B-72-FF-80-7A-DD-F1-59-A7-6F-00-B1-BD-4D-88-D6-E4-8A-DD-A9-FC-D9-01-0A-65-8E-52-F9-7E-20-72-67-0D-5B-EE-67-5B-46-4A-15-A2-6F-15-2B-5B-9A-93-12-4F-F4-AD-49-D0-11-F1-7E-40-DE-32-96-2E-B3-E8-71-60-27-6E-A2-71-83-C7-FE-0E-8B-31-06-64-E1-19-02-B9-44-25-0C-94-64-7E-5F-89-4D-7E-99-0B-91-B8-22-A5-33-92-D3-49-07-1D-C6-25-4A-D7-6D-E2-94-3F-FA-10-72-59-62-F5-C6-D4-3A-EE-8F-BC-9C-BC-FC-C7-37-BF-7C-A0-67-B0-FF-0F-29-A0-A2-71-6B-21-00-F4-54-D9-3D-1B-CE-F4-FE-6F-F5-21-CB-47-58-17-F6-45-2F-A0-3B-8B-D9-B8-8A-33-3F-16-E0-C7-8A-B8-11-2F-A8-7E-7D-A7-7B-65-27-89-3C-67-4D-D5-70-28-76-60-96-68-BF-FB-CD-49-E0-8A-7C-6F-76-06-48-6D-63-67-8A-47-82-5E-7F-0E-AC-46-B6-BC-0A-6D-E2-1A-3A-20-A5-C7-81-71-6E-2B-16-97-D4-FA-C0-DD-72-5B-9F-A3-43-F4-85-B1-C6-A8-E0-62-81-5D-A5-07-29-6A-6A-2D-E1-1D-BE-12-6D-42-58-6F-4E-30-3D-BF-32-11-38-BC-36-76-60-FC-57-2F-D3-9E-C4-1A-92-EA-DE-85-FD-E7-AA-30-A6-97-2C-36-3B-3B-0E-92-52-FF-42-D7-62-6C-C1-3A-E7-1B-4E-13-8C-95-B3-4B-A7-9E-42-75-A8-CA-63-76-C4-45-74-96-43-D8-86-82-BE-37-FF-9B-EB-B7-18-A1-2F-E3-6C-08-E8-11-96-8C-5E-9E-2B-E7-DB-7D-54-E1-DB-1E-D3-8F-B5-19-4B-B2-16-DB-CF-EC-88-0B-6C-3C-E4-F2-C4-FF-4D-3E-53-52-3A-81-0B-6E-AC-95-EA-5A-6E-4D-83-23-82-C9-90-02-74-10-2A-6C-FB-97-4F-5F-70-8E-F0-B9", BitConverter.ToString (p8.EncryptedData), 
+				"EncryptedData");
+			Assert.AreEqual ("86-2A-A9-71-6D-A4-B8-2D", BitConverter.ToString (p8.Salt), "Salt");
+			Assert.AreEqual (2000, p8.IterationCount, "IterationCount");
 		}
 
 		static public byte[] End_Certificate_CP_01_01_crtx = { 0x30, 0x82, 0x02, 0x78, 0x02, 0x01, 0x00, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 0x02, 0x62, 0x30, 0x82, 0x02, 0x5E, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81, 0x00, 0xC6, 0x34, 0xEC, 0x6F, 0x0C, 0xE0, 0x59, 0x0E, 0xBC, 0x5F, 0xBA, 0x2E, 0x93, 0xBB, 0x04, 0xA7, 0x03, 0xB9, 0x70, 0x8A, 0xB9, 0xD7, 0xE5, 0xD7, 0xE6, 0xCA, 0x4A, 0x8C, 0x23, 0xD8, 0x60, 0xB3, 0x6B, 0xCB, 0x88, 0x88, 0xC7, 0xD8, 0x48, 0x7E, 0x64, 0xF9, 0xF6, 0x1B, 0xE3, 0x79, 0x46, 0x41, 0xE4, 0x61, 0xF7, 0x25, 0x47, 0x71, 0xF3, 0x50, 0x94, 0x4E, 0xF2, 0x7C, 0x6A, 0x37, 0xB6, 0x0C, 
@@ -68,25 +68,25 @@ namespace MonoTests.Mono.Security.Cryptography {
 		[Test]
 		public void PrivateKeyInfo_End_Certificate_CP_01_01 () 
 		{
-			AssertEquals ("PKCS8.GetType", PKCS8.KeyInfo.PrivateKey, PKCS8.GetType (End_Certificate_CP_01_01_crtx));
+			Assert.AreEqual (PKCS8.KeyInfo.PrivateKey, PKCS8.GetType (End_Certificate_CP_01_01_crtx), "PKCS8.GetType");
 			PKCS8.PrivateKeyInfo p8 = new PKCS8.PrivateKeyInfo (End_Certificate_CP_01_01_crtx);
-			AssertEquals ("Algorithm", "1.2.840.113549.1.1.1", p8.Algorithm);
-			AssertEquals ("Attributes", 0, p8.Attributes.Count);
-			AssertEquals ("PrivateKey", BitConverter.ToString (End_Certificate_CP_01_01_pki), BitConverter.ToString (p8.PrivateKey));
-			AssertEquals ("Version", 0, p8.Version);
+			Assert.AreEqual ("1.2.840.113549.1.1.1", p8.Algorithm, "Algorithm");
+			Assert.AreEqual (0, p8.Attributes.Count, "Attributes");
+			Assert.AreEqual (BitConverter.ToString (End_Certificate_CP_01_01_pki), BitConverter.ToString (p8.PrivateKey), "PrivateKey");
+			Assert.AreEqual (0, p8.Version, "Version");
 		}
 
 		[Test]
 		public void PrivateKeyInfo_End_Certificate_CP_01_02 () 
 		{
 			PKCS8.PrivateKeyInfo p8 = new PKCS8.PrivateKeyInfo (End_Certificate_CP_01_02_crtx);
-			AssertEquals ("Algorithm", "1.2.840.113549.1.1.1", p8.Algorithm);
-			AssertEquals ("Attributes", 0, p8.Attributes.Count);
-			AssertEquals ("PrivateKey", "30-82-02-5B-02-01-00-02-81-81-00-D6-39-9E-21-93-E2-BA-35-7F-E5-F8-E8-87-0B-8A-5F-28-25-85-B7-E5-CC-DA-7F-D3-C7-09-2A-63-E9-AD-8F-D0-A8-EF-BA-CF-3C-FB-55-03-B9-83-29-4E-0E-89-84-FB-E2-62-16-1F-9D-87-40-16-6B-F8-F4-66-38-58-74-67-D4-B5-A1-3A-4B-6F-13-4B-08-37-3A-3A-64-0A-06-8E-A2-7B-14-88-B7-F8-CE-6A-D1-45-9B-39-93-67-BF-0A-AB-DB-37-9D-FA-CE-54-0F-37-82-09-8F-0D-33-E4-B8-6E-46-C1-CC-4F-80-5A-B4-BD-19-80-27-40-84-49-02-03-01-00-01-02-81-80-14-95-5A-AD-4D-41-56-B4-F7-42-08-85-87-1C-43-C2-5A-E0-28-16-00-5D-8B-8D-06-B3-34-1D-3F-96-5F-57-D7-2B-B4-45-15-CE-7D-33-B0-F4-ED-36-55-CA-AD-C9-FA-4D-C9-30-E8-FE-C0-D5-16-92-6F-4C-44-5A-1B-9D-7E-AE-B8-01-6D-38-9D-DC-93-68-AB-93-D6-C0-8A-8A-63-B4-D6-DA-21-C1-A0-28-8C-24-C4-27-E1-4B-30-D2-2D-87-62-F9-17-75-21-5E-E1-3C-E2-2D-92-03-C6-A1-8D-1D-E9-67-F4-CE-FF-AC-52-86-D2-F5-0F-EB-03-01-02-41-00-ED-6A-AE-A7-33-B0-B8-86-36-91-BA-E7-D2-DD-15-3A-97-A2-66-31-98-24-A6-0D-E7-09-E3-BD-36-79-91-F2-5E-23-AA-21-C9-71-43-24-10-FA-F0-E6-FC-E4-C6-1F-08-45-E8-91-74-13-69-63-A5-40-8F-38-44-2B-54-69-02-41-00-E6-FE-39-8B-6F-DB-44-CA-E7-72-D3-CA-09-5B-3D-B1-53-85-29-36-FC-F1-B9-D8-1F-64-02-D4-F7-F5-71-E5-9F-17-D7-F3-9F-5A-3A-A6-A3-62-46-F6-93-3D-D3-CD-18-F2-12-BD-68-02-AA-91-55-DA-64-26-D7-16-34-E1-02-40-60-3F-F4-C8-72-4B-3D-B3-A3-A1-D6-FD-2E-DE-54-41-E9-C1-7B-DE-B5-48-7E-4D-7A-91-E6-D3-09-A7-A5-84-75-A7-CD-CC-5E-C7-5D-29-DC-FC-6E-F7-A6-24-F5-31-15-80-89-F5-95-F2-5C-B2-7A-07-3F-48-D7-52-1D-A9-02-40-40-1B-FC-C2-9B-57-E2-DE-E1-9F-B7-F2-11-E8-B5-D5-9A-55-91-DB-C6-16-1C-BB-43-F3-10-EA-24-AB-85-61-F2-66-BE-B3-C9-DD-53-FB-DD-CA-AF-E1-4D-7A-52-67-50-EE-16-8F-64-E7-A0-89-57-A7-96-36-45-69-CF-61-02-40-3D-9E-E3-29-D6-BD-59-FF-A5-C3-AC-57-CB-74-FE-B0-C3-67-34-A8-40-EB-04-88-C3-C2-74-4F-69-77-13-48-8A-97-3C-C2-4B-CD-E8-E0-97-98-A2-3F-B6-E2-71-D3-65-9F-5A-C6-C8-AE-FE-BA-B1-ED-DA-08-8A-5B-7B-12", BitConverter.ToString (p8.PrivateKey));
-			AssertEquals ("Version", 0, p8.Version);
+			Assert.AreEqual ("1.2.840.113549.1.1.1", p8.Algorithm, "Algorithm");
+			Assert.AreEqual (0, p8.Attributes.Count, "Attributes");
+			Assert.AreEqual ("30-82-02-5B-02-01-00-02-81-81-00-D6-39-9E-21-93-E2-BA-35-7F-E5-F8-E8-87-0B-8A-5F-28-25-85-B7-E5-CC-DA-7F-D3-C7-09-2A-63-E9-AD-8F-D0-A8-EF-BA-CF-3C-FB-55-03-B9-83-29-4E-0E-89-84-FB-E2-62-16-1F-9D-87-40-16-6B-F8-F4-66-38-58-74-67-D4-B5-A1-3A-4B-6F-13-4B-08-37-3A-3A-64-0A-06-8E-A2-7B-14-88-B7-F8-CE-6A-D1-45-9B-39-93-67-BF-0A-AB-DB-37-9D-FA-CE-54-0F-37-82-09-8F-0D-33-E4-B8-6E-46-C1-CC-4F-80-5A-B4-BD-19-80-27-40-84-49-02-03-01-00-01-02-81-80-14-95-5A-AD-4D-41-56-B4-F7-42-08-85-87-1C-43-C2-5A-E0-28-16-00-5D-8B-8D-06-B3-34-1D-3F-96-5F-57-D7-2B-B4-45-15-CE-7D-33-B0-F4-ED-36-55-CA-AD-C9-FA-4D-C9-30-E8-FE-C0-D5-16-92-6F-4C-44-5A-1B-9D-7E-AE-B8-01-6D-38-9D-DC-93-68-AB-93-D6-C0-8A-8A-63-B4-D6-DA-21-C1-A0-28-8C-24-C4-27-E1-4B-30-D2-2D-87-62-F9-17-75-21-5E-E1-3C-E2-2D-92-03-C6-A1-8D-1D-E9-67-F4-CE-FF-AC-52-86-D2-F5-0F-EB-03-01-02-41-00-ED-6A-AE-A7-33-B0-B8-86-36-91-BA-E7-D2-DD-15-3A-97-A2-66-31-98-24-A6-0D-E7-09-E3-BD-36-79-91-F2-5E-23-AA-21-C9-71-43-24-10-FA-F0-E6-FC-E4-C6-1F-08-45-E8-91-74-13-69-63-A5-40-8F-38-44-2B-54-69-02-41-00-E6-FE-39-8B-6F-DB-44-CA-E7-72-D3-CA-09-5B-3D-B1-53-85-29-36-FC-F1-B9-D8-1F-64-02-D4-F7-F5-71-E5-9F-17-D7-F3-9F-5A-3A-A6-A3-62-46-F6-93-3D-D3-CD-18-F2-12-BD-68-02-AA-91-55-DA-64-26-D7-16-34-E1-02-40-60-3F-F4-C8-72-4B-3D-B3-A3-A1-D6-FD-2E-DE-54-41-E9-C1-7B-DE-B5-48-7E-4D-7A-91-E6-D3-09-A7-A5-84-75-A7-CD-CC-5E-C7-5D-29-DC-FC-6E-F7-A6-24-F5-31-15-80-89-F5-95-F2-5C-B2-7A-07-3F-48-D7-52-1D-A9-02-40-40-1B-FC-C2-9B-57-E2-DE-E1-9F-B7-F2-11-E8-B5-D5-9A-55-91-DB-C6-16-1C-BB-43-F3-10-EA-24-AB-85-61-F2-66-BE-B3-C9-DD-53-FB-DD-CA-AF-E1-4D-7A-52-67-50-EE-16-8F-64-E7-A0-89-57-A7-96-36-45-69-CF-61-02-40-3D-9E-E3-29-D6-BD-59-FF-A5-C3-AC-57-CB-74-FE-B0-C3-67-34-A8-40-EB-04-88-C3-C2-74-4F-69-77-13-48-8A-97-3C-C2-4B-CD-E8-E0-97-98-A2-3F-B6-E2-71-D3-65-9F-5A-C6-C8-AE-FE-BA-B1-ED-DA-08-8A-5B-7B-12", BitConverter.ToString (p8.PrivateKey), "PrivateKey");
+			Assert.AreEqual (0, p8.Version, "Version");
 			// static
 			RSA rsa = PKCS8.PrivateKeyInfo.DecodeRSA (p8.PrivateKey);
-			AssertEquals ("DecodeRSA", "<RSAKeyValue><Modulus>1jmeIZPiujV/5fjohwuKXyglhbflzNp/08cJKmPprY/QqO+6zzz7VQO5gylODomE++JiFh+dh0AWa/j0ZjhYdGfUtaE6S28TSwg3OjpkCgaOonsUiLf4zmrRRZs5k2e/CqvbN536zlQPN4IJjw0z5LhuRsHMT4BatL0ZgCdAhEk=</Modulus><Exponent>AQAB</Exponent><P>7WqupzOwuIY2kbrn0t0VOpeiZjGYJKYN5wnjvTZ5kfJeI6ohyXFDJBD68Ob85MYfCEXokXQTaWOlQI84RCtUaQ==</P><Q>5v45i2/bRMrnctPKCVs9sVOFKTb88bnYH2QC1Pf1ceWfF9fzn1o6pqNiRvaTPdPNGPISvWgCqpFV2mQm1xY04Q==</Q><DP>YD/0yHJLPbOjodb9Lt5UQenBe961SH5NepHm0wmnpYR1p83MXsddKdz8bvemJPUxFYCJ9ZXyXLJ6Bz9I11IdqQ==</DP><DQ>QBv8wptX4t7hn7fyEei11ZpVkdvGFhy7Q/MQ6iSrhWHyZr6zyd1T+93Kr+FNelJnUO4Wj2TnoIlXp5Y2RWnPYQ==</DQ><InverseQ>PZ7jKda9Wf+lw6xXy3T+sMNnNKhA6wSIw8J0T2l3E0iKlzzCS83o4JeYoj+24nHTZZ9axsiu/rqx7doIilt7Eg==</InverseQ><D>FJVarU1BVrT3QgiFhxxDwlrgKBYAXYuNBrM0HT+WX1fXK7RFFc59M7D07TZVyq3J+k3JMOj+wNUWkm9MRFobnX6uuAFtOJ3ck2irk9bAiopjtNbaIcGgKIwkxCfhSzDSLYdi+Rd1IV7hPOItkgPGoY0d6Wf0zv+sUobS9Q/rAwE=</D></RSAKeyValue>", rsa.ToXmlString (true));
+			Assert.AreEqual ("<RSAKeyValue><Modulus>1jmeIZPiujV/5fjohwuKXyglhbflzNp/08cJKmPprY/QqO+6zzz7VQO5gylODomE++JiFh+dh0AWa/j0ZjhYdGfUtaE6S28TSwg3OjpkCgaOonsUiLf4zmrRRZs5k2e/CqvbN536zlQPN4IJjw0z5LhuRsHMT4BatL0ZgCdAhEk=</Modulus><Exponent>AQAB</Exponent><P>7WqupzOwuIY2kbrn0t0VOpeiZjGYJKYN5wnjvTZ5kfJeI6ohyXFDJBD68Ob85MYfCEXokXQTaWOlQI84RCtUaQ==</P><Q>5v45i2/bRMrnctPKCVs9sVOFKTb88bnYH2QC1Pf1ceWfF9fzn1o6pqNiRvaTPdPNGPISvWgCqpFV2mQm1xY04Q==</Q><DP>YD/0yHJLPbOjodb9Lt5UQenBe961SH5NepHm0wmnpYR1p83MXsddKdz8bvemJPUxFYCJ9ZXyXLJ6Bz9I11IdqQ==</DP><DQ>QBv8wptX4t7hn7fyEei11ZpVkdvGFhy7Q/MQ6iSrhWHyZr6zyd1T+93Kr+FNelJnUO4Wj2TnoIlXp5Y2RWnPYQ==</DQ><InverseQ>PZ7jKda9Wf+lw6xXy3T+sMNnNKhA6wSIw8J0T2l3E0iKlzzCS83o4JeYoj+24nHTZZ9axsiu/rqx7doIilt7Eg==</InverseQ><D>FJVarU1BVrT3QgiFhxxDwlrgKBYAXYuNBrM0HT+WX1fXK7RFFc59M7D07TZVyq3J+k3JMOj+wNUWkm9MRFobnX6uuAFtOJ3ck2irk9bAiopjtNbaIcGgKIwkxCfhSzDSLYdi+Rd1IV7hPOItkgPGoY0d6Wf0zv+sUobS9Q/rAwE=</D></RSAKeyValue>", rsa.ToXmlString (true), "DecodeRSA");
 		}
 
 		[Test]
@@ -109,31 +109,31 @@ namespace MonoTests.Mono.Security.Cryptography {
 		public void PrivateKeyInfo () 
 		{
 			PKCS8.PrivateKeyInfo p8 = new PKCS8.PrivateKeyInfo ();
-			AssertNull ("Default-Algorithm", p8.Algorithm);
-			AssertEquals ("Default-Attributes", 0, p8.Attributes.Count);
-			AssertNull ("Default-PrivateKey", p8.PrivateKey);
-			AssertEquals ("Default-Version", 0, p8.Version);
+			Assert.IsNull (p8.Algorithm, "Default-Algorithm");
+			Assert.AreEqual (0, p8.Attributes.Count, "Default-Attributes");
+			Assert.IsNull (p8.PrivateKey, "Default-PrivateKey");
+			Assert.AreEqual (0, p8.Version, "Default-Version");
 			
 			byte[] key = new byte [8];
 			p8.Algorithm = "1.2.3.4.5";
 			p8.Attributes.Add (new ASN1 (0x05)); // NULL
 			p8.PrivateKey = key;
 			p8.Version = 1;
-			AssertEquals ("Algorithm", "1.2.3.4.5", p8.Algorithm);
-			AssertEquals ("Attributes", 1, p8.Attributes.Count);
-			AssertEquals ("PrivateKey", 8, p8.PrivateKey.Length);
-			AssertEquals ("Version", 1, p8.Version);
+			Assert.AreEqual ("1.2.3.4.5", p8.Algorithm, "Algorithm");
+			Assert.AreEqual (1, p8.Attributes.Count, "Attributes");
+			Assert.AreEqual (8, p8.PrivateKey.Length, "PrivateKey");
+			Assert.AreEqual (1, p8.Version, "Version");
 			
 			key [0] = 1;
-			AssertEquals ("PrivateKey not directly accessible", 0, p8.PrivateKey [0]);
+			Assert.AreEqual (0, p8.PrivateKey [0], "PrivateKey not directly accessible");
 			
 			byte[] p8pki = p8.GetBytes ();
 			
 			PKCS8.PrivateKeyInfo decoded = new PKCS8.PrivateKeyInfo (p8pki);
-			AssertEquals ("Decoded-Algorithm", "1.2.3.4.5", decoded.Algorithm);
-			AssertEquals ("Decoded-Attributes", 1, decoded.Attributes.Count);
-			AssertEquals ("Decoded-PrivateKey", 8, decoded.PrivateKey.Length);
-			AssertEquals ("Decoded-Version", 1, decoded.Version);
+			Assert.AreEqual ("1.2.3.4.5", decoded.Algorithm, "Decoded-Algorithm");
+			Assert.AreEqual (1, decoded.Attributes.Count, "Decoded-Attributes");
+			Assert.AreEqual (8, decoded.PrivateKey.Length, "Decoded-PrivateKey");
+			Assert.AreEqual (1, decoded.Version, "Decoded-Version");
 		}
 		
 		[Test]
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/ChallengeResponseTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/ChallengeResponseTest.cs
index ba0f403e8a7..ef27bd73630 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/ChallengeResponseTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/ChallengeResponseTest.cs
@@ -17,7 +17,7 @@ using NUnit.Framework;
 namespace MonoTests.Mono.Security.Protocol.Ntlm {
 
 	[TestFixture]
-	public class ChallengeResponseTest : Assertion {
+	public class ChallengeResponseTest {
 
 		[Test]
 		// Example from http://www.innovation.ch/java/ntlm.html
@@ -25,8 +25,8 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			byte[] SrvNonce = Encoding.ASCII.GetBytes ("SrvNonce");
 			using (ChallengeResponse ntlm = new ChallengeResponse ("Beeblebrox", SrvNonce)) {
-				AssertEquals ("NT", "E0-E0-0D-E3-10-4A-1B-F2-05-3F-07-C7-DD-A8-2D-3C-48-9A-E9-89-E1-B0-00-D3", BitConverter.ToString (ntlm.NT));
-				AssertEquals ("LM", "AD-87-CA-6D-EF-E3-46-85-B9-C4-3C-47-7A-8C-42-D6-00-66-7D-68-92-E7-E8-97", BitConverter.ToString (ntlm.LM));
+				Assert.AreEqual ("E0-E0-0D-E3-10-4A-1B-F2-05-3F-07-C7-DD-A8-2D-3C-48-9A-E9-89-E1-B0-00-D3", BitConverter.ToString (ntlm.NT), "NT");
+				Assert.AreEqual ("AD-87-CA-6D-EF-E3-46-85-B9-C4-3C-47-7A-8C-42-D6-00-66-7D-68-92-E7-E8-97", BitConverter.ToString (ntlm.LM), "LM");
 			}
 		}
 
@@ -36,8 +36,8 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			byte[] SrvNonce = new byte [8] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 };
 			using (ChallengeResponse ntlm = new ChallengeResponse ("WELCOME", SrvNonce)) {
-				AssertEquals ("NT", "7A-CE-90-85-AB-CC-37-59-38-0B-1C-68-62-E3-98-C3-C0-EF-9C-FC-22-E8-A2-C2", BitConverter.ToString (ntlm.NT));
-				AssertEquals ("LM", "CA-12-00-72-3C-41-D5-77-AB-18-C7-64-C6-DE-F3-4F-A6-1B-FA-06-71-EA-5F-C8", BitConverter.ToString (ntlm.LM));
+				Assert.AreEqual ("7A-CE-90-85-AB-CC-37-59-38-0B-1C-68-62-E3-98-C3-C0-EF-9C-FC-22-E8-A2-C2", BitConverter.ToString (ntlm.NT), "NT");
+				Assert.AreEqual ("CA-12-00-72-3C-41-D5-77-AB-18-C7-64-C6-DE-F3-4F-A6-1B-FA-06-71-EA-5F-C8", BitConverter.ToString (ntlm.LM), "LM");
 			}
 		}
 
@@ -46,9 +46,9 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			byte[] SrvNonce = new byte [8] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 };
 			using (ChallengeResponse ntlm = new ChallengeResponse (null, SrvNonce)) {
-				AssertEquals ("NT", "4A-FD-81-EC-01-87-E8-8D-97-77-8D-F7-93-C6-DA-D4-F0-3A-36-63-66-9D-20-1C", BitConverter.ToString (ntlm.NT));
+				Assert.AreEqual ("4A-FD-81-EC-01-87-E8-8D-97-77-8D-F7-93-C6-DA-D4-F0-3A-36-63-66-9D-20-1C", BitConverter.ToString (ntlm.NT), "NT");
 				// note the last 8 bytes... they are the same as the previous unit test ;-)
-				AssertEquals ("LM", "0A-39-2B-11-CF-05-2B-02-6D-65-CF-F5-68-BD-E4-15-A6-1B-FA-06-71-EA-5F-C8", BitConverter.ToString (ntlm.LM));
+				Assert.AreEqual ("0A-39-2B-11-CF-05-2B-02-6D-65-CF-F5-68-BD-E4-15-A6-1B-FA-06-71-EA-5F-C8", BitConverter.ToString (ntlm.LM), "LM");
 			}
 		}
 
@@ -58,8 +58,8 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 			byte[] SrvNonce = new byte [8] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 };
 			using (ChallengeResponse ntlm = new ChallengeResponse (String.Empty, SrvNonce)) {
 				// same as the previous one as this is the same (null/empty) password expressed diffently
-				AssertEquals ("NT", "4A-FD-81-EC-01-87-E8-8D-97-77-8D-F7-93-C6-DA-D4-F0-3A-36-63-66-9D-20-1C", BitConverter.ToString (ntlm.NT));
-				AssertEquals ("LM", "0A-39-2B-11-CF-05-2B-02-6D-65-CF-F5-68-BD-E4-15-A6-1B-FA-06-71-EA-5F-C8", BitConverter.ToString (ntlm.LM));
+				Assert.AreEqual ("4A-FD-81-EC-01-87-E8-8D-97-77-8D-F7-93-C6-DA-D4-F0-3A-36-63-66-9D-20-1C", BitConverter.ToString (ntlm.NT), "NT");
+				Assert.AreEqual ("0A-39-2B-11-CF-05-2B-02-6D-65-CF-F5-68-BD-E4-15-A6-1B-FA-06-71-EA-5F-C8", BitConverter.ToString (ntlm.LM), "LM");
 			}
 		}
 		
@@ -68,8 +68,8 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			ChallengeResponse ntlm = new ChallengeResponse ("Mono", new byte [8]);
 			// no out!
-			AssertNull ("Password", ntlm.Password);
-			AssertNull ("Challenge", ntlm.Challenge);
+			Assert.IsNull (ntlm.Password, "Password");
+			Assert.IsNull (ntlm.Challenge, "Challenge");
 		}
 		
 		[Test] 
@@ -104,7 +104,7 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			ChallengeResponse ntlm = new ChallengeResponse ("Mono", new byte [8]);
 			ntlm.Dispose ();
-			AssertNotNull ("NT", ntlm.NT);
+			Assert.IsNotNull (ntlm.NT, "NT");
 		}
 
 		[Test] 
@@ -113,7 +113,7 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			ChallengeResponse ntlm = new ChallengeResponse ("Mono", new byte [8]);
 			ntlm.Dispose ();
-			AssertNotNull ("LM", ntlm.LM);
+			Assert.IsNotNull (ntlm.LM, "LM");
 		}
 	}
 }
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/MessageBaseTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/MessageBaseTest.cs
index 7164640be9b..a02816fadc7 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/MessageBaseTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/MessageBaseTest.cs
@@ -15,7 +15,7 @@ using NUnit.Framework;
 namespace MonoTests.Mono.Security.Protocol.Ntlm {
 
 	[TestFixture]
-	public class MessageBaseTest : Assertion {
+	public class MessageBaseTest {
 	
 		// 
 	
@@ -42,4 +42,4 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		}
 
 	}
-}
-\ No newline at end of file
+}
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type1MessageTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type1MessageTest.cs
index c6dc2394d93..5bd097e1d48 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type1MessageTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type1MessageTest.cs
@@ -16,17 +16,17 @@ using NUnit.Framework;
 namespace MonoTests.Mono.Security.Protocol.Ntlm {
 
 	[TestFixture]
-	public class Type1MessageTest : Assertion {
+	public class Type1MessageTest {
 
 		[Test]
 		// Example from http://www.innovation.ch/java/ntlm.html
 		public void Encode1 () 
 		{
 			Type1Message msg = new Type1Message ();
-			AssertEquals ("Type", 1, msg.Type);
+			Assert.AreEqual (1, msg.Type, "Type");
 			msg.Domain = "Ursa-Minor";
 			msg.Host = "LightCity";
-			AssertEquals ("GetBytes", "4E-54-4C-4D-53-53-50-00-01-00-00-00-07-B2-00-00-0A-00-0A-00-29-00-00-00-09-00-09-00-20-00-00-00-4C-49-47-48-54-43-49-54-59-55-52-53-41-2D-4D-49-4E-4F-52", BitConverter.ToString (msg.GetBytes ()));
+			Assert.AreEqual ("4E-54-4C-4D-53-53-50-00-01-00-00-00-07-B2-00-00-0A-00-0A-00-29-00-00-00-09-00-09-00-20-00-00-00-4C-49-47-48-54-43-49-54-59-55-52-53-41-2D-4D-49-4E-4F-52", BitConverter.ToString (msg.GetBytes ()), "GetBytes");
 		}
 
 		[Test]
@@ -35,10 +35,10 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			byte[] data = { 0x4e, 0x54, 0x4c, 0x4d, 0x53, 0x53, 0x50, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0xb2, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x29, 0x00, 0x00, 0x00, 0x09, 0x00, 0x09, 0x00, 0x20, 0x00, 0x00, 0x00, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x43, 0x49, 0x54, 0x59, 0x55, 0x52, 0x53, 0x41, 0x2d, 0x4d, 0x49, 0x4e, 0x4f, 0x52 };
 			Type1Message msg = new Type1Message (data);
-			AssertEquals ("Domain", "URSA-MINOR", msg.Domain);
-			AssertEquals ("Flags", (NtlmFlags)0xb203, msg.Flags);
-			AssertEquals ("Host", "LIGHTCITY", msg.Host);
-			AssertEquals ("Type", 1, msg.Type);
+			Assert.AreEqual ("URSA-MINOR", msg.Domain, "Domain");
+			Assert.AreEqual ((NtlmFlags)0xb203, msg.Flags, "Flags");
+			Assert.AreEqual ("LIGHTCITY", msg.Host, "Host");
+			Assert.AreEqual (1, msg.Type, "Type");
 		}
 
 		[Test]
@@ -47,10 +47,10 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			byte[] data = { 0x4e, 0x54, 0x4c, 0x4d, 0x53, 0x53, 0x50, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07, 0x32, 0x00, 0x00, 0x06, 0x00, 0x06, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x0b, 0x00, 0x20, 0x00, 0x00, 0x00, 0x57, 0x4f, 0x52, 0x4b, 0x53, 0x54, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x44, 0x4f, 0x4d, 0x41, 0x49, 0x4e };
 			Type1Message msg = new Type1Message (data);
-			AssertEquals ("Domain", "DOMAIN", msg.Domain);
-			AssertEquals ("Flags", (NtlmFlags)0x3207, msg.Flags);
-			AssertEquals ("Host", "WORKSTATION", msg.Host);
-			AssertEquals ("Type", 1, msg.Type);
+			Assert.AreEqual ("DOMAIN", msg.Domain, "Domain");
+			Assert.AreEqual ((NtlmFlags)0x3207, msg.Flags, "Flags");
+			Assert.AreEqual ("WORKSTATION", msg.Host, "Host");
+			Assert.AreEqual (1, msg.Type, "Type");
 		}
 	}
 }
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type2MessageTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type2MessageTest.cs
index bd1b38349a3..6233e0fe755 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type2MessageTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type2MessageTest.cs
@@ -17,7 +17,7 @@ using NUnit.Framework;
 namespace MonoTests.Mono.Security.Protocol.Ntlm {
 
 	[TestFixture]
-	public class Type2MessageTest : Assertion {
+	public class Type2MessageTest {
 
 		static byte[] nonce = { 0x53, 0x72, 0x76, 0x4e, 0x6f, 0x6e, 0x63, 0x65 };
 
@@ -26,9 +26,9 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		public void Encode1 () 
 		{
 			Type2Message msg = new Type2Message ();
-			AssertEquals ("Type", 2, msg.Type);
+			Assert.AreEqual (2, msg.Type, "Type");
 			msg.Nonce = nonce;
-			AssertEquals ("GetBytes", "4E-54-4C-4D-53-53-50-00-02-00-00-00-00-00-00-00-28-00-00-00-01-82-00-00-53-72-76-4E-6F-6E-63-65-00-00-00-00-00-00-00-00", BitConverter.ToString (msg.GetBytes ()));
+			Assert.AreEqual ("4E-54-4C-4D-53-53-50-00-02-00-00-00-00-00-00-00-28-00-00-00-01-82-00-00-53-72-76-4E-6F-6E-63-65-00-00-00-00-00-00-00-00", BitConverter.ToString (msg.GetBytes ()), "GetBytes");
 		}
 
 		[Test]
@@ -37,9 +37,9 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			byte[] data = { 0x4e, 0x54, 0x4c, 0x4d, 0x53, 0x53, 0x50, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x01, 0x82, 0x00, 0x00, 0x53, 0x72, 0x76, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 			Type2Message msg = new Type2Message (data);
-			AssertEquals ("Flags", (NtlmFlags)0x8201, msg.Flags);
-			AssertEquals ("Nonce", BitConverter.ToString (nonce), BitConverter.ToString (msg.Nonce));
-			AssertEquals ("Type", 2, msg.Type);
+			Assert.AreEqual ((NtlmFlags)0x8201, msg.Flags, "Flags");
+			Assert.AreEqual (BitConverter.ToString (nonce), BitConverter.ToString (msg.Nonce), "Nonce");
+			Assert.AreEqual (2, msg.Type, "Type");
 		}
 
 		[Test]
@@ -48,9 +48,9 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		{
 			byte[] data = { 0x4e, 0x54, 0x4c, 0x4d, 0x53, 0x53, 0x50, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x30, 0x00, 0x00, 0x00, 0x01, 0x02, 0x81, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x00, 0x62, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x44, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x41, 0x00, 0x49, 0x00, 0x4e, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x44, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x41, 0x00, 0x49, 0x00, 0x4e, 0x00, 0x01, 0x00, 0x0c, 0x00, 0x53, 0x00, 0x45, 0x00, 0x52, 0x00, 0x56, 0x00, 0x45, 0x00, 0x52, 0x00, 0x04, 0x00, 0x14, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x2e, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x03, 0x00, 0x22, 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x2e, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00 };
 			Type2Message msg = new Type2Message (data);
-			AssertEquals ("Flags", (NtlmFlags)0x00810201, msg.Flags);
-			AssertEquals ("Nonce", "01-23-45-67-89-AB-CD-EF", BitConverter.ToString (msg.Nonce));
-			AssertEquals ("Type", 2, msg.Type);
+			Assert.AreEqual ((NtlmFlags)0x00810201, msg.Flags, "Flags");
+			Assert.AreEqual ("01-23-45-67-89-AB-CD-EF", BitConverter.ToString (msg.Nonce), "Nonce");
+			Assert.AreEqual (2, msg.Type, "Type");
 		}
 		
 		[Test]
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type3MessageTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type3MessageTest.cs
index febcb797552..e9343cc979f 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type3MessageTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.Protocol.Ntlm/Type3MessageTest.cs
@@ -17,7 +17,7 @@ using NUnit.Framework;
 namespace MonoTests.Mono.Security.Protocol.Ntlm {
 
 	[TestFixture]
-	public class Type3MessageTest : Assertion {
+	public class Type3MessageTest {
 
 		static byte[] nonce = { 0x53, 0x72, 0x76, 0x4e, 0x6f, 0x6e, 0x63, 0x65 };
 
@@ -40,8 +40,8 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 			msg.Host = "HOST";
 			msg.Password = "WELCOME";
 			msg.Username = "username";
-			AssertEquals ("Type", 3, msg.Type);
-			AssertEquals ("GetBytes", "4E-54-4C-4D-53-53-50-00-03-00-00-00-18-00-18-00-64-00-00-00-18-00-18-00-7C-00-00-00-0C-00-0C-00-40-00-00-00-10-00-10-00-4C-00-00-00-08-00-08-00-5C-00-00-00-00-00-00-00-94-00-00-00-01-B2-00-00-44-00-4F-00-4D-00-41-00-49-00-4E-00-75-00-73-00-65-00-72-00-6E-00-61-00-6D-00-65-00-48-00-4F-00-53-00-54-00-CA-12-00-72-3C-41-D5-77-AB-18-C7-64-C6-DE-F3-4F-A6-1B-FA-06-71-EA-5F-C8-7A-CE-90-85-AB-CC-37-59-38-0B-1C-68-62-E3-98-C3-C0-EF-9C-FC-22-E8-A2-C2", BitConverter.ToString (msg.GetBytes ()));
+			Assert.AreEqual (3, msg.Type, "Type");
+			Assert.AreEqual ("4E-54-4C-4D-53-53-50-00-03-00-00-00-18-00-18-00-64-00-00-00-18-00-18-00-7C-00-00-00-0C-00-0C-00-40-00-00-00-10-00-10-00-4C-00-00-00-08-00-08-00-5C-00-00-00-00-00-00-00-94-00-00-00-01-B2-00-00-44-00-4F-00-4D-00-41-00-49-00-4E-00-75-00-73-00-65-00-72-00-6E-00-61-00-6D-00-65-00-48-00-4F-00-53-00-54-00-CA-12-00-72-3C-41-D5-77-AB-18-C7-64-C6-DE-F3-4F-A6-1B-FA-06-71-EA-5F-C8-7A-CE-90-85-AB-CC-37-59-38-0B-1C-68-62-E3-98-C3-C0-EF-9C-FC-22-E8-A2-C2", BitConverter.ToString (msg.GetBytes ()), "GetBytes");
 		}
 
 		[Test]
@@ -55,8 +55,8 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 			msg.Host = "LIGHTCITY";
 			msg.Password = "Beeblebrox";
 			msg.Username = "Zaphod";
-			AssertEquals ("Type", 3, msg.Type);
-			AssertEquals ("GetBytes", "4E-54-4C-4D-53-53-50-00-03-00-00-00-18-00-18-00-72-00-00-00-18-00-18-00-8A-00-00-00-14-00-14-00-40-00-00-00-0C-00-0C-00-54-00-00-00-12-00-12-00-60-00-00-00-00-00-00-00-A2-00-00-00-01-B2-00-00-55-00-52-00-53-00-41-00-2D-00-4D-00-49-00-4E-00-4F-00-52-00-5A-00-61-00-70-00-68-00-6F-00-64-00-4C-00-49-00-47-00-48-00-54-00-43-00-49-00-54-00-59-00-AD-87-CA-6D-EF-E3-46-85-B9-C4-3C-47-7A-8C-42-D6-00-66-7D-68-92-E7-E8-97-E0-E0-0D-E3-10-4A-1B-F2-05-3F-07-C7-DD-A8-2D-3C-48-9A-E9-89-E1-B0-00-D3", BitConverter.ToString (msg.GetBytes ()));
+			Assert.AreEqual (3, msg.Type, "Type");
+			Assert.AreEqual ("4E-54-4C-4D-53-53-50-00-03-00-00-00-18-00-18-00-72-00-00-00-18-00-18-00-8A-00-00-00-14-00-14-00-40-00-00-00-0C-00-0C-00-54-00-00-00-12-00-12-00-60-00-00-00-00-00-00-00-A2-00-00-00-01-B2-00-00-55-00-52-00-53-00-41-00-2D-00-4D-00-49-00-4E-00-4F-00-52-00-5A-00-61-00-70-00-68-00-6F-00-64-00-4C-00-49-00-47-00-48-00-54-00-43-00-49-00-54-00-59-00-AD-87-CA-6D-EF-E3-46-85-B9-C4-3C-47-7A-8C-42-D6-00-66-7D-68-92-E7-E8-97-E0-E0-0D-E3-10-4A-1B-F2-05-3F-07-C7-DD-A8-2D-3C-48-9A-E9-89-E1-B0-00-D3", BitConverter.ToString (msg.GetBytes ()), "GetBytes");
 		}
 
 		[Test]
@@ -64,14 +64,14 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		public void Decode1 () 
 		{
 			Type3Message msg = new Type3Message (data1);
-			AssertEquals ("Domain", "URSA-MINOR", msg.Domain);
-			AssertEquals ("Host", "LIGHTCITY", msg.Host);
-			AssertEquals ("Username", "Zaphod", msg.Username);
-			AssertEquals ("Flags", (NtlmFlags)0x8201, msg.Flags);
-			AssertEquals ("Type", 3, msg.Type);
-			AssertNull ("Password", msg.Password);
-			AssertEquals ("LM", "AD-87-CA-6D-EF-E3-46-85-B9-C4-3C-47-7A-8C-42-D6-00-66-7D-68-92-E7-E8-97", BitConverter.ToString (msg.LM));
-			AssertEquals ("NT", "E0-E0-0D-E3-10-4A-1B-F2-05-3F-07-C7-DD-A8-2D-3C-48-9A-E9-89-E1-B0-00-D3", BitConverter.ToString (msg.NT));
+			Assert.AreEqual ("URSA-MINOR", msg.Domain, "Domain");
+			Assert.AreEqual ("LIGHTCITY", msg.Host, "Host");
+			Assert.AreEqual ("Zaphod", msg.Username, "Username");
+			Assert.AreEqual ((NtlmFlags)0x8201, msg.Flags, "Flags");
+			Assert.AreEqual (3, msg.Type, "Type");
+			Assert.IsNull (msg.Password, "Password");
+			Assert.AreEqual ("AD-87-CA-6D-EF-E3-46-85-B9-C4-3C-47-7A-8C-42-D6-00-66-7D-68-92-E7-E8-97", BitConverter.ToString (msg.LM), "LM");
+			Assert.AreEqual ("E0-E0-0D-E3-10-4A-1B-F2-05-3F-07-C7-DD-A8-2D-3C-48-9A-E9-89-E1-B0-00-D3", BitConverter.ToString (msg.NT), "NT");
 		}
 
 		[Test]
@@ -79,28 +79,28 @@ namespace MonoTests.Mono.Security.Protocol.Ntlm {
 		public void Decode2 () 
 		{
 			Type3Message msg = new Type3Message (data2);
-			AssertEquals ("Domain", "DOMAIN", msg.Domain);
-			AssertEquals ("Host", "WORKSTATION", msg.Host);
-			AssertEquals ("Username", "user", msg.Username);
-			AssertEquals ("Flags", (NtlmFlags)0x201, msg.Flags);
-			AssertEquals ("Type", 3, msg.Type);
-			AssertNull ("Password", msg.Password);
-			AssertEquals ("LM", "C3-37-CD-5C-BD-44-FC-97-82-A6-67-AF-6D-42-7C-6D-E6-7C-20-C2-D3-E7-7C-56", BitConverter.ToString (msg.LM));
-			AssertEquals ("NT", "25-A9-8C-1C-31-E8-18-47-46-6B-29-B2-DF-46-80-F3-99-58-FB-8C-21-3A-9C-C6", BitConverter.ToString (msg.NT));
+			Assert.AreEqual ("DOMAIN", msg.Domain, "Domain");
+			Assert.AreEqual ("WORKSTATION", msg.Host, "Host");
+			Assert.AreEqual ("user", msg.Username, "Username");
+			Assert.AreEqual ((NtlmFlags)0x201, msg.Flags, "Flags");
+			Assert.AreEqual (3, msg.Type, "Type");
+			Assert.IsNull (msg.Password, "Password");
+			Assert.AreEqual ("C3-37-CD-5C-BD-44-FC-97-82-A6-67-AF-6D-42-7C-6D-E6-7C-20-C2-D3-E7-7C-56", BitConverter.ToString (msg.LM), "LM");
+			Assert.AreEqual ("25-A9-8C-1C-31-E8-18-47-46-6B-29-B2-DF-46-80-F3-99-58-FB-8C-21-3A-9C-C6", BitConverter.ToString (msg.NT), "NT");
 		}
 
 		[Test]
 		public void Challenge () 
 		{
 			Type3Message msg = new Type3Message ();
-			AssertNull ("Challenge", msg.Challenge);
+			Assert.IsNull (msg.Challenge, "Challenge");
 			
 			byte[] c = new byte [8];
 			msg.Challenge = c;
-			AssertEquals ("Challenge.Length", 8, msg.Challenge.Length);
+			Assert.AreEqual (8, msg.Challenge.Length, "Challenge.Length");
 			
 			c [0] = 1;
-			AssertEquals ("Challenge not directly accessible", 0, msg.Challenge [0]);
+			Assert.AreEqual (0, msg.Challenge [0], "Challenge not directly accessible");
 		}
 		
 		[Test]
diff --git a/mcs/class/Mono.Security/Test/Mono.Security/StrongNameTest.cs b/mcs/class/Mono.Security/Test/Mono.Security/StrongNameTest.cs
index 05e013cd4aa..fe94f26e01b 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security/StrongNameTest.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security/StrongNameTest.cs
@@ -22,7 +22,7 @@ namespace MonoTests.Mono.Security {
 	// sn -k test.snk
 
 	[TestFixture]
-	public class StrongNameTest : Assertion {
+	public class StrongNameTest {
 
 		// because most crypto stuff works with byte[] buffers
 		static public void AssertEquals (string msg, byte[] array1, byte[] array2) 
@@ -30,9 +30,9 @@ namespace MonoTests.Mono.Security {
 			if ((array1 == null) && (array2 == null))
 				return;
 			if (array1 == null)
-				Fail (msg + " -> First array is NULL");
+				Assert.Fail (msg + " -> First array is NULL");
 			if (array2 == null)
-				Fail (msg + " -> Second array is NULL");
+				Assert.Fail (msg + " -> Second array is NULL");
 
 			bool a = (array1.Length == array2.Length);
 			if (a) {
@@ -47,7 +47,7 @@ namespace MonoTests.Mono.Security {
 				msg += " -> Expected " + BitConverter.ToString (array1, 0);
 				msg += " is different than " + BitConverter.ToString (array2, 0);
 			}
-			Assert (msg, a);
+			Assert.IsTrue (a, msg);
 		}
 
 		static byte[] test = { 
@@ -112,9 +112,9 @@ namespace MonoTests.Mono.Security {
 		public void FromBuffer ()
 		{
 			StrongName sn = new StrongName (test);
-			AssertEquals ("buffer.RSA", "<RSAKeyValue><Modulus>y6T/+EoARJMHW0ilpCdn+VbTffWxb1xu187/9Q+S2DwPyZ9LTNKrZgwaYmG4FPWEEH1HJxrxwh8AlD6oTz8CCcnPGKxKVFkubpIbEyvQCSTr22gUjVXXKHc2pfcCeOuNXS9kAOjv2tqpsiDbIsu9mnxfYysHWMDBqA4rxghyvT0=</Modulus><Exponent>AQAB</Exponent><P>6qYUEleRY+Wzyk7xN05UwWRna37U2aQnq2Y2VVyJeceDZPU1u1GYdQmFQw5XgvxKwWx9DAfNh1iSyLe0YmrAcw==</P><Q>3iy1IDIkPrRWBFrCAUhpUNn4/ICiVXTT7KjuEXkGr0+1Cx/V+o3eoVIo/9x2Q3IaxMbQDSa8hisIFunz/iuPjw==</Q><DP>2BouIBpfvzX8mBSOGNZePmG+0YRUeUCyfCs9XO5Fek9h1mfynVpvY1JqVbBuria2nl7Q53SEN+M+A/cT/RO9uw==</DP><DQ>pjma1ljNh2CTTrS8nAsaSJSc1gZD7l33RQRrAgWju7yN/qG2DbzhSZ9X7355uSKA5qK8/Gnz+QnvBn3JwGvE/w==</DQ><InverseQ>3U67bp3lPExfGoiTRvRyHhNtyJs6hAq/Uj7wSHKLHNoLG20kwZux8BwZKpPBBA0bQjkLUiRv9PYs18El/45/wA==</InverseQ><D>bPVOg5FMjWRBhmTbQ3ZWGkGLjRR9KEFDiTJXHs6DWjDgnZceWe9KB6KoJ0Vzkbs/Ovdcr56qBZxC2g6gTS5ALvogBYH2PrUftr4flh/z4qgOrAYCQkTecfHAGIGEldEeF1FItMbqmQa6WzVPVp4tn/+q3PAVmZqrs6/X9EARH10=</D></RSAKeyValue>", sn.RSA.ToXmlString (true));
-			AssertEquals ("buffer.PublicKey", testPublicKey, sn.PublicKey);
-			AssertEquals ("buffer.PublicKeyToken", testPublicKeyToken, sn.PublicKeyToken);
+			Assert.AreEqual ("<RSAKeyValue><Modulus>y6T/+EoARJMHW0ilpCdn+VbTffWxb1xu187/9Q+S2DwPyZ9LTNKrZgwaYmG4FPWEEH1HJxrxwh8AlD6oTz8CCcnPGKxKVFkubpIbEyvQCSTr22gUjVXXKHc2pfcCeOuNXS9kAOjv2tqpsiDbIsu9mnxfYysHWMDBqA4rxghyvT0=</Modulus><Exponent>AQAB</Exponent><P>6qYUEleRY+Wzyk7xN05UwWRna37U2aQnq2Y2VVyJeceDZPU1u1GYdQmFQw5XgvxKwWx9DAfNh1iSyLe0YmrAcw==</P><Q>3iy1IDIkPrRWBFrCAUhpUNn4/ICiVXTT7KjuEXkGr0+1Cx/V+o3eoVIo/9x2Q3IaxMbQDSa8hisIFunz/iuPjw==</Q><DP>2BouIBpfvzX8mBSOGNZePmG+0YRUeUCyfCs9XO5Fek9h1mfynVpvY1JqVbBuria2nl7Q53SEN+M+A/cT/RO9uw==</DP><DQ>pjma1ljNh2CTTrS8nAsaSJSc1gZD7l33RQRrAgWju7yN/qG2DbzhSZ9X7355uSKA5qK8/Gnz+QnvBn3JwGvE/w==</DQ><InverseQ>3U67bp3lPExfGoiTRvRyHhNtyJs6hAq/Uj7wSHKLHNoLG20kwZux8BwZKpPBBA0bQjkLUiRv9PYs18El/45/wA==</InverseQ><D>bPVOg5FMjWRBhmTbQ3ZWGkGLjRR9KEFDiTJXHs6DWjDgnZceWe9KB6KoJ0Vzkbs/Ovdcr56qBZxC2g6gTS5ALvogBYH2PrUftr4flh/z4qgOrAYCQkTecfHAGIGEldEeF1FItMbqmQa6WzVPVp4tn/+q3PAVmZqrs6/X9EARH10=</D></RSAKeyValue>", sn.RSA.ToXmlString (true), "buffer.RSA");
+			Assert.AreEqual (testPublicKey, sn.PublicKey, "buffer.PublicKey");
+			Assert.AreEqual (testPublicKeyToken, sn.PublicKeyToken, "buffer.PublicKeyToken");
 		}
 
 		[Test]
@@ -122,9 +122,9 @@ namespace MonoTests.Mono.Security {
 		{
 			StrongName sn1 = new StrongName (test);
 			StrongName sn2 = new StrongName (sn1.RSA);
-			AssertEquals ("key.RSA", sn1.RSA.ToXmlString (true), sn2.RSA.ToXmlString (true));
-			AssertEquals ("key.PublicKey", sn1.PublicKey, sn2.PublicKey);
-			AssertEquals ("key.PublicKeyToken", sn1.PublicKeyToken, sn2.PublicKeyToken);
+			Assert.AreEqual (sn1.RSA.ToXmlString (true), sn2.RSA.ToXmlString (true), "key.RSA");
+			Assert.AreEqual (sn1.PublicKey, sn2.PublicKey, "key.PublicKey");
+			Assert.AreEqual (sn1.PublicKeyToken, sn2.PublicKeyToken, "key.PublicKeyToken");
 		}
 
 		string Signed;
@@ -820,28 +820,28 @@ namespace MonoTests.Mono.Security {
 		{
 			// compare that both hellosigned and hellodelay are the same file expect for signature
 			byte[] s = sn.Hash (Signed);
-			AssertNotNull ("Hash/Signed", s);
+			Assert.IsNotNull (s, "Hash/Signed");
 			byte[] d = sn.Hash (Delay);
-			AssertNotNull ("Hash/Delay", d);
+			Assert.IsNotNull (d, "Hash/Delay");
 			// are they the same
-			AssertEquals ("Hash/Compare", s, d);
+			Assert.AreEqual (s, d, "Hash/Compare");
 			// are they the same as GetHashFromAssemblyFile
 			byte[] knownHash = { 0x7D, 0xF7, 0x1D, 0xD4, 0x24, 0x22, 0xEA, 0xAB, 0xD2, 0x91, 0xCD, 0xAB, 0x1A, 0x55, 0x6A, 0x42, 0x05, 0xBA, 0x6E, 0x7B };
-			AssertEquals ("Hash/GetHashFromAssemblyFile", knownHash, s);
+			Assert.AreEqual (knownHash, s, "Hash/GetHashFromAssemblyFile");
 		}
 
 		[Test]
 		public void VerifyValid () 
 		{
 			// verify that hellosigned.exe is valid
-			Assert ("Verify/Valid", sn.Verify (Signed));
+			Assert.IsTrue (sn.Verify (Signed), "Verify/Valid");
 		}
 
 		[Test]
 		public void VerifyInvalid () 
 		{
 			// verify that hellodelay.exe isn't valid
-			Assert ("Verify/Invalid", !sn.Verify (Delay));
+			Assert.IsTrue (!sn.Verify (Delay), "Verify/Invalid");
 		}
 
 		[Test]
@@ -849,7 +849,7 @@ namespace MonoTests.Mono.Security {
 		{
 			Stream signed = new MemoryStream (signedData);
 			// verify that hellosigned.exe is valid
-			Assert ("Verify/Valid", sn.Verify (signed));
+			Assert.IsTrue (sn.Verify (signed), "Verify/Valid");
 		}
 
 		[Test]
@@ -857,25 +857,25 @@ namespace MonoTests.Mono.Security {
 		{
 			Stream delay = new MemoryStream (delayData);
 			// verify that hellodelay.exe isn't valid
-			Assert ("Verify/Invalid", !sn.Verify (delay));
+			Assert.IsTrue (!sn.Verify (delay), "Verify/Invalid");
 		}
 
 		[Test]
 		public void Sign () 
 		{
 			// sign the (invalid) hellodelay.exe
-			Assert ("Sign", sn.Sign (Delay));
+			Assert.IsTrue (sn.Sign (Delay), "Sign");
 			// and verify it's now valid
-			Assert ("Sign/Verify", sn.Verify (Delay));
+			Assert.IsTrue (sn.Verify (Delay), "Sign/Verify");
 		}
 
 		[Test]
 		public void ReSign () 
 		{
 			// resign the (already valid) hellosigned.exe
-			Assert ("ReSign", sn.Sign (Signed));
+			Assert.IsTrue (sn.Sign (Signed), "ReSign");
 			// and verify it's still valid
-			Assert ("ReSign/Verify", sn.Verify (Signed));
+			Assert.IsTrue (sn.Verify (Signed), "ReSign/Verify");
 		}
 		
 		[Test]
@@ -907,7 +907,7 @@ namespace MonoTests.Mono.Security {
 		{
 			byte[] ecma = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 
 			sn = new StrongName (ecma);
-			Assert ("CanSign", !sn.CanSign);
+			Assert.IsTrue (!sn.CanSign, "CanSign");
 		}
 
 		[Test]
diff --git a/mcs/class/Mono.Security/Test/tools/tlstest/tlstest.cs b/mcs/class/Mono.Security/Test/tools/tlstest/tlstest.cs
index f5cdf537f3e..c3920b5ed88 100644
--- a/mcs/class/Mono.Security/Test/tools/tlstest/tlstest.cs
+++ b/mcs/class/Mono.Security/Test/tools/tlstest/tlstest.cs
@@ -169,17 +169,6 @@ public class TlsTest {
 		ServicePointManager.CertificatePolicy = new TestCertificatePolicy ();
 		ServicePointManager.SecurityProtocol = (System.Net.SecurityProtocolType) (int) protocol;
 
-		ServicePointManager.ClientCipherSuitesCallback += (System.Net.SecurityProtocolType p, IEnumerable<string> allCiphers) => {
-			Console.WriteLine ("Protocol: {0}", p);
-//			var ciphers = allCiphers;
-			var ciphers = from cipher in allCiphers where !cipher.Contains ("EXPORT") select cipher;
-			string prefix = p == System.Net.SecurityProtocolType.Tls ? "TLS_" : "SSL_";
-			//			var ciphers = new List<string> { prefix + "RSA_WITH_AES_128_CBC_SHA", prefix + "RSA_WITH_AES_256_CBC_SHA" };
-			foreach (var cipher in ciphers)
-				Console.WriteLine ("\t{0}", cipher);
-			return ciphers;
-		};
-
 		Uri uri = new Uri (url);
 		HttpWebRequest req = (HttpWebRequest) WebRequest.Create (uri);
 
diff --git a/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.build-failure-exclude.sources b/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.build-failure-exclude.sources
new file mode 100644
index 00000000000..38e0f0a6bd7
--- /dev/null
+++ b/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.build-failure-exclude.sources
@@ -0,0 +1,20 @@
+# These fail because of reliance on full NUnit framework
+Mono.Math/ArithmeticBigTest.cs
+Mono.Math/BigIntegerSetTest.cs
+Mono.Math/BitwiseTest.cs
+Mono.Math/GcdBigTest.cs
+Mono.Math/ModInverseBigTest.cs
+Mono.Math/ModRingTest.cs
+Mono.Math/PrimeGenerationTest.cs
+Mono.Math/PrimeTestingTest.cs
+Mono.Math/SearchGeneratorTest.cs
+Mono.Security.Authenticode/PrivateKeyTest.cs
+Mono.Security.Cryptography/CryptoConvertTest.cs
+Mono.Security.Cryptography/DiffieHellmanManagedTest.cs
+Mono.Security.Cryptography/PKCS8Test.cs
+Mono.Security.Protocol.Ntlm/ChallengeResponseTest.cs
+Mono.Security.Protocol.Ntlm/MessageBaseTest.cs
+Mono.Security.Protocol.Ntlm/Type1MessageTest.cs
+Mono.Security.Protocol.Ntlm/Type2MessageTest.cs
+Mono.Security.Protocol.Ntlm/Type3MessageTest.cs
+Mono.Security/StrongNameTest.cs
diff --git a/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.exclude.sources b/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.exclude.sources
new file mode 100644
index 00000000000..955ebd0b11f
--- /dev/null
+++ b/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.exclude.sources
@@ -0,0 +1,2 @@
+#include monodroid_Mono.Security_test.dll.build-failure-exclude.sources
+#include monodroid_Mono.Data.Sqlite_test.dll.new-exclude.sources
diff --git a/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.new-exclude.sources b/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.new-exclude.sources
new file mode 100644
index 00000000000..580b47d15c7
--- /dev/null
+++ b/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.new-exclude.sources
@@ -0,0 +1,14 @@
+Mono.Security.Authenticode/AuthenticodeDeformatterTest.cs
+Mono.Security.Authenticode/SoftwarePublisherCertificateTest.cs
+Mono.Security/PKCS7Test.cs
+Mono.Security.X509.Extensions/AuthorityKeyIdentifierExtensionTest.cs
+Mono.Security.X509.Extensions/BasicConstraintsExtensionTest.cs
+Mono.Security.X509.Extensions/ExtendedKeyUsageExtensionTest.cs
+Mono.Security.X509.Extensions/KeyUsageExtensionTest.cs
+Mono.Security.X509.Extensions/SubjectAltNameExtensionTest.cs
+Mono.Security.X509.Extensions/SubjectKeyIdentifierExtensionTest.cs
+Mono.Security.X509/PKCS12Test.cs
+Mono.Security.X509/X501NameTest.cs
+Mono.Security.X509/X509CertificateTest.cs
+Mono.Security.X509/X509CrlTest.cs
+Mono.Security.X509/X520AttributesTest.cs
diff --git a/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.sources b/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.sources
new file mode 100644
index 00000000000..37fa8895348
--- /dev/null
+++ b/mcs/class/Mono.Security/monodroid_Mono.Security_test.dll.sources
@@ -0,0 +1 @@
+#include Mono.Security_test.dll.sources
diff --git a/mcs/class/Mono.Simd/Mono.Simd-net_4_x.csproj b/mcs/class/Mono.Simd/Mono.Simd-net_4_x.csproj
index 423ccd6f4d9..6c2e89d1880 100644
--- a/mcs/class/Mono.Simd/Mono.Simd-net_4_x.csproj
+++ b/mcs/class/Mono.Simd/Mono.Simd-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -71,15 +74,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_x.csproj b/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_x.csproj
index 0f63283f6db..25491427421 100644
--- a/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_x.csproj
+++ b/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -57,15 +60,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_x.csproj b/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_x.csproj
index 9e3b282835f..7184cb7c2e5 100644
--- a/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_x.csproj
+++ b/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -210,15 +213,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_x.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_x.csproj
index fa323d910b1..88bcc5bf2e1 100644
--- a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_x.csproj
+++ b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -60,15 +63,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -87,14 +89,6 @@
       <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
       <Name>System.Xml-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System/System-net_4_x.csproj">
-      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
-      <Name>System-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.XML/System.Xml-net_4_x.csproj">
-      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
-      <Name>System.Xml-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/Novell.Directory.Ldap/Makefile b/mcs/class/Novell.Directory.Ldap/Makefile
index 9e0d99d6c0b..4f24b424a7f 100644
--- a/mcs/class/Novell.Directory.Ldap/Makefile
+++ b/mcs/class/Novell.Directory.Ldap/Makefile
@@ -5,25 +5,14 @@ include ../../build/rules.make
 LIBRARY = Novell.Directory.Ldap.dll
 
 LIB_REFS = System Mono.Security
-LIB_MCS_FLAGS = \
-	-warn:1 -nowarn:612 \
-	$(RESX_RES:%=/res:%)
+LIB_MCS_FLAGS = -warn:1 -nowarn:612 
 
+RESOURCE_DEFS = ResultCodeMessages,Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt
 include ../../build/library.make
 
-RESULTCODE_MESSAGES = Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources
-
-RESX_RES = $(RESULTCODE_MESSAGES)
-
-$(the_lib): $(RESULTCODE_MESSAGES)
-
-$(RESULTCODE_MESSAGES): Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt
-	$(RESGEN) $< $@
-
 EXTRA_DISTFILES = \
 	Novell.Directory.Ldap.Rfc2251/RfcLdapURL.cs \
 	Novell.Directory.Ldap.Utilclass/ExceptionMessages.resx \
 	Novell.Directory.Ldap.Utilclass/ExceptionMessages.txt \
-	Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resx \
-	Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt 
+	Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resx
 
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj
index 094bcd9c155..90e5b13419f 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,612</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -269,15 +272,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -296,20 +298,12 @@
       <Project>{42D59DE7-586F-4ACF-BDD5-E7869E39E3EF}</Project>
       <Name>Mono.Security-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System/System-net_4_x.csproj">
-      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
-      <Name>System-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_x.csproj">
-      <Project>{42D59DE7-586F-4ACF-BDD5-E7869E39E3EF}</Project>
-      <Name>Mono.Security-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources">
+    <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt">
       <LogicalName>ResultCodeMessages.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/PEAPI/PEAPI-net_4_x.csproj b/mcs/class/PEAPI/PEAPI-net_4_x.csproj
index a97f3a0f3a2..dd4b88112dd 100644
--- a/mcs/class/PEAPI/PEAPI-net_4_x.csproj
+++ b/mcs/class/PEAPI/PEAPI-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,414,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -59,15 +62,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs b/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs
index 5539fea5854..79d7d285b09 100644
--- a/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs
+++ b/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs
@@ -197,7 +197,7 @@ namespace RabbitMQ.Client.Apigen {
 	    m_primitiveTypeFlagMap[amqpType] = isReference;
 	}
 
-        public void HandleOption(string opt) {
+        public bool HandleOption(string opt) {
             if (opt.StartsWith("/n:")) {
                 m_framingSubnamespace = opt.Substring(3);
             } else if (opt.StartsWith("/apiName:")) {
@@ -210,9 +210,9 @@ namespace RabbitMQ.Client.Apigen {
             } else if (opt == "/c") {
                 m_emitComments = true;
             } else {
-                Console.Error.WriteLine("Unsupported command-line option: " + opt);
-                Usage();
+		return false;
             }
+	    return true;
         }
 
         public void Usage() {
@@ -227,7 +227,8 @@ namespace RabbitMQ.Client.Apigen {
 
         public Apigen(ArrayList args) {
             while (args.Count > 0 && ((string) args[0]).StartsWith("/")) {
-                HandleOption((string) args[0]);
+		if (!HandleOption((string) args[0]))
+		  break;
                 args.RemoveAt(0);
             }
             if ((args.Count < 2)
diff --git a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
index 64bca8b3766..21fe03503f4 100644
--- a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
+++ b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
@@ -6,10 +6,13 @@
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D2A49790-9CFD-492B-9CFA-58B9AEDA1B75}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <OutputType>Exe</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    <StartupObject>RabbitMQ.Client.Apigen.Apigen</StartupObject>
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -73,21 +76,36 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+mono RabbitMQ.Client.Apigen.exe /n:v0_9 "/apiName:AMQP_0_9" $(ProjectDir)..\..\docs\specs\amqp0-9.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-9.cs
+mono RabbitMQ.Client.Apigen.exe /n:v0_8 "/apiName:AMQP_0_8" $(ProjectDir)..\..\docs\specs\amqp0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-8.cs
+mono RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDir)..\..\docs\specs\qpid-amqp.0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-qpid-0-8.cs
+
+
+
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+mono RabbitMQ.Client.Apigen.exe /n:v0_9 "/apiName:AMQP_0_9" $(ProjectDir)..\..\docs\specs\amqp0-9.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-9.cs
+mono RabbitMQ.Client.Apigen.exe /n:v0_8 "/apiName:AMQP_0_8" $(ProjectDir)..\..\docs\specs\amqp0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-8.cs
+mono RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDir)..\..\docs\specs\qpid-amqp.0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-qpid-0-8.cs
+
+
+
 
     </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="../../../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
     <ProjectReference Include="../../../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -96,10 +114,6 @@
       <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
       <Name>System.Xml-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../../../corlib/corlib-net_4_x.csproj">
-      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
-      <Name>corlib-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_x.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_x.csproj
index c1c44bec512..e062f548163 100644
--- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_x.csproj
+++ b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618</NoWarn>
     <OutputPath>./../../../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -181,15 +184,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/SMDiagnostics/SMDiagnostics-net_4_x.csproj b/mcs/class/SMDiagnostics/SMDiagnostics-net_4_x.csproj
index 90b90edf717..d20c1ba9eb9 100644
--- a/mcs/class/SMDiagnostics/SMDiagnostics-net_4_x.csproj
+++ b/mcs/class/SMDiagnostics/SMDiagnostics-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,27 +48,27 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\Activity.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticsTraceCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticStrings.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticTraceSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EncodingFallbackAwareXmlTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogCategory.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogEventId.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogger.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\ExceptionUtility.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\LegacyDiagnosticTrace.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\MachineSettingsSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\NativeMethods.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\PiiTraceSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\PlainXmlWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\SafeEventLogWriteHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\TraceSourceKind.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\TraceXPathNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\Utility.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\Activity.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticsTraceCode.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticStrings.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticTraceSource.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EncodingFallbackAwareXmlTextWriter.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogCategory.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogEventId.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogger.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\ExceptionUtility.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\LegacyDiagnosticTrace.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\MachineSettingsSection.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\NativeMethods.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\PiiTraceSource.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\PlainXmlWriter.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\SafeEventLogWriteHandle.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\TraceSourceKind.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\TraceXPathNavigator.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\Utility.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\TraceSR.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -76,15 +79,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/Makefile b/mcs/class/System.ComponentModel.Composition.4.5/Makefile
index e0b5dab202b..9c35c71ec56 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/Makefile
+++ b/mcs/class/System.ComponentModel.Composition.4.5/Makefile
@@ -4,18 +4,16 @@ include ../../build/rules.make
 
 LIBRARY = System.ComponentModel.Composition.dll
 LIB_REFS = System System.Core
-LIB_MCS_FLAGS = -d:CLR40 -resource:$(STRING_MESSAGES) -d:USE_ECMA_KEY,FEATURE_REFLECTIONCONTEXT,FEATURE_REFLECTIONFILEIO,FEATURE_SERIALIZATION,FEATURE_SLIMLOCK -nowarn:219,414
 
-STRING_MESSAGES = Microsoft.Internal.Strings.resources
+RESOURCE_DEFS = Microsoft.Internal.Strings,src/ComponentModel/Strings.resx
+LIB_MCS_FLAGS = -d:CLR40 -d:USE_ECMA_KEY,FEATURE_REFLECTIONCONTEXT,FEATURE_REFLECTIONFILEIO,FEATURE_SERIALIZATION,FEATURE_SLIMLOCK -nowarn:219,414
+
 
 CLEAN_FILES += $(STRING_MESSAGES)
 
 EXTRA_DISTFILES = \
 	src/ComponentModel/Strings.resx
-	
+
 include ../../build/library.make
 
-$(the_lib): $(STRING_MESSAGES)
 
-$(STRING_MESSAGES): src/ComponentModel/Strings.resx
-	$(RESGEN) $< $@
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj
index 305e8f46180..598f507463c 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj
+++ b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,219,414</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -228,15 +231,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -260,7 +262,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Microsoft.Internal.Strings.resources">
+    <EmbeddedResource Include="src/ComponentModel/Strings.resx">
       <LogicalName>Microsoft.Internal.Strings.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_x.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_x.csproj
index b74efc8504c..69eacf9c620 100644
--- a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_x.csproj
+++ b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,414</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,58 +48,59 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AppSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AssociatedMetadataTypeTypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AssociatedMetadataTypeTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AssociationAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\BindableTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\CompareAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ConcurrencyCheckAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\CreditCardAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\CustomValidationAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DataType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DataTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DisplayAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DisplayColumnAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DisplayFormatAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\EditableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\EmailAddressAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\EnumDataTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\FileExtensionsAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\FilterUIHintAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\IValidatableObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\KeyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\LocalizableString.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MaxLengthAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MetadataPropertyDescriptorWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MetadataTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MinLengthAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\PhoneAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\RangeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\RegularExpressionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\RequiredAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ScaffoldAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\ColumnAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\ComplexTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\DatabaseGeneratedAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\DatabaseGeneratedOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\ForeignKeyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\InversePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\NotMappedAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\TableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\StringLengthAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\TimestampAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\UIHintAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\UrlAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationAttributeStore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Validator.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AppSettings.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AssociatedMetadataTypeTypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AssociatedMetadataTypeTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AssociationAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\BindableTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\CompareAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ConcurrencyCheckAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\CreditCardAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\CustomValidationAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DataType.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DataTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DisplayAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DisplayColumnAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DisplayFormatAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\EditableAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\EmailAddressAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\EnumDataTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\FileExtensionsAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\FilterUIHintAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\IValidatableObject.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\KeyAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\LocalizableString.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MaxLengthAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MetadataPropertyDescriptorWrapper.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MetadataTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MinLengthAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\PhoneAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\RangeAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\RegularExpressionAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\RequiredAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ScaffoldAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\ColumnAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\ComplexTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\DatabaseGeneratedAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\DatabaseGeneratedOption.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\ForeignKeyAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\InversePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\NotMappedAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\TableAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\StringLengthAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\TimestampAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\UIHintAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\UrlAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationAttribute.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationAttributeStore.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationContext.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationException.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationResult.cs" />
+    <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Validator.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="DataAnnotationsResources.cs" />
-  </ItemGroup>
+    <Compile Include="ReferenceSources\SR.cs" />
+    <Compile Include="ReferenceSources\SR.missing.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">
@@ -105,15 +109,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations_test.dll.exclude.sources b/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations_test.dll.exclude.sources
new file mode 100644
index 00000000000..f3d94ae0b74
--- /dev/null
+++ b/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations_test.dll.exclude.sources
@@ -0,0 +1,2 @@
+#include monodroid_System.ComponentModel.DataAnnotations_test.dll.new-exclude.sources
+../../System.Web.DynamicData/Test/Common/AssertExtensions.cs
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations_test.dll.new-exclude.sources b/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations_test.dll.new-exclude.sources
new file mode 100644
index 00000000000..705868f3dbc
--- /dev/null
+++ b/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations_test.dll.new-exclude.sources
@@ -0,0 +1,6 @@
+System.ComponentModel.DataAnnotations/AssociatedMetadataTypeTypeDescriptionProviderTests.cs
+System.ComponentModel.DataAnnotations/CompareAttributeTest.cs
+System.ComponentModel.DataAnnotations/CreditCardAttributeTest.cs
+System.ComponentModel.DataAnnotations/EmailAddressAttributeTest.cs
+System.ComponentModel.DataAnnotations/FileExtensionsAttributeTest.cs
+System.ComponentModel.DataAnnotations/PhoneAttributeTest.cs
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations_test.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations_test.dll.sources
new file mode 100644
index 00000000000..4be89ed65de
--- /dev/null
+++ b/mcs/class/System.ComponentModel.DataAnnotations/monodroid_System.ComponentModel.DataAnnotations_test.dll.sources
@@ -0,0 +1 @@
+#include System.ComponentModel.DataAnnotations_test.dll.sources
diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_x.csproj b/mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_x.csproj
index 41aaa875146..d830e4f8039 100644
--- a/mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_x.csproj
+++ b/mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -71,15 +74,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Configuration/System.Configuration-net_4_x.csproj b/mcs/class/System.Configuration/System.Configuration-net_4_x.csproj
index 9170a00e94c..61bfe7fa885 100644
--- a/mcs/class/System.Configuration/System.Configuration-net_4_x.csproj
+++ b/mcs/class/System.Configuration/System.Configuration-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -174,15 +177,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Core/System.Core-basic.csproj b/mcs/class/System.Core/System.Core-basic.csproj
deleted file mode 100644
index 022483539d4..00000000000
--- a/mcs/class/System.Core/System.Core-basic.csproj
+++ /dev/null
@@ -1,183 +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>{4F33488E-A6DF-4A6E-A15B-46648C546475}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,1720</NoWarn>
-    <OutputPath>./../../class/lib/basic</OutputPath>
-    <NoStdLib>False</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System.Core</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,1720</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;BOOTSTRAP_BASIC;INSIDE_SYSCORE;LIBC;NET_3_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,1720</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;BOOTSTRAP_BASIC;INSIDE_SYSCORE;LIBC;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\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="..\corlib\System.Collections.Generic\CollectionDebuggerView.cs" />
-    <Compile Include="..\corlib\System.Collections\HashPrimeNumbers.cs" />
-    <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoTools.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\SymmetricTransform.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />
-    <Compile Include="System.Collections.Generic\HashSet.cs" />
-    <Compile Include="System.IO.Pipes\AnonymousPipeClientStream.cs" />
-    <Compile Include="System.IO.Pipes\AnonymousPipeServerStream.cs" />
-    <Compile Include="System.IO.Pipes\NamedPipeClientStream.cs" />
-    <Compile Include="System.IO.Pipes\NamedPipeServerStream.cs" />
-    <Compile Include="System.IO.Pipes\PipeAccessRights.cs" />
-    <Compile Include="System.IO.Pipes\PipeAccessRule.cs" />
-    <Compile Include="System.IO.Pipes\PipeAuditRule.cs" />
-    <Compile Include="System.IO.Pipes\PipeDirection.cs" />
-    <Compile Include="System.IO.Pipes\PipeInterfaces.cs" />
-    <Compile Include="System.IO.Pipes\PipeOptions.cs" />
-    <Compile Include="System.IO.Pipes\PipeSecurity.cs" />
-    <Compile Include="System.IO.Pipes\PipeStream.cs" />
-    <Compile Include="System.IO.Pipes\PipeStreamImpersonationWorker.cs" />
-    <Compile Include="System.IO.Pipes\PipeTransmissionMode.cs" />
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />
-    <Compile Include="System.IO\HandleInheritability.cs" />
-    <Compile Include="System.Linq.Expressions\BinaryExpression.cs" />
-    <Compile Include="System.Linq.Expressions\ConditionalExpression.cs" />
-    <Compile Include="System.Linq.Expressions\ConstantExpression.cs" />
-    <Compile Include="System.Linq.Expressions\ElementInit.cs" />
-    <Compile Include="System.Linq.Expressions\EmitContext.cs" />
-    <Compile Include="System.Linq.Expressions\Expression.cs" />
-    <Compile Include="System.Linq.Expressions\Expression_T.cs" />
-    <Compile Include="System.Linq.Expressions\ExpressionPrinter.cs" />
-    <Compile Include="System.Linq.Expressions\ExpressionTransformer.cs" />
-    <Compile Include="System.Linq.Expressions\ExpressionType.cs" />
-    <Compile Include="System.Linq.Expressions\ExpressionVisitor.cs" />
-    <Compile Include="System.Linq.Expressions\Extensions.cs" />
-    <Compile Include="System.Linq.Expressions\InvocationExpression.cs" />
-    <Compile Include="System.Linq.Expressions\LambdaExpression.cs" />
-    <Compile Include="System.Linq.Expressions\ListInitExpression.cs" />
-    <Compile Include="System.Linq.Expressions\MemberAssignment.cs" />
-    <Compile Include="System.Linq.Expressions\MemberBinding.cs" />
-    <Compile Include="System.Linq.Expressions\MemberBindingType.cs" />
-    <Compile Include="System.Linq.Expressions\MemberExpression.cs" />
-    <Compile Include="System.Linq.Expressions\MemberInitExpression.cs" />
-    <Compile Include="System.Linq.Expressions\MemberListBinding.cs" />
-    <Compile Include="System.Linq.Expressions\MemberMemberBinding.cs" />
-    <Compile Include="System.Linq.Expressions\MethodCallExpression.cs" />
-    <Compile Include="System.Linq.Expressions\NewArrayExpression.cs" />
-    <Compile Include="System.Linq.Expressions\NewExpression.cs" />
-    <Compile Include="System.Linq.Expressions\ParameterExpression.cs" />
-    <Compile Include="System.Linq.Expressions\TypeBinaryExpression.cs" />
-    <Compile Include="System.Linq.Expressions\UnaryExpression.cs" />
-    <Compile Include="System.Linq\Check.cs" />
-    <Compile Include="System.Linq\Enumerable.cs" />
-    <Compile Include="System.Linq\Grouping.cs" />
-    <Compile Include="System.Linq\IGrouping.cs" />
-    <Compile Include="System.Linq\ILookup_T.cs" />
-    <Compile Include="System.Linq\IOrderedEnumerable_T.cs" />
-    <Compile Include="System.Linq\IOrderedQueryable.cs" />
-    <Compile Include="System.Linq\IOrderedQueryable_T.cs" />
-    <Compile Include="System.Linq\IQueryable.cs" />
-    <Compile Include="System.Linq\IQueryable_T.cs" />
-    <Compile Include="System.Linq\IQueryProvider.cs" />
-    <Compile Include="System.Linq\Lookup.cs" />
-    <Compile Include="System.Linq\OrderedEnumerable.cs" />
-    <Compile Include="System.Linq\OrderedSequence.cs" />
-    <Compile Include="System.Linq\Queryable.cs" />
-    <Compile Include="System.Linq\QueryableEnumerable.cs" />
-    <Compile Include="System.Linq\QueryableTransformer.cs" />
-    <Compile Include="System.Linq\QuickSort.cs" />
-    <Compile Include="System.Linq\SortContext.cs" />
-    <Compile Include="System.Linq\SortDirection.cs" />
-    <Compile Include="System.Linq\SortSequenceContext.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DynamicAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ExecutionScope.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IStrongBox.cs" />
-    <Compile Include="System.Runtime.CompilerServices\StrongBox_T.cs" />
-    <Compile Include="System.Security.Cryptography\Aes.cs" />
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\AesManaged.cs" />
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />
-    <Compile Include="System.Security.Cryptography\CngAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\CngAlgorithmGroup.cs" />
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />
-    <Compile Include="System.Threading\LockRecursionException.cs" />
-    <Compile Include="System.Threading\LockRecursionPolicy.cs" />
-    <Compile Include="System.Threading\ReaderWriterLockSlim.cs" />
-    <Compile Include="System.Threading\ReaderWriterLockSlimExtensions.cs" />
-    <Compile Include="System.Threading\ThreadLockState.cs" />
-    <Compile Include="System\Actions.cs" />
-    <Compile Include="System\Funcs.cs" />
-    <Compile Include="System\InvalidTimeZoneException.cs" />
-    <Compile Include="System\TimeZoneInfo.AdjustmentRule.cs" />
-    <Compile Include="System\TimeZoneInfo.cs" />
-    <Compile Include="System\TimeZoneInfo.TransitionTime.cs" />
-    <Compile Include="System\TimeZoneNotFoundException.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="..\System\System-basic-1.csproj">
-      <Project>{CE10AD5A-9645-496F-8369-7B687E84456B}</Project>
-      <Name>System\System-basic-1</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System.Core/System.Core-build.csproj b/mcs/class/System.Core/System.Core-build.csproj
deleted file mode 100644
index ac83cab13e6..00000000000
--- a/mcs/class/System.Core/System.Core-build.csproj
+++ /dev/null
@@ -1,333 +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>{C371834B-0195-4342-8652-BF015D18C974}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,1720</NoWarn>
-    <OutputPath>./../../class/lib/build</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,1720</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,1720</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</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="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BinaryOperationBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BindingRestrictions.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallInfo.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSite.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteHelpers.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteOps.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ConvertBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CreateInstanceBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteIndexBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteMemberBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObject.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObjectBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicObject.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoClass.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoObject.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetIndexBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetMemberBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IDynamicMetaObjectProvider.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IInvokeOnGetBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeMemberBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\RuleCache.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetIndexBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetMemberBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UnaryOperationBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UpdateDelegates.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BinaryExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BlockExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\CatchBlock.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConditionalExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConstantExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugInfoExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugViewWriter.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DefaultExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DynamicExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ElementInit.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.DebuggerProxy.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionStringBuilder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionType.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionVisitor.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\GotoExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IArgumentProvider.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IndexExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\InvocationExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelTarget.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LambdaExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListArgumentProvider.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListInitExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LoopExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberAssignment.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberBinding.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberInitExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberListBinding.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberMemberBinding.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MethodCallExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewArrayExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ParameterExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\RuntimeVariablesExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchCase.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SymbolDocumentInfo.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TryExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeBinaryExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeUtils.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\UnaryExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AnalyzedTree.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AssemblyGen.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\BoundConstants.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Closure.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.Storage.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ConstantCheck.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DebugInfoGenerator.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ExpressionQuoter.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\HoistedLocals.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ILGen.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\KeyedQueue.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LabelInfo.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Address.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Binary.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.ControlFlow.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Expressions.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Lambda.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Logical.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Statements.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Unary.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\OffsetTrackingILGenerator.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\RuntimeVariableList.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Set.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Bindings.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Temps.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolDocumentGenerator.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolGuids.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\VariableBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CacheDict.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CollectionExtensions.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ContractUtils.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ExceptionFactory.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\Helpers.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\IRuntimeVariables.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyCollectionBuilder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyDictionary.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReferenceEqualityComparer.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReflectionUtils.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TrueReadOnlyCollection.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TypeExtensions.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedFileHandle.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedViewHandle.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />
-    <Compile Include="System.Collections.Generic\HashSet.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFile.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileAccess.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileOptions.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileRights.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileSecurity.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewAccessor.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewStream.cs" />
-    <Compile Include="System.IO.Pipes\AnonymousPipeClientStream.cs" />
-    <Compile Include="System.IO.Pipes\AnonymousPipeServerStream.cs" />
-    <Compile Include="System.IO.Pipes\NamedPipeClientStream.cs" />
-    <Compile Include="System.IO.Pipes\NamedPipeServerStream.cs" />
-    <Compile Include="System.IO.Pipes\PipeAccessRights.cs" />
-    <Compile Include="System.IO.Pipes\PipeAccessRule.cs" />
-    <Compile Include="System.IO.Pipes\PipeAuditRule.cs" />
-    <Compile Include="System.IO.Pipes\PipeDirection.cs" />
-    <Compile Include="System.IO.Pipes\PipeInterfaces.cs" />
-    <Compile Include="System.IO.Pipes\PipeOptions.cs" />
-    <Compile Include="System.IO.Pipes\PipeSecurity.cs" />
-    <Compile Include="System.IO.Pipes\PipeStream.cs" />
-    <Compile Include="System.IO.Pipes\PipeStreamImpersonationWorker.cs" />
-    <Compile Include="System.IO.Pipes\PipeTransmissionMode.cs" />
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />
-    <Compile Include="System.IO\HandleInheritability.cs" />
-    <Compile Include="System.Linq.Expressions\ExpressionTransformer.cs" />
-    <Compile Include="System.Linq.Expressions\Extensions.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryBaseNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryCastNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryChildNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryConcatNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryDefaultEmptyNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryGroupByNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryHeadWorkerNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryJoinNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryMuxNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOptionNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderByNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderedStreamNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderGuardNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryReverseNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySelectManyNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySelectNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySetNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryStartNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryStreamNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryWhereNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryZipNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\SetInclusion.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\WrapHelper.cs" />
-    <Compile Include="System.Linq.Parallel\AggregationList.cs" />
-    <Compile Include="System.Linq.Parallel\ConcurrentGrouping.cs" />
-    <Compile Include="System.Linq.Parallel\ConcurrentLookup.cs" />
-    <Compile Include="System.Linq.Parallel\INodeVisitor.cs" />
-    <Compile Include="System.Linq.Parallel\IVisitableNode.cs" />
-    <Compile Include="System.Linq.Parallel\OrderingEnumerator.cs" />
-    <Compile Include="System.Linq.Parallel\ParallelExecuter.cs" />
-    <Compile Include="System.Linq.Parallel\ParallelPartitioner.cs" />
-    <Compile Include="System.Linq.Parallel\ParallelQueryEnumerator.cs" />
-    <Compile Include="System.Linq.Parallel\ParallelQuickSort.cs" />
-    <Compile Include="System.Linq.Parallel\QueryCheckerVisitor.cs" />
-    <Compile Include="System.Linq.Parallel\QueryIsOrderedVisitor.cs" />
-    <Compile Include="System.Linq.Parallel\QueryOptions.cs" />
-    <Compile Include="System.Linq.Parallel\RangeList.cs" />
-    <Compile Include="System.Linq.Parallel\RepeatList.cs" />
-    <Compile Include="System.Linq.Parallel\ReverseList.cs" />
-    <Compile Include="System.Linq.Parallel\StripPartitioner.cs" />
-    <Compile Include="System.Linq.Parallel\TemporaryArea.cs" />
-    <Compile Include="System.Linq\Check.cs" />
-    <Compile Include="System.Linq\Enumerable.cs" />
-    <Compile Include="System.Linq\EnumerableExecutor.cs" />
-    <Compile Include="System.Linq\EnumerableExecutor_T.cs" />
-    <Compile Include="System.Linq\EnumerableQuery.cs" />
-    <Compile Include="System.Linq\EnumerableQuery_T.cs" />
-    <Compile Include="System.Linq\Grouping.cs" />
-    <Compile Include="System.Linq\IGrouping.cs" />
-    <Compile Include="System.Linq\ILookup_T.cs" />
-    <Compile Include="System.Linq\IOrderedEnumerable_T.cs" />
-    <Compile Include="System.Linq\IOrderedQueryable.cs" />
-    <Compile Include="System.Linq\IOrderedQueryable_T.cs" />
-    <Compile Include="System.Linq\IQueryable.cs" />
-    <Compile Include="System.Linq\IQueryable_T.cs" />
-    <Compile Include="System.Linq\IQueryProvider.cs" />
-    <Compile Include="System.Linq\Lookup.cs" />
-    <Compile Include="System.Linq\OrderedEnumerable.cs" />
-    <Compile Include="System.Linq\OrderedParallelQuery.cs" />
-    <Compile Include="System.Linq\OrderedSequence.cs" />
-    <Compile Include="System.Linq\ParallelEnumerable.cs" />
-    <Compile Include="System.Linq\ParallelExecutionMode.cs" />
-    <Compile Include="System.Linq\ParallelMergeOptions.cs" />
-    <Compile Include="System.Linq\ParallelQuery.cs" />
-    <Compile Include="System.Linq\Queryable.cs" />
-    <Compile Include="System.Linq\QueryableEnumerable.cs" />
-    <Compile Include="System.Linq\QueryableTransformer.cs" />
-    <Compile Include="System.Linq\QuickSort.cs" />
-    <Compile Include="System.Linq\SortContext.cs" />
-    <Compile Include="System.Linq\SortDirection.cs" />
-    <Compile Include="System.Linq\SortSequenceContext.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DynamicAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IStrongBox.cs" />
-    <Compile Include="System.Runtime.CompilerServices\StrongBox_T.cs" />
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\AesManaged.cs" />
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />
-    <Compile Include="System.Security.Cryptography\CngAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\CngAlgorithmGroup.cs" />
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />
-    <Compile Include="System.Threading.Tasks\TaskExtensions.cs" />
-    <Compile Include="System.Threading\LockRecursionException.cs" />
-    <Compile Include="System.Threading\LockRecursionPolicy.cs" />
-    <Compile Include="System.Threading\ReaderWriterLockSlim.cs" />
-    <Compile Include="System.Threading\ReaderWriterLockSlimExtensions.cs" />
-    <Compile Include="System.Threading\ThreadLockState.cs" />
-    <Compile Include="System\Actions.cs" />
-    <Compile Include="System\Funcs.cs" />
-    <Compile Include="System\InvalidTimeZoneException.cs" />
-    <Compile Include="System\TimeZoneInfo.AdjustmentRule.cs" />
-    <Compile Include="System\TimeZoneInfo.cs" />
-    <Compile Include="System\TimeZoneInfo.TransitionTime.cs" />
-    <Compile Include="System\TimeZoneNotFoundException.cs" />
-    <Compile Include="System\Util.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-build.csproj">
-      <Project>{2BDF80D1-6F06-4908-B351-835292B7A9B9}</Project>
-      <Name>corlib\corlib-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System\System-build-1.csproj">
-      <Project>{ACA4A790-62B2-4D59-B96C-CE17F8F6BE58}</Project>
-      <Name>System\System-build-1</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-build.csproj">
-      <Project>{AA347918-40BB-4762-8A7F-B94836255127}</Project>
-      <Name>Mono.Posix\Mono.Posix-build</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System.Core/System.Core-net_4_x.csproj b/mcs/class/System.Core/System.Core-net_4_x.csproj
index 1ff7e4d05f9..2f65fc4c3be 100644
--- a/mcs/class/System.Core/System.Core-net_4_x.csproj
+++ b/mcs/class/System.Core/System.Core-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,1720</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,179 +48,6 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\DynamicExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\ExpressionVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\IArgumentProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\IDynamicExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Extension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\StrongBox.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\BitHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSetDebugView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSetEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\FuncAndAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\InvalidTimeZoneException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\Enums.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\Enums.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedFileSecurity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Enumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Expressions\ExpressionVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\IQueryable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Channels\AsynchronousChannel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Channels\SynchronousChannel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\AggregationMinMaxHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\EmptyEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\EnumerableWrapperWeakToStrong.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\IParallelPartitionable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\OrderedParallelQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelEnumerableWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\QueryAggregationOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\RangeEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\RepeatEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\ArrayMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\AsynchronousChannelMergeEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\DefaultMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\IMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\MergeEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\MergeExecutor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingPipeliningMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\SynchronousChannelMergeEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\IPartitionedStreamRecipient.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedDataSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\UnorderedHashRepartitionStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\AssociativeAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ExceptQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\GroupJoinQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\HashJoinQueryOperatorEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\IntersectQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\JoinQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\UnionQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ZipQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\BinaryQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\CountAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperatorEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongCountAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ListQueryResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\OrderingQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\QueryExecutionOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\OrdinalIndexState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionedStreamMerger.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionerQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOpeningEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperatorEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QuerySettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ScanQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\AnyAllSearchOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ConcatQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ContainsSearchOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DefaultIfEmptyQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DistinctQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ElementAtQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\FirstQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ForAllOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\GroupByQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedSelectQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedWhereQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\LastQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ReverseQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectManyQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SingleQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SortQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipWhileQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\WhereQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\UnaryQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\CancellationState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingPipeliningSpoolingTask.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingSpoolingTask.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryLifecycle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTask.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTaskGroupState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\Scheduling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTask.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTaskBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\CancellableEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ExceptionAggregator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ExchangeUtilities.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\FixedMaxHeap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\GrowingArray.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\HashLookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\IntValueEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ListChunk.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Lookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Pair.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\PairComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ReverseComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Shared.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Sorting.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\TraceHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Util.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Wrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\WrapperEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelExecutionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelMergeOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\SequenceQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\TypeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Runtime\CompilerServices\DynamicAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Runtime\CompilerServices\ExecutionScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\Aes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\CngKeyBlobFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellman.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellmanPublicKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\ECDsa.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\ECKeyXmlFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\ReaderWriterLockSlim\LockRecursionException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\ReaderWriterLockSlim\ReaderWriterLockSlim.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\Tasks\TaskExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\TimeZoneInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\TimeZoneNotFoundException.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BinaryOperationBinder.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BindingRestrictions.cs" />
@@ -333,12 +163,186 @@
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReflectionUtils.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TrueReadOnlyCollection.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TypeExtensions.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Ast\DynamicExpression.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Ast\ExpressionVisitor.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Ast\IArgumentProvider.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Ast\IDynamicExpression.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Extension.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\StrongBox.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Collections\Generic\BitHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Collections\Generic\HashSet.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Collections\Generic\HashSetDebugView.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Collections\Generic\HashSetEqualityComparer.cs" />
+    <Compile Include="..\referencesource\System.Core\System\FuncAndAction.cs" />
+    <Compile Include="..\referencesource\System.Core\System\InvalidTimeZoneException.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\Enums.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\Enums.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedFileSecurity.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewAccessor.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Enumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Expressions\ExpressionVisitor.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\IQueryable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Channels\AsynchronousChannel.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Channels\SynchronousChannel.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\AggregationMinMaxHelpers.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\EmptyEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\EnumerableWrapperWeakToStrong.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\IParallelPartitionable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\OrderedParallelQuery.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelEnumerableWrapper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelQuery.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\QueryAggregationOptions.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\RangeEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\RepeatEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\ArrayMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\AsynchronousChannelMergeEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\DefaultMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\IMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\MergeEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\MergeExecutor.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingPipeliningMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\SynchronousChannelMergeEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\IPartitionedStreamRecipient.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedDataSource.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\UnorderedHashRepartitionStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\AssociativeAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ExceptQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\GroupJoinQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\HashJoinQueryOperatorEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\IntersectQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\JoinQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\UnionQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ZipQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\BinaryQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\CountAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperatorEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongCountAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ListQueryResults.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\OrderingQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\QueryExecutionOption.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\OrdinalIndexState.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionedStreamMerger.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionerQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOpeningEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperatorEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryResults.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QuerySettings.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ScanQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\AnyAllSearchOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ConcatQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ContainsSearchOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DefaultIfEmptyQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DistinctQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ElementAtQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\FirstQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ForAllOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\GroupByQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedSelectQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedWhereQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\LastQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ReverseQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectManyQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SingleQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SortQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipWhileQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\WhereQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\UnaryQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\CancellationState.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingPipeliningSpoolingTask.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingSpoolingTask.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryLifecycle.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTask.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTaskGroupState.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\Scheduling.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTask.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTaskBase.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\CancellableEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\ExceptionAggregator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\ExchangeUtilities.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\FixedMaxHeap.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\GrowingArray.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\HashLookup.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\IntValueEvent.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\ListChunk.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Lookup.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Pair.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\PairComparer.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\ReverseComparer.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Shared.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Sorting.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\TraceHelpers.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Util.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Wrapper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\WrapperEqualityComparer.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\ParallelEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\ParallelExecutionMode.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\ParallelMergeOptions.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\SequenceQuery.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\TypeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Runtime\CompilerServices\DynamicAttribute.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Runtime\CompilerServices\ExecutionScope.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\Aes.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\CngKeyBlobFormat.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellman.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellmanPublicKey.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDsa.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECKeyXmlFormat.cs" />
+    <Compile Include="..\referencesource\System.Core\System\threading\ReaderWriterLockSlim\LockRecursionException.cs" />
+    <Compile Include="..\referencesource\System.Core\System\threading\ReaderWriterLockSlim\ReaderWriterLockSlim.cs" />
+    <Compile Include="..\referencesource\System.Core\System\threading\Tasks\TaskExtensions.cs" />
+    <Compile Include="..\referencesource\System.Core\System\TimeZoneInfo.cs" />
+    <Compile Include="..\referencesource\System.Core\System\TimeZoneNotFoundException.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedFileHandle.cs" />
     <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedViewHandle.cs" />
     <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />
     <Compile Include="ReferenceSources\Error.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
+    <Compile Include="ReferenceSources\SR.missing.cs" />
     <Compile Include="ReferenceSources\Strings.cs" />
     <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFile.cs" />
     <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedView.cs" />
@@ -379,15 +383,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Core/System.Core-plaincore-build.csproj b/mcs/class/System.Core/System.Core-plaincore-build.csproj
deleted file mode 100644
index 7d38223f0f9..00000000000
--- a/mcs/class/System.Core/System.Core-plaincore-build.csproj
+++ /dev/null
@@ -1,337 +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>{212C9C84-54F0-405A-AF36-BDD1667B3C9D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,1720</NoWarn>
-    <OutputPath>./../../class/lib/build/plaincore</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,1720</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,1720</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</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="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BinaryOperationBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BindingRestrictions.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallInfo.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSite.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteHelpers.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteOps.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ConvertBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CreateInstanceBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteIndexBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteMemberBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObject.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObjectBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicObject.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoClass.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoObject.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetIndexBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetMemberBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IDynamicMetaObjectProvider.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IInvokeOnGetBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeMemberBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\RuleCache.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetIndexBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetMemberBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UnaryOperationBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UpdateDelegates.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BinaryExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BlockExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\CatchBlock.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConditionalExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConstantExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugInfoExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugViewWriter.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DefaultExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DynamicExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ElementInit.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.DebuggerProxy.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionStringBuilder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionType.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionVisitor.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\GotoExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IArgumentProvider.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IndexExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\InvocationExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelTarget.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LambdaExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListArgumentProvider.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListInitExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LoopExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberAssignment.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberBinding.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberInitExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberListBinding.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberMemberBinding.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MethodCallExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewArrayExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ParameterExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\RuntimeVariablesExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchCase.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SymbolDocumentInfo.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TryExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeBinaryExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeUtils.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\UnaryExpression.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AnalyzedTree.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AssemblyGen.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\BoundConstants.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Closure.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.Storage.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ConstantCheck.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DebugInfoGenerator.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ExpressionQuoter.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\HoistedLocals.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ILGen.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\KeyedQueue.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LabelInfo.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Address.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Binary.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.ControlFlow.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Expressions.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Lambda.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Logical.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Statements.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Unary.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\OffsetTrackingILGenerator.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\RuntimeVariableList.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Set.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Bindings.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Temps.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolDocumentGenerator.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolGuids.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\VariableBinder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CacheDict.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CollectionExtensions.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ContractUtils.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ExceptionFactory.Generated.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\Helpers.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\IRuntimeVariables.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyCollectionBuilder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyDictionary.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReferenceEqualityComparer.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReflectionUtils.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TrueReadOnlyCollection.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TypeExtensions.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedFileHandle.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedViewHandle.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />
-    <Compile Include="System.Collections.Generic\HashSet.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFile.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileAccess.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileOptions.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileRights.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFileSecurity.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewAccessor.cs" />
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewStream.cs" />
-    <Compile Include="System.IO.Pipes\AnonymousPipeClientStream.cs" />
-    <Compile Include="System.IO.Pipes\AnonymousPipeServerStream.cs" />
-    <Compile Include="System.IO.Pipes\NamedPipeClientStream.cs" />
-    <Compile Include="System.IO.Pipes\NamedPipeServerStream.cs" />
-    <Compile Include="System.IO.Pipes\PipeAccessRights.cs" />
-    <Compile Include="System.IO.Pipes\PipeAccessRule.cs" />
-    <Compile Include="System.IO.Pipes\PipeAuditRule.cs" />
-    <Compile Include="System.IO.Pipes\PipeDirection.cs" />
-    <Compile Include="System.IO.Pipes\PipeInterfaces.cs" />
-    <Compile Include="System.IO.Pipes\PipeOptions.cs" />
-    <Compile Include="System.IO.Pipes\PipeSecurity.cs" />
-    <Compile Include="System.IO.Pipes\PipeStream.cs" />
-    <Compile Include="System.IO.Pipes\PipeStreamImpersonationWorker.cs" />
-    <Compile Include="System.IO.Pipes\PipeTransmissionMode.cs" />
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />
-    <Compile Include="System.IO\HandleInheritability.cs" />
-    <Compile Include="System.Linq.Expressions\ExpressionTransformer.cs" />
-    <Compile Include="System.Linq.Expressions\Extensions.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryBaseNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryCastNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryChildNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryConcatNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryDefaultEmptyNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryGroupByNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryHeadWorkerNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryJoinNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryMuxNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOptionNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderByNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderedStreamNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryOrderGuardNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryReverseNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySelectManyNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySelectNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QuerySetNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryStartNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryStreamNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryWhereNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\QueryZipNode.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\SetInclusion.cs" />
-    <Compile Include="System.Linq.Parallel.QueryNodes\WrapHelper.cs" />
-    <Compile Include="System.Linq.Parallel\AggregationList.cs" />
-    <Compile Include="System.Linq.Parallel\ConcurrentGrouping.cs" />
-    <Compile Include="System.Linq.Parallel\ConcurrentLookup.cs" />
-    <Compile Include="System.Linq.Parallel\INodeVisitor.cs" />
-    <Compile Include="System.Linq.Parallel\IVisitableNode.cs" />
-    <Compile Include="System.Linq.Parallel\OrderingEnumerator.cs" />
-    <Compile Include="System.Linq.Parallel\ParallelExecuter.cs" />
-    <Compile Include="System.Linq.Parallel\ParallelPartitioner.cs" />
-    <Compile Include="System.Linq.Parallel\ParallelQueryEnumerator.cs" />
-    <Compile Include="System.Linq.Parallel\ParallelQuickSort.cs" />
-    <Compile Include="System.Linq.Parallel\QueryCheckerVisitor.cs" />
-    <Compile Include="System.Linq.Parallel\QueryIsOrderedVisitor.cs" />
-    <Compile Include="System.Linq.Parallel\QueryOptions.cs" />
-    <Compile Include="System.Linq.Parallel\RangeList.cs" />
-    <Compile Include="System.Linq.Parallel\RepeatList.cs" />
-    <Compile Include="System.Linq.Parallel\ReverseList.cs" />
-    <Compile Include="System.Linq.Parallel\StripPartitioner.cs" />
-    <Compile Include="System.Linq.Parallel\TemporaryArea.cs" />
-    <Compile Include="System.Linq\Check.cs" />
-    <Compile Include="System.Linq\Enumerable.cs" />
-    <Compile Include="System.Linq\EnumerableExecutor.cs" />
-    <Compile Include="System.Linq\EnumerableExecutor_T.cs" />
-    <Compile Include="System.Linq\EnumerableQuery.cs" />
-    <Compile Include="System.Linq\EnumerableQuery_T.cs" />
-    <Compile Include="System.Linq\Grouping.cs" />
-    <Compile Include="System.Linq\IGrouping.cs" />
-    <Compile Include="System.Linq\ILookup_T.cs" />
-    <Compile Include="System.Linq\IOrderedEnumerable_T.cs" />
-    <Compile Include="System.Linq\IOrderedQueryable.cs" />
-    <Compile Include="System.Linq\IOrderedQueryable_T.cs" />
-    <Compile Include="System.Linq\IQueryable.cs" />
-    <Compile Include="System.Linq\IQueryable_T.cs" />
-    <Compile Include="System.Linq\IQueryProvider.cs" />
-    <Compile Include="System.Linq\Lookup.cs" />
-    <Compile Include="System.Linq\OrderedEnumerable.cs" />
-    <Compile Include="System.Linq\OrderedParallelQuery.cs" />
-    <Compile Include="System.Linq\OrderedSequence.cs" />
-    <Compile Include="System.Linq\ParallelEnumerable.cs" />
-    <Compile Include="System.Linq\ParallelExecutionMode.cs" />
-    <Compile Include="System.Linq\ParallelMergeOptions.cs" />
-    <Compile Include="System.Linq\ParallelQuery.cs" />
-    <Compile Include="System.Linq\Queryable.cs" />
-    <Compile Include="System.Linq\QueryableEnumerable.cs" />
-    <Compile Include="System.Linq\QueryableTransformer.cs" />
-    <Compile Include="System.Linq\QuickSort.cs" />
-    <Compile Include="System.Linq\SortContext.cs" />
-    <Compile Include="System.Linq\SortDirection.cs" />
-    <Compile Include="System.Linq\SortSequenceContext.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DynamicAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IStrongBox.cs" />
-    <Compile Include="System.Runtime.CompilerServices\StrongBox_T.cs" />
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\AesManaged.cs" />
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />
-    <Compile Include="System.Security.Cryptography\CngAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\CngAlgorithmGroup.cs" />
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />
-    <Compile Include="System.Threading.Tasks\TaskExtensions.cs" />
-    <Compile Include="System.Threading\LockRecursionException.cs" />
-    <Compile Include="System.Threading\LockRecursionPolicy.cs" />
-    <Compile Include="System.Threading\ReaderWriterLockSlim.cs" />
-    <Compile Include="System.Threading\ReaderWriterLockSlimExtensions.cs" />
-    <Compile Include="System.Threading\ThreadLockState.cs" />
-    <Compile Include="System\Actions.cs" />
-    <Compile Include="System\Funcs.cs" />
-    <Compile Include="System\InvalidTimeZoneException.cs" />
-    <Compile Include="System\TimeZoneInfo.AdjustmentRule.cs" />
-    <Compile Include="System\TimeZoneInfo.cs" />
-    <Compile Include="System\TimeZoneInfo.TransitionTime.cs" />
-    <Compile Include="System\TimeZoneNotFoundException.cs" />
-    <Compile Include="System\Util.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 Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="../corlib/corlib-build.csproj">
-      <Project>{0CAF787F-F70B-4556-987A-67E036CD71C1}</Project>
-      <Name>corlib\corlib-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System/System-bare-build.csproj">
-      <Project>{6E4F4BFB-2900-4663-B922-F176B2358C12}</Project>
-      <Name>System\System-bare-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="../Mono.Posix/Mono.Posix-build.csproj">
-      <Project>{52643CBD-F1A3-46D6-926B-E5302C18F7F0}</Project>
-      <Name>Mono.Posix\Mono.Posix-build</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj b/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj
index 85e07de17a5..110a22b1b29 100644
--- a/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj
+++ b/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,1720</NoWarn>
     <OutputPath>./../../class/lib/net_4_x/plaincore</OutputPath>
+    <IntermediateOutputPath>obj-plaincore</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,179 +48,6 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\DynamicExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\ExpressionVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\IArgumentProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\IDynamicExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Extension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\StrongBox.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\BitHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSetDebugView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSetEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\FuncAndAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\InvalidTimeZoneException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\Enums.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\Enums.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedFileSecurity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Enumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Expressions\ExpressionVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\IQueryable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Channels\AsynchronousChannel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Channels\SynchronousChannel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\AggregationMinMaxHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\EmptyEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\EnumerableWrapperWeakToStrong.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\IParallelPartitionable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\OrderedParallelQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelEnumerableWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\QueryAggregationOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\RangeEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\RepeatEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\ArrayMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\AsynchronousChannelMergeEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\DefaultMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\IMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\MergeEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\MergeExecutor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingPipeliningMergeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\SynchronousChannelMergeEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\IPartitionedStreamRecipient.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedDataSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\UnorderedHashRepartitionStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\AssociativeAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ExceptQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\GroupJoinQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\HashJoinQueryOperatorEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\IntersectQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\JoinQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\UnionQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ZipQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\BinaryQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\CountAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperatorEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongCountAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongAverageAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongMinMaxAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongSumAggregationOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ListQueryResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\OrderingQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\QueryExecutionOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\OrdinalIndexState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionedStreamMerger.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionerQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOpeningEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperatorEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QuerySettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ScanQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\AnyAllSearchOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ConcatQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ContainsSearchOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DefaultIfEmptyQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DistinctQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ElementAtQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\FirstQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ForAllOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\GroupByQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedSelectQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedWhereQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\LastQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ReverseQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectManyQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SingleQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SortQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipWhileQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\WhereQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\UnaryQueryOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\CancellationState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingPipeliningSpoolingTask.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingSpoolingTask.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryLifecycle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTask.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTaskGroupState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\Scheduling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTask.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTaskBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\CancellableEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ExceptionAggregator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ExchangeUtilities.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\FixedMaxHeap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\GrowingArray.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\HashLookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\IntValueEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ListChunk.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Lookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Pair.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\PairComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ReverseComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Shared.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Sorting.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\TraceHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Util.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Wrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\WrapperEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelExecutionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelMergeOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\SequenceQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\TypeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Runtime\CompilerServices\DynamicAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Runtime\CompilerServices\ExecutionScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\Aes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\CngKeyBlobFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellman.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellmanPublicKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\ECDsa.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\ECKeyXmlFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\ReaderWriterLockSlim\LockRecursionException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\ReaderWriterLockSlim\ReaderWriterLockSlim.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\Tasks\TaskExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\TimeZoneInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\TimeZoneNotFoundException.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BinaryOperationBinder.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BindingRestrictions.cs" />
@@ -333,12 +163,186 @@
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReflectionUtils.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TrueReadOnlyCollection.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TypeExtensions.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Ast\DynamicExpression.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Ast\ExpressionVisitor.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Ast\IArgumentProvider.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Ast\IDynamicExpression.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Extension.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />
+    <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\StrongBox.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Collections\Generic\BitHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Collections\Generic\HashSet.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Collections\Generic\HashSetDebugView.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Collections\Generic\HashSetEqualityComparer.cs" />
+    <Compile Include="..\referencesource\System.Core\System\FuncAndAction.cs" />
+    <Compile Include="..\referencesource\System.Core\System\InvalidTimeZoneException.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\Enums.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\Enums.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedFileSecurity.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewAccessor.cs" />
+    <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Enumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Expressions\ExpressionVisitor.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\IQueryable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Channels\AsynchronousChannel.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Channels\SynchronousChannel.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\AggregationMinMaxHelpers.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\EmptyEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\EnumerableWrapperWeakToStrong.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\IParallelPartitionable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\OrderedParallelQuery.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelEnumerableWrapper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelQuery.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\QueryAggregationOptions.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\RangeEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Enumerables\RepeatEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\ArrayMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\AsynchronousChannelMergeEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\DefaultMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\IMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\MergeEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\MergeExecutor.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingPipeliningMergeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Merging\SynchronousChannelMergeEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\IPartitionedStreamRecipient.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedDataSource.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Partitioning\UnorderedHashRepartitionStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\AssociativeAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ExceptQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\GroupJoinQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\HashJoinQueryOperatorEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\IntersectQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\JoinQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\UnionQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ZipQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\BinaryQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\CountAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperatorEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongCountAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongAverageAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongMinMaxAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongSumAggregationOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ListQueryResults.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\OrderingQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\QueryExecutionOption.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\OrdinalIndexState.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionedStreamMerger.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionerQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOpeningEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperatorEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryResults.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QuerySettings.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ScanQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\AnyAllSearchOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ConcatQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ContainsSearchOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DefaultIfEmptyQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DistinctQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ElementAtQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\FirstQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ForAllOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\GroupByQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedSelectQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedWhereQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\LastQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ReverseQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectManyQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SingleQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SortQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipWhileQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\WhereQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\QueryOperators\UnaryQueryOperator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\CancellationState.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingPipeliningSpoolingTask.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingSpoolingTask.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryLifecycle.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTask.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTaskGroupState.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\Scheduling.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTask.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTaskBase.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\CancellableEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\ExceptionAggregator.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\ExchangeUtilities.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\FixedMaxHeap.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\GrowingArray.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\HashLookup.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\IntValueEvent.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\ListChunk.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Lookup.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Pair.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\PairComparer.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\ReverseComparer.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Shared.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Sorting.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\TraceHelpers.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Util.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\Wrapper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\Parallel\Utils\WrapperEqualityComparer.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\ParallelEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\ParallelExecutionMode.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\ParallelMergeOptions.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\SequenceQuery.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Linq\TypeHelper.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Runtime\CompilerServices\DynamicAttribute.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Runtime\CompilerServices\ExecutionScope.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\Aes.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\CngKeyBlobFormat.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellman.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellmanPublicKey.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDsa.cs" />
+    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECKeyXmlFormat.cs" />
+    <Compile Include="..\referencesource\System.Core\System\threading\ReaderWriterLockSlim\LockRecursionException.cs" />
+    <Compile Include="..\referencesource\System.Core\System\threading\ReaderWriterLockSlim\ReaderWriterLockSlim.cs" />
+    <Compile Include="..\referencesource\System.Core\System\threading\Tasks\TaskExtensions.cs" />
+    <Compile Include="..\referencesource\System.Core\System\TimeZoneInfo.cs" />
+    <Compile Include="..\referencesource\System.Core\System\TimeZoneNotFoundException.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedFileHandle.cs" />
     <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedViewHandle.cs" />
     <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />
     <Compile Include="ReferenceSources\Error.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
+    <Compile Include="ReferenceSources\SR.missing.cs" />
     <Compile Include="ReferenceSources\Strings.cs" />
     <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFile.cs" />
     <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedView.cs" />
@@ -379,15 +383,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs b/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs
index b61fcb2bf4d..27191c37ed2 100644
--- a/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs
+++ b/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs
@@ -379,7 +379,9 @@ namespace MonoTests.System.IO.MemoryMappedFiles {
 		[Test]
 		public void CreateViewStreamAlignToPageSize ()
 		{
-#if MONOTOUCH
+#if __WATCHOS__
+			int pageSize = 4096;
+#elif MONOTOUCH
 			// iOS bugs on ARM64 - bnc #27667 - apple #
 			int pageSize = (IntPtr.Size == 4) ? Environment.SystemPageSize : 4096;
 #else
diff --git a/mcs/class/System.Core/mobile_static_System.Core_test.dll.excludes b/mcs/class/System.Core/mobile_static_System.Core_test.dll.exclude.sources
index f98bf051bef..f98bf051bef 100644
--- a/mcs/class/System.Core/mobile_static_System.Core_test.dll.excludes
+++ b/mcs/class/System.Core/mobile_static_System.Core_test.dll.exclude.sources
diff --git a/mcs/class/System.Core/monodroid_System.Core_test.dll.exclude.sources b/mcs/class/System.Core/monodroid_System.Core_test.dll.exclude.sources
new file mode 100644
index 00000000000..40eb2dc4132
--- /dev/null
+++ b/mcs/class/System.Core/monodroid_System.Core_test.dll.exclude.sources
@@ -0,0 +1,2 @@
+#include mobile_static_System.Core_test.dll.exclude.sources
+#include monodroid_System.Core_test.dll.new-exclude.sources
diff --git a/mcs/class/System.Core/monodroid_System.Core_test.dll.new-exclude.sources b/mcs/class/System.Core/monodroid_System.Core_test.dll.new-exclude.sources
new file mode 100644
index 00000000000..cabaa425814
--- /dev/null
+++ b/mcs/class/System.Core/monodroid_System.Core_test.dll.new-exclude.sources
@@ -0,0 +1,5 @@
+../../corlib/Test/System.Security.Cryptography/HashAlgorithmTest.cs
+../../corlib/Test/System.Security.Cryptography/SHA1Test.cs
+../../corlib/Test/System.Security.Cryptography/SHA256Test.cs
+../../corlib/Test/System.Security.Cryptography/SHA384Test.cs
+../../corlib/Test/System.Security.Cryptography/SHA512Test.cs
diff --git a/mcs/class/System.Core/monodroid_System.Core_test.dll.sources b/mcs/class/System.Core/monodroid_System.Core_test.dll.sources
new file mode 100644
index 00000000000..33e2a105847
--- /dev/null
+++ b/mcs/class/System.Core/monodroid_System.Core_test.dll.sources
@@ -0,0 +1 @@
+#include System.Core_test.dll.sources
diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_x.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_x.csproj
index ba4fe8a506d..8d845d576bf 100644
--- a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_x.csproj
+++ b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,18 +48,18 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\DataRowComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\DataRowExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\DataSetUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\DataTableExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\EnumerableRowCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\EnumerableRowCollectionExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\LinqDataView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\OrderedEnumerableRowCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\SortExpressionBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\TypedTableBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\TypedTableBaseExtensions.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\DataRowComparer.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\DataRowExtensions.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\DataSetUtil.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\DataTableExtensions.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\EnumerableRowCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\EnumerableRowCollectionExtensions.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\LinqDataView.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\OrderedEnumerableRowCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\SortExpressionBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\TypedTableBase.cs" />
+    <Compile Include="..\referencesource\System.Data.DataSetExtensions\System\Data\TypedTableBaseExtensions.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\Strings.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -67,15 +70,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Data.Entity/System.Data.Entity-net_4_x.csproj b/mcs/class/System.Data.Entity/System.Data.Entity-net_4_x.csproj
index c78915cad5c..25275651f16 100644
--- a/mcs/class/System.Data.Entity/System.Data.Entity-net_4_x.csproj
+++ b/mcs/class/System.Data.Entity/System.Data.Entity-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,730 +48,732 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\misc\HResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\AbstractExpressions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Aggregates.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\BasicCommandTreeVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\BasicExpressionVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbCommandTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbDeleteCommandTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbExpressionVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbExpressionVisitor_TResultType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbFunctionCommandTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbInsertCommandTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbLambda.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbModificationClause.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbModificationCommandTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbQueryCommandTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbSetClause.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbUpdateCommandTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DefaultExpressionVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBindings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\DbExpressionBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\EdmFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Internal\ArgumentValidation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Internal\EnumerableValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Row.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Spatial\SpatialEdmFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\DbExpressionRules.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionCopier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionDumper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionKeyGen.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionPrinter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ParameterRetriever.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\PatternMatchRules.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\Validator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ViewSimplifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\XmlExpressionDumper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\OperatorExpressions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\RelationalExpressions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ValueExpressions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DataRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DataRecordInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DbCommandDefinition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DbProviderManifest.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DbProviderServices.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DbXmlEnabledProviderManifest.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntityRecordInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\AliasedExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\AstNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\BuiltInExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\CaseExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\Command.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\ConstructorExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\CreateRefExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\DotExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\FunctionDefinition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\GroupAggregateExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\GroupPartitionExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\Identifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\Literal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\MethodExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\NamespaceImport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\NavigationExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\ParenExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\QueryExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\QueryParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\QueryStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\RefExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\TypeDefinition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlErrorHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlLexer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlLexerHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlParserHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\EntitySqlParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\FunctionOverloadResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\ParseResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\ParserOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\SemanticAnalyzer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\SemanticResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\StaticContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\TypeResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntityUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\FieldMetadata.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\FieldNameLookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\DbTypeMap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\ColumnMapKeyBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\CompensatingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Coordinator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\CoordinatorFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\CoordinatorScratchpad.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\RecordState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\RecordStateFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\RecordStateScratchpad.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Shaper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\ShaperFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Translator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Util.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\MultipartIdentifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\CompiledQueryCacheEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\CompiledQueryCacheKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\EntityClientCacheKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\EntitySqlQueryCacheKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\LinqQueryCacheKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\QueryCacheEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\QueryCacheKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\QueryCacheManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\ShaperFactoryQueryCacheKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\AliasGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\BoolExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Clause.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\ConversionContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\DomainConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\IdentifierService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\KnowledgeBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Literal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\NegationPusher.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Sentence.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Simplifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Solver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Vertex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Visitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\ByValueEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\CommandHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\DisposableCollectionWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Helpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\InternalBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\KeyToListMap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Memoizer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\MetadataHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\ModifiableIteratorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Pair.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Set.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Singleton.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\StringUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\ThreadSafeList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\TrailingSpaceComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\TreePrinter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\DbConnectionOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\DbParameterCollectionHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\DbParameterHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityCommandDefinition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityConnection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityConnectionStringBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityDataReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityParameterCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityProviderFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityProviderServices.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityTransaction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\NameValuePair.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityCommandCompilationException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityCommandExecutionException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Action.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\BooleanFacetDescriptionElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ByteFacetDescriptionElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\CollectionKind.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\CollectionTypeElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ConcurrencyMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Documentation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerAssociationSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerAssociationSetEnd.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerEntitySet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerEntitySetDefiningQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerRelationshipSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerRelationshipSetEnd.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityKeyElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ErrorCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FacetDescriptionElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FacetEnabledSchemaElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FilteredSchemaElementLookUpTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Function.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FunctionCommandText.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FunctionImportElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IntegerFacetDescriptionElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IRelationship.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IRelationshipEnd.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ISchemaElementLookUpTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ItemType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\KeyProperty.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ModelFunction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ModelFunctionTypeElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\NavigationProperty.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\OnOperation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Operation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Parameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\PrimitiveSchema.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Property.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferenceSchema.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferenceTypeElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferentialConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferentialConstraintRoleElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Relationship.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RelationshipEnd.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RelationshipEndCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReturnType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReturnValue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RowTypeElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RowTypePropertyElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ScalarType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Schema.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaComplexType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaDataModelOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaElementLookUpTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaElementLookUpTableEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaEnumMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaEnumType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaLookupTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SridFacetDescriptionElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\StoreGeneratedPattern.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\StructuredProperty.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\StructuredType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TextElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeModifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeRefElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeUsageBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Utils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ValidationHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\XmlSchemaResource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntitySqlException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\IEntityAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\IEntityStateEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\IEntityStateManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\IExtendedDataRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\InternalMappingException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\InvalidCommandTreeException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\BaseMetadataMappingVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\DefaultObjectMappingItemCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\EntityViewContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\EntityViewGenerationAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMapping.ReturnTypeRenameMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMappingComposable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMappingNonComposable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Mapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\MappingItemCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\MetadataMappingHasherVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\MetadataMappingHasherVisitor.HashSourceBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectAssociationEndMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectComplexPropertyMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectMemberMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectMslConstructs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectNavigationPropertyMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectPropertyMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectTypeMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageAssociationSetMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageAssociationTypeMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageComplexPropertyMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageComplexTypeMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageConditionPropertyMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageEndPropertyMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntityContainerMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntitySetMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntityTypeMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingErrorCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingFragment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemCollection.ViewDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageModificationFunctionMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMslConstructs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StoragePropertyMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageScalarPropertyMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageSetMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageTypeMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\AssociationSetMetadata.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ChangeNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\CompositeKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\DynamicUpdateCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ExtractedStateEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ExtractorMetadata.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\FunctionMappingTranslator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\FunctionUpdateCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Graph.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\KeyManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.Evaluator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.ExtentPlaceholderCreator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.JoinPredicateVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.SubstitutingCloneVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\PropagatorFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\PropagatorResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\RecordConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\RelationshipConstraintValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\SourceInterpreter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\TableChangeProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UndirectedGraph.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateCommandOrderer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateExpressionVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateTranslator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ViewLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\BasicViewGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CellCreator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CellPartitioner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CellTreeSimplifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ConfigViewGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\AliasedSlot.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\BooleanProjectedSlot.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CaseCqlBlock.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CqlBlock.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CqlIdentifiers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CqlWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\ExtentCqlBlock.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\JoinCqlBlock.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\SlotInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\UnionCqlBlock.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\DiscriminatorMap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\GeneratedView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\FragmentQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\FragmentQueryKB.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\FragmentQueryProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\QueryRewriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingPass.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingSimplifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RoleBoolean.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\Tile.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\BoolExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\BoolExpressionVisitors.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\BoolLiteral.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CaseStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CaseStatementProjectedSlot.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\Cell.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellIdBoolean.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellLabel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellTreeNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellTreeNodeVisitors.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellTreeOpType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\Constant.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ConstantProjectedSlot.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\Domain.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ErrorLog.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\LeafCellTreeNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\LeftCellWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberDomainMap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberMaps.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberPath.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberProjectedSlot.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberProjectionIndex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberRestriction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\NegatedConstant.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\OpCellTreeNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ProjectedSlot.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\QualifiedCellIdBoolean.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ScalarConstant.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ScalarRestriction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\TypeConstant.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\TypeRestriction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\WithStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Utils\ExceptionHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Utils\ExternalCalls.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Utils\ViewGenErrorCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\BasicCellRelation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\BasicKeyConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\CellRelation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ConstraintBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ErrorPatternMatcher.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ExtentKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ForeignConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\KeyConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\SchemaConstraints.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewCellRelation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewCellSlot.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewKeyConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewgenContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewgenGatekeeper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewGenResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\MappingException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\AspProxy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\CacheForPrimitiveTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ClrPerspective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\CustomAssemblyResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\DataSpace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\DefaultAssemblyResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationEndMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationSetEnd.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AttributeKind.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\BuiltInKind.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\CollectionType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ComplexType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Documentation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmConstants.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmFunction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmProperty.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntityContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntitySet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntitySetBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntitySetBaseCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntityType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntityTypeBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EnumMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EnumType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Facet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FacetDescription.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FacetValueContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FacetValues.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FilteredReadOnlyMetadataCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FunctionParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\GlobalItem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ItemCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\LightweightCodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MemberCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataItem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataItem_Static.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataProperty.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataPropertyCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataPropertyvalue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\NavigationProperty.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\NavigationPropertyAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\OperationAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ParameterMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\PrimitiveType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\PrimitiveTypeKind.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\ClrProviderManifest.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifest.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifestFunctionBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifestSpatialFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ReadOnlyMetadataCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ReferentialConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RefType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipEndMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipMultiplicity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RowType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\SafeLink.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\SafeLinkCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\SimpleType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\StructuralType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\TypeUsage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\util.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.OcAssemblyCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaErrorSeverity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Helper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MappingMetadataHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactAssemblyResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderComposite.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderCompositeFile.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderCompositeResource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderFile.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderResource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderXmlReaderWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataWorkspace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ModelPerspective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectItemCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\AssemblyCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\AssemblyCacheEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ImmutableAssemblyCacheEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\KnownAssembliesSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\KnownAssemblyEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\LoadMessageLogger.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\LockedAssemblyCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\MetadataAssemblyHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\MutableAssemblyCacheEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemAssemblyLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemAttributeAssemblyLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemCachedAssemblyLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemConventionAssemblyLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemLoadingSessionData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemNoOpAssemblyLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ParameterTypeSemantics.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Perspective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\StoreItemCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\StoreItemCollection.Loader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\TargetPerspective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\TypeHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\TypeSemantics.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\XmlConstants.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\MetadataException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\ObjectNotFoundException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\AdditionalEntityFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\CompiledQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\ComplexObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmComplexPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmComplexTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmEntityTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmEnumTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmFunctionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmRelationshipNavigationPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmRelationshipRoleAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmScalarPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmSchemaAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityReference_TResultType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityChangeTracker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityWithChangeTracker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityWithKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityWithRelationships.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IRelatedEnd.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IRelationshipFixer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelatedEnd.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipFixer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipKind.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipNavigation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\StructuralObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataRecordObjectView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\BindingContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\CompiledELinqQueryState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ELinqQueryState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\EntityExpressionVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ExpressionConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ExpressionVisitorHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\Funcletizer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\InitializerFacet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\LinqExpressionNormalizer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\MethodCallTranslator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ObjectQueryProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\OrderByLifter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ReflectionUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\SpatialMethodCallTranslator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\SpatialPropertyTranslator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\Translator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\TypeSystem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\EntityEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\EntityFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\FieldDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\BaseEntityWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ComplexTypeMaterializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityProxyFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityProxyTypeInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntitySqlQueryBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntitySqlQueryState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWithChangeTrackerStrategy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWithKeyStrategy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWrapperFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ForeignKeyFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\IChangeTrackingStrategy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\IEntityKeyStrategy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\IEntityWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\IPropertyAccessorStrategy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\LazyLoadBehavior.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\LightweightEntityWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\NullEntityWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectFullSpanRewriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectQueryExecutionPlan.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectQueryState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectSpanRewriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\PocoEntityKeyStrategy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\PocoPropertyAccessorStrategy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\SnapshotChangeTrackingStrategy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\TransactionManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\IObjectSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\IObjectView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\IObjectViewData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\MergeOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\NextResultGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectMaterializedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectParameterCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectQuery_EntitySqlExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectQuery_TResultType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectResult_TResultType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryBaseUpdatableDataRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryDbDataRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryDbUpdatableDataRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryOriginalDbUpdatableDataRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateManagerMetadata.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewEntityCollectionData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewQueryResultData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ProxyDataContractResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\RefreshMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\RelationshipEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\RelationshipWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\SaveOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Span.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\SpanIndex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\SqlClient\SqlFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\SqlClient\SqlSpatialFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\OptimisticConcurrencyException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\PropertyConstraintException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\ProviderIncompatibleException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\AncillaryOps.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\BasicValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMapCopier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMapFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMapVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Command.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Dump.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ExplicitDiscriminatorMap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Metadata.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\NodeCounter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\NodeInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Nodes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\OpCopier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Ops.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\PhysicalOps.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RelOps.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RelPropertyHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Rule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RulePatternOps.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RuleProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ScalarOps.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Vars.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Visitors.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\AggregatePushdown.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CodeGen.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ColumnMapProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ColumnMapTranslator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CommandPlan.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ConstraintManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CTreeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ITreeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\JoinElimination.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\JoinGraph.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\KeyPullup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\NestPullup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\NominalTypeEliminator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Normalizer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PlanCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PlanCompilerUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Predicate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PreProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ProjectionPruner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PropertyPushdownHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PropertyRef.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ProviderCommandInfoUtils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\StructuredTypeInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\SubqueryTrackingVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\TransformationRules.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\TypeInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\TypeUtils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Validator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\VarInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\VarRefManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\VarRemapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\ResultAssembly\BridgeDataReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\ResultAssembly\BridgeDataRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbGeography.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbGeographyWellKnownValue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbGeometry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbGeometryWellKnownValue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbSpatialDataReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbSpatialServices.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DefaultSpatialServices.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\ExtensionMethods.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\Internal\SpatialExceptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\SpatialHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\IDbSpatialValue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\DmlSqlGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\ISqlFragment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\JoinSymbol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\OptionalColumn.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\Sql8ConformanceChecker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\Sql8ExpressionRewriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlFunctionCallHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlSelectClauseBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlSelectStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\Symbol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SymbolPair.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SymbolTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SymbolUsageManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\TopClause.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderManifest.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderServices.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderUtilities.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialDataReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialServices.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialServices.Generated.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlTypesAssembly.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlVersion.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\UpdateException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\Util\AppSettings.cs" />
+    <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\misc\HResults.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\AbstractExpressions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Aggregates.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\BasicCommandTreeVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\BasicExpressionVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbCommandTree.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbDeleteCommandTree.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbExpressionVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbExpressionVisitor_TResultType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbFunctionCommandTree.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbInsertCommandTree.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbLambda.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbModificationClause.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbModificationCommandTree.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbQueryCommandTree.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbSetClause.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbUpdateCommandTree.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DefaultExpressionVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBindings.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\DbExpressionBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\EdmFunctions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Internal\ArgumentValidation.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Internal\EnumerableValidator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Row.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Spatial\SpatialEdmFunctions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\DbExpressionRules.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionCopier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionDumper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionKeyGen.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionList.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionPrinter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ParameterRetriever.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\PatternMatchRules.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\Validator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ViewSimplifier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\XmlExpressionDumper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\OperatorExpressions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\RelationalExpressions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ValueExpressions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\DataRecord.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\DataRecordInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\DbCommandDefinition.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\DbProviderManifest.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\DbProviderServices.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\DbXmlEnabledProviderManifest.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntityRecordInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\AliasedExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\AstNode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\BuiltInExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\CaseExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\Command.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\ConstructorExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\CreateRefExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\DotExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\FunctionDefinition.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\GroupAggregateExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\GroupPartitionExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\Identifier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\Literal.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\MethodExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\NamespaceImport.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\NavigationExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\ParenExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\QueryExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\QueryParameter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\QueryStatement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\RefExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\TypeDefinition.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlErrorHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlLexer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlLexerHelpers.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlParser.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlParserHelpers.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlQuery.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\EntitySqlParser.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\FunctionOverloadResolver.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\ParseResult.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\ParserOptions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\SemanticAnalyzer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\SemanticResolver.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\StaticContext.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntitySql\TypeResolver.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\EntityUtil.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\FieldMetadata.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\FieldNameLookup.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\DbTypeMap.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\ColumnMapKeyBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\CompensatingCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Coordinator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\CoordinatorFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\CoordinatorScratchpad.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\RecordState.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\RecordStateFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\RecordStateScratchpad.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Shaper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\ShaperFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Translator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Util.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Internal\MultipartIdentifier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\QueryCache\CompiledQueryCacheEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\QueryCache\CompiledQueryCacheKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\QueryCache\EntityClientCacheKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\QueryCache\EntitySqlQueryCacheKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\QueryCache\LinqQueryCacheKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\QueryCache\QueryCacheEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\QueryCache\QueryCacheKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\QueryCache\QueryCacheManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\QueryCache\ShaperFactoryQueryCacheKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\AliasGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\BoolExpr.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Clause.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\ConversionContext.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Converter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\DomainConstraint.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\IdentifierService.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\KnowledgeBase.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Literal.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\NegationPusher.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Sentence.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Simplifier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Solver.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Vertex.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Visitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\ByValueEqualityComparer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\CommandHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\DisposableCollectionWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Helpers.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\InternalBase.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\KeyToListMap.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Memoizer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\MetadataHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\ModifiableIteratorCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Pair.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Set.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\Singleton.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\StringUtil.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\ThreadSafeList.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\TrailingSpaceComparer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\Utils\TreePrinter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\DbConnectionOptions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\DbParameterCollectionHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\DbParameterHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityAdapter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityCommand.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityCommandDefinition.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityConnection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityConnectionStringBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityDataReader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityParameter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityParameterCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityProviderFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityProviderServices.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\EntityTransaction.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityClient\NameValuePair.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityCommandCompilationException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityCommandExecutionException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Action.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\BooleanFacetDescriptionElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ByteFacetDescriptionElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\CollectionKind.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\CollectionTypeElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ConcurrencyMode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Documentation.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerAssociationSet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerAssociationSetEnd.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerEntitySet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerEntitySetDefiningQuery.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerRelationshipSet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerRelationshipSetEnd.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityKeyElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ErrorCode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FacetDescriptionElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FacetEnabledSchemaElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FilteredSchemaElementLookUpTable.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Function.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FunctionCommandText.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FunctionImportElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IntegerFacetDescriptionElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IRelationship.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IRelationshipEnd.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ISchemaElementLookUpTable.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ItemType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\KeyProperty.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ModelFunction.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ModelFunctionTypeElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\NavigationProperty.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\OnOperation.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Operation.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Parameter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\PrimitiveSchema.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Property.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferenceSchema.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferenceTypeElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferentialConstraint.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferentialConstraintRoleElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Relationship.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RelationshipEnd.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RelationshipEndCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReturnType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReturnValue.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RowTypeElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RowTypePropertyElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ScalarType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Schema.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaComplexType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaDataModelOption.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaElementLookUpTable.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaElementLookUpTableEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaEnumMember.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaEnumType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaLookupTable.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SridFacetDescriptionElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\StoreGeneratedPattern.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\StructuredProperty.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\StructuredType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TextElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeModifier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeRefElement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeUsageBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Utils.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ValidationHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\XmlSchemaResource.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntitySqlException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityState.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\IEntityAdapter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\IEntityStateEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\IEntityStateManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\IExtendedDataRecord.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\InternalMappingException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\InvalidCommandTreeException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\BaseMetadataMappingVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\DefaultObjectMappingItemCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\EntityViewContainer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\EntityViewGenerationAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMapping.ReturnTypeRenameMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMappingComposable.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMappingNonComposable.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Mapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\MappingItemCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\MetadataMappingHasherVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\MetadataMappingHasherVisitor.HashSourceBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectAssociationEndMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectComplexPropertyMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectMemberMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectMslConstructs.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectNavigationPropertyMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectPropertyMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectTypeMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageAssociationSetMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageAssociationTypeMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageComplexPropertyMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageComplexTypeMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageConditionPropertyMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageEndPropertyMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntityContainerMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntitySetMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntityTypeMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingErrorCode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingFragment.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemCollection.ViewDictionary.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageModificationFunctionMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMslConstructs.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StoragePropertyMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageScalarPropertyMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageSetMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageTypeMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\AssociationSetMetadata.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ChangeNode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\CompositeKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\DynamicUpdateCommand.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ExtractedStateEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ExtractorMetadata.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\FunctionMappingTranslator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\FunctionUpdateCommand.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Graph.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\KeyManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.Evaluator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.ExtentPlaceholderCreator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.JoinPredicateVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.SubstitutingCloneVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\PropagatorFlags.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\PropagatorResult.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\RecordConverter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\RelationshipConstraintValidator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\SourceInterpreter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\TableChangeProcessor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UndirectedGraph.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateCommand.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateCommandOrderer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateCompiler.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateExpressionVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateTranslator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ViewLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\BasicViewGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CellCreator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CellPartitioner.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CellTreeSimplifier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ConfigViewGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\AliasedSlot.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\BooleanProjectedSlot.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CaseCqlBlock.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CqlBlock.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CqlIdentifiers.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CqlWriter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\ExtentCqlBlock.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\JoinCqlBlock.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\SlotInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\UnionCqlBlock.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\DiscriminatorMap.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\GeneratedView.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\FragmentQuery.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\FragmentQueryKB.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\FragmentQueryProcessor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\QueryRewriter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingPass.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingProcessor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingSimplifier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingValidator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RoleBoolean.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\Tile.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\BoolExpression.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\BoolExpressionVisitors.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\BoolLiteral.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CaseStatement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CaseStatementProjectedSlot.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\Cell.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellIdBoolean.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellLabel.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellQuery.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellTreeNode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellTreeNodeVisitors.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellTreeOpType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\Constant.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ConstantProjectedSlot.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\Domain.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ErrorLog.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\LeafCellTreeNode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\LeftCellWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberDomainMap.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberMaps.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberPath.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberProjectedSlot.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberProjectionIndex.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberRestriction.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\NegatedConstant.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\OpCellTreeNode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ProjectedSlot.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\QualifiedCellIdBoolean.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ScalarConstant.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ScalarRestriction.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\TypeConstant.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\TypeRestriction.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\WithStatement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Utils\ExceptionHelpers.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Utils\ExternalCalls.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Utils\ViewGenErrorCode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\BasicCellRelation.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\BasicKeyConstraint.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\CellRelation.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ConstraintBase.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ErrorPatternMatcher.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ExtentKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ForeignConstraint.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\KeyConstraint.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\SchemaConstraints.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewCellRelation.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewCellSlot.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewKeyConstraint.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewgenContext.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewgenGatekeeper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewGenResults.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewValidator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\MappingException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\AspProxy.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\CacheForPrimitiveTypes.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ClrPerspective.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Converter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\CustomAssemblyResolver.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\DataSpace.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\DefaultAssemblyResolver.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationEndMember.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationSet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationSetEnd.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AttributeKind.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\BuiltInKind.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\CollectionType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ComplexType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Documentation.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmConstants.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmFunction.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmMember.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmProperty.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntityContainer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntitySet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntitySetBase.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntitySetBaseCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntityType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntityTypeBase.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EnumMember.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EnumType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Facet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FacetDescription.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FacetValueContainer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FacetValues.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FilteredReadOnlyMetadataCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FunctionParameter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\GlobalItem.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ItemCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\LightweightCodeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MemberCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataItem.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataItem_Static.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataProperty.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataPropertyCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataPropertyvalue.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\NavigationProperty.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\NavigationPropertyAccessor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\OperationAction.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ParameterMode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\PrimitiveType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\PrimitiveTypeKind.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\ClrProviderManifest.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifest.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifestFunctionBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifestSpatialFunctions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ReadOnlyMetadataCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ReferentialConstraint.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RefType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipEndMember.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipMultiplicity.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipSet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RowType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\SafeLink.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\SafeLinkCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\SimpleType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\StructuralType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\TypeUsage.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\util.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmError.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.OcAssemblyCache.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemError.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaError.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaErrorSeverity.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmValidator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Helper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MappingMetadataHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactAssemblyResolver.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderComposite.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderCompositeFile.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderCompositeResource.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderFile.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderResource.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderXmlReaderWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataCache.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataWorkspace.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ModelPerspective.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectItemCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\AssemblyCache.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\AssemblyCacheEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ImmutableAssemblyCacheEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\KnownAssembliesSet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\KnownAssemblyEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\LoadMessageLogger.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\LockedAssemblyCache.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\MetadataAssemblyHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\MutableAssemblyCacheEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemAssemblyLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemAttributeAssemblyLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemCachedAssemblyLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemConventionAssemblyLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemLoadingSessionData.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemNoOpAssemblyLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ParameterTypeSemantics.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Perspective.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\StoreItemCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\StoreItemCollection.Loader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\TargetPerspective.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\TypeHelpers.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\TypeSemantics.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\XmlConstants.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\MetadataException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\ObjectNotFoundException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\AdditionalEntityFunctions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\CompiledQuery.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\ComplexObject.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmComplexPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmComplexTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmEntityTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmEnumTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmFunctionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmRelationshipNavigationPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmRelationshipRoleAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmScalarPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmSchemaAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityObject.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityReference.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityReference_TResultType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityChangeTracker.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityWithChangeTracker.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityWithKey.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityWithRelationships.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IRelatedEnd.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IRelationshipFixer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelatedEnd.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipFixer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipKind.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipNavigation.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\StructuralObject.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\DataRecordObjectView.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\BindingContext.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\CompiledELinqQueryState.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ELinqQueryState.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\EntityExpressionVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ExpressionConverter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ExpressionVisitorHelpers.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\Funcletizer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\InitializerFacet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\LinqExpressionNormalizer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\MethodCallTranslator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ObjectQueryProvider.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\OrderByLifter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ReflectionUtil.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\SpatialMethodCallTranslator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\SpatialPropertyTranslator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\Translator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ELinq\TypeSystem.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\EntityEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\EntityFunctions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\FieldDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\BaseEntityWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\ComplexTypeMaterializer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityProxyFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityProxyTypeInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntitySqlQueryBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntitySqlQueryState.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWithChangeTrackerStrategy.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWithKeyStrategy.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWrapperFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\ForeignKeyFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\IChangeTrackingStrategy.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\IEntityKeyStrategy.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\IEntityWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\IPropertyAccessorStrategy.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\LazyLoadBehavior.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\LightweightEntityWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\NullEntityWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectFullSpanRewriter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectQueryExecutionPlan.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectQueryState.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectSpanRewriter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\PocoEntityKeyStrategy.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\PocoPropertyAccessorStrategy.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\SnapshotChangeTrackingStrategy.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\TransactionManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\IObjectSet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\IObjectView.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\IObjectViewData.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\MergeOption.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\NextResultGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectContext.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectMaterializedEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectParameter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectParameterCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectQuery.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectQuery_EntitySqlExtensions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectQuery_TResultType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectResult.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectResult_TResultType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectSet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryBaseUpdatableDataRecord.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryDbDataRecord.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryDbUpdatableDataRecord.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryOriginalDbUpdatableDataRecord.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateManagerMetadata.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectView.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewEntityCollectionData.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewListener.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewQueryResultData.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ProxyDataContractResolver.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\RefreshMode.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\RelationshipEntry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\RelationshipWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\SaveOptions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Span.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\SpanIndex.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\SqlClient\SqlFunctions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\SqlClient\SqlSpatialFunctions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\OptimisticConcurrencyException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\PropertyConstraintException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\ProviderIncompatibleException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\AncillaryOps.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\BasicValidator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMap.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMapCopier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMapFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMapVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Command.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Dump.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ExplicitDiscriminatorMap.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Metadata.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\NodeCounter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\NodeInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Nodes.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\OpCopier.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Ops.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\PhysicalOps.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RelOps.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RelPropertyHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Rule.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RulePatternOps.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RuleProcessor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ScalarOps.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Vars.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Visitors.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\AggregatePushdown.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CodeGen.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ColumnMapProcessor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ColumnMapTranslator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CommandPlan.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ConstraintManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CTreeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ITreeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\JoinElimination.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\JoinGraph.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\KeyPullup.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\NestPullup.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\NominalTypeEliminator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Normalizer.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PlanCompiler.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PlanCompilerUtil.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Predicate.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PreProcessor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ProjectionPruner.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PropertyPushdownHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PropertyRef.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ProviderCommandInfoUtils.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\StructuredTypeInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\SubqueryTrackingVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\TransformationRules.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\TypeInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\TypeUtils.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Validator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\VarInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\VarRefManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\VarRemapper.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\ResultAssembly\BridgeDataReader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\ResultAssembly\BridgeDataRecord.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\DbGeography.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\DbGeographyWellKnownValue.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\DbGeometry.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\DbGeometryWellKnownValue.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\DbSpatialDataReader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\DbSpatialServices.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\DefaultSpatialServices.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\ExtensionMethods.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\Internal\SpatialExceptions.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Spatial\SpatialHelpers.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\IDbSpatialValue.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\DmlSqlGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\ISqlFragment.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\JoinSymbol.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\OptionalColumn.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\Sql8ConformanceChecker.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\Sql8ExpressionRewriter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlFunctionCallHandler.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlSelectClauseBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlSelectStatement.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlWriter.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\Symbol.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SymbolPair.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SymbolTable.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SymbolUsageManager.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\TopClause.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderManifest.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderServices.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderUtilities.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialDataReader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialServices.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialServices.Generated.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlTypesAssembly.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlVersion.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\UpdateException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\Util\AppSettings.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="EntityRes.cs" />
     <Compile Include="EntityResCategoryAttribute.cs" />
     <Compile Include="EntityResDescriptionAttribute.cs" />
     <Compile Include="Error.cs" />
-    <Compile Include="Strings.cs" />
-  </ItemGroup>
+    <Compile Include="ReferenceSources\SR.cs" />
+    <Compile Include="ReferenceSources\Strings.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">
@@ -777,15 +782,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Data.Linq/System.Data.Linq-net_4_x.csproj b/mcs/class/System.Data.Linq/System.Data.Linq-net_4_x.csproj
index 77f2f55a06c..02e0b4aba48 100644
--- a/mcs/class/System.Data.Linq/System.Data.Linq-net_4_x.csproj
+++ b/mcs/class/System.Data.Linq/System.Data.Linq-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -377,15 +380,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_x.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_x.csproj
index 62165028ac9..e569ce44aad 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_x.csproj
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -123,15 +126,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Data.Services.Client/Makefile b/mcs/class/System.Data.Services.Client/Makefile
index 108d98cf149..f635e808fc3 100644
--- a/mcs/class/System.Data.Services.Client/Makefile
+++ b/mcs/class/System.Data.Services.Client/Makefile
@@ -4,13 +4,11 @@ include ../../build/rules.make
 
 LIBRARY = System.Data.Services.Client.dll
 
-Client/System.Data.Services.Client.resources: Client/System.Data.Services.Client.txt
-	$(RESGEN) "$<" "$@"
+RESOURCE_DEFS = System.Data.Services.Client,Client/System.Data.Services.Client.txt
 
 LIB_REFS = System System.Core System.Xml.Linq System.Data System.Xml
 LIB_MCS_FLAGS = \
 	-d:NET_3_5	\
-	-resource:Client/System.Data.Services.Client.resources \
 	-warn:2
 
 ifndef NO_WINDOWS_BASE
@@ -21,7 +19,5 @@ endif
 
 include ../../build/library.make
 
-$(the_lib): Client/System.Data.Services.Client.resources
-
 EXTRA_DISTFILES = Client/System.Data.Services.Client.txt
-CLEAN_FILES += Client/System.Data.Services.Client.resources
+
diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj
index 82027455d0d..e5d64222fa8 100644
--- a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj
+++ b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -169,15 +172,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -217,7 +219,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Client/System.Data.Services.Client.resources">
+    <EmbeddedResource Include="Client/System.Data.Services.Client.txt">
       <LogicalName>System.Data.Services.Client.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Data.Services/System.Data.Services-net_4_x.csproj b/mcs/class/System.Data.Services/System.Data.Services-net_4_x.csproj
index 37e35dd1808..6a4ef89e6c8 100644
--- a/mcs/class/System.Data.Services/System.Data.Services-net_4_x.csproj
+++ b/mcs/class/System.Data.Services/System.Data.Services-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -128,15 +131,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Data/System.Data-net_4_x.csproj b/mcs/class/System.Data/System.Data-net_4_x.csproj
index 23229be5f1c..552ec452530 100644
--- a/mcs/class/System.Data/System.Data-net_4_x.csproj
+++ b/mcs/class/System.Data/System.Data-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,169,219,414,649</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,400 +48,402 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Data\bid\inc\cs\bidPrivateBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\Microsoft\SqlServer\Server\SqlTriggerContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\Misc\ExternDll.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\Misc\HResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\Misc\PrivilegedConfigurationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\AcceptRejectRule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\AggregateType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\BaseCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CatalogLocation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CodeGen\datacache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CodeGen\StrongTypingException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ColumnTypeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CommandBehavior.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CommandType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\ActivityCorrelator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\AdapterSwitches.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\AdapterUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\BigIntegerStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\BooleanStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\ByteStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\CharStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataColumnMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataColumnMappingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataRecordInternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataTableMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataTableMappingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DateTimeOffsetStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DateTimeStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBCommandBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBConnection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbConnectionOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbConnectionPoolKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBConnectionString.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbConnectionStringBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbConnectionStringCommon.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbDataAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBDataPermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBDataPermissionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbDataReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\dbdatarecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbDataSourceEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\dbenumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbParameterCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderConfigurationHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderFactories.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderFactoriesConfigurationHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderSpecificTypePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBSchemaRow.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBSchemaTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbTransaction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DecimalStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DoubleStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\FieldNameLookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\GreenMethods.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\Groupbybehavior.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\HandlerBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\identifiercase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\Int16Storage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\Int32Storage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\Int64Storage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\MultipartIdentifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\NameValuePair.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\NameValuePermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\NativeMethods.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\ObjectStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\RowUpdatedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\RowUpdatingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SafeNativeMethods.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SByteStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SchemaTableColumn.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SchemaTableOptionalColumn.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SingleStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLConvert.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLBinaryStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQlBooleanStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLBytesStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLByteStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLCharsStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLDateTimeStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLDecimalStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLDoubleStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLGuidStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLInt16Storage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLInt32Storage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLInt64Storage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLMoneyStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLSingleStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLStringStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SqlUDTStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SqlXmlStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\StringStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SupportedJoinOperators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\System.Data_BID.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\TimeSpanStorage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\UInt16Storage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\UInt32Storage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\UInt64Storage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\UnsafeNativeMethods.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConflictOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConnectionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Constraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConstraintCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConstraintConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConstraintEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumn.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumnChangeEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumnChangeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumnCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumnPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRelation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRelationCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRelationPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRow.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowChangeEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowChangeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowCreatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowVersion.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataSerializationFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataSetDateTime.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataSysAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableClearEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableClearEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableNewRowEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableNewRowEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTablePropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableReaderListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableTypeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewManagerListItemTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewRowState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewSetting.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewSettingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DBConcurrencyException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\dbtype.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DefaultValueTypeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\FillErrorEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\FillErrorEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\AggregateNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\BinaryNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\ConstNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\DataExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\ExpressionNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\ExpressionParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\FilterException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\FunctionNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\IFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\LookupNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\NameNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\Operators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\UnaryNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\ZeroOpNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ForeignKeyConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IColumnMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IColumnMappingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataParameterCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbConnection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbDataAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbDataParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbTransaction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IsolationLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ITableMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ITableMappingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\LoadOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MappingType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MergeFailedEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MergeFailedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Merger.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MissingMappingAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MissingSchemaAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\DbDataRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\Odbc32.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcCommandBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionOpen.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionPoolProviderInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionString.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionStringbuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcDataAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcDataReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcEnvironment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcEnvironmentHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcErrorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcInfoMessageEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\odbcmetadatacollectionnames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\odbcmetadatacolumnnames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\odbcmetadatafactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcParameterCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcPermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcRowUpdatingEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcStatementHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcTransaction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcUtils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\ColumnBinding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\DBBindings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\DBPropSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OLEDB_Enum.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OLEDB_Util.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbCommandBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbConnection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbConnectionFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbConnectionInternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbConnectionPoolGroupProviderInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\oledbconnectionstring.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OledbConnectionStringbuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbDataAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbDataReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbErrorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbHResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbInfoMessageEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbInfoMessageEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbLiteral.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\oledbmetadatacollectionnames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\oledbmetadatacolumnnames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbMetaDataFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbParameterCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbPermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbPropertySetGuid.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbPropertyStatus.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatedEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatingEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbSchemaGuid.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbStruct.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbTransaction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\PropertyAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\PropertyIDSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\PropertyInfoSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\RowBinding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\SafeHandles.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OperationAbortedException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ParameterDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\PrimaryKeyTypeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\PropertyCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DataReaderContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbBuffer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionClosed.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionInternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPool.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolAuthenticationContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolCounters.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolIdentity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolProviderInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataCollectionNames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataColumnNames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\SchemaMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\TimeoutTimer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\WrappedIUnknown.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Range.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RbTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RecordManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RecordsAffectedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RecordsAffectedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RelatedView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RelationshipConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Rule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SchemaSerializationMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SchemaType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Select.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Selection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SimpleType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\IBinarySerialize.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\invalidudtexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlDataSourceEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlFacetAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlFunctionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlGenericUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlNotificationRequest.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlProcedureAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlTriggerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlUserDefinedAggregateAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlUserDefinedTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\TriggerAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\ApplicationIntent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\LocalDBAPI.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlClientEncryptionType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlClientPermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlConnectionString.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlConnectionStringBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlErrorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlInfoMessageEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\TdsEnums.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\TdsParserStaticMethods.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlDbType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\INullable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLBinary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLBoolean.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLByte.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLBytes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLChars.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SqlCharStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLDateTime.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLDecimal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLDouble.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLGuid.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLInt16.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLInt32.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLInt64.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLMoney.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLResource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLSingle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLString.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLUtility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SqlXml.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\StateChangeEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\StateChangeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\StatementType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\UniqueConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\UpdateRowSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\updatestatus.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XDRSchema.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlContent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlDataLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XMLDiffLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlKeywords.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlReadMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\xmlsaver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XMLSchema.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlToDatasetMap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlWriteMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\BaseTreeIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\DataDocumentXPathNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\DataPointer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\DataSetMappper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\IXmlDataVirtualNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\RegionIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\TreeIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\XmlBoundElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\XmlDataDocument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\XmlDataImplementation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\XPathNodePointer.cs" />
+    <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.Data\bid\inc\cs\bidPrivateBase.cs" />
+    <Compile Include="..\referencesource\System.Data\Microsoft\SqlServer\Server\SqlTriggerContext.cs" />
+    <Compile Include="..\referencesource\System.Data\Misc\ExternDll.cs" />
+    <Compile Include="..\referencesource\System.Data\Misc\HResults.cs" />
+    <Compile Include="..\referencesource\System.Data\Misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\AcceptRejectRule.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\AggregateType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\BaseCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\CatalogLocation.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\CodeGen\datacache.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\CodeGen\StrongTypingException.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ColumnTypeConverter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\CommandBehavior.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\CommandType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\ActivityCorrelator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\AdapterSwitches.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\AdapterUtil.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\BigIntegerStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\BooleanStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\ByteStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\CharStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataAdapter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataColumnMapping.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataColumnMappingCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataRecordInternal.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataTableMapping.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataTableMappingCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DateTimeOffsetStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DateTimeStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBCommand.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBCommandBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBConnection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionOptions.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionPoolKey.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBConnectionString.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionStringBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionStringCommon.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbDataAdapter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBDataPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBDataPermissionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbDataReader.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\dbdatarecord.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbDataSourceEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\dbenumerator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbException.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBParameter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbParameterCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderConfigurationHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactories.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactoriesConfigurationHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactory.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderSpecificTypePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBSchemaRow.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBSchemaTable.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbTransaction.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DecimalStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DoubleStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\FieldNameLookup.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\GreenMethods.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\Groupbybehavior.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\HandlerBase.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\identifiercase.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\Int16Storage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\Int32Storage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\Int64Storage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\MultipartIdentifier.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\NameValuePair.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\NameValuePermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\NativeMethods.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\ObjectStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\RowUpdatedEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\RowUpdatingEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SafeNativeMethods.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SByteStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SchemaTableColumn.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SchemaTableOptionalColumn.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SingleStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLConvert.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLBinaryStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQlBooleanStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLBytesStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLByteStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLCharsStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLDateTimeStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLDecimalStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLDoubleStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLGuidStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLInt16Storage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLInt32Storage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLInt64Storage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLMoneyStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLSingleStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SQLStringStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SqlUDTStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SqlXmlStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\StringStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\SupportedJoinOperators.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\System.Data_BID.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\TimeSpanStorage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\UInt16Storage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\UInt32Storage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\UInt64Storage.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\UnsafeNativeMethods.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ConflictOptions.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ConnectionState.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Constraint.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ConstraintCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ConstraintConverter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ConstraintEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataColumn.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataColumnChangeEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataColumnChangeEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataColumnCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataColumnPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataError.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataException.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataKey.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRelation.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRelationCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRelationPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRow.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRowAction.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRowChangeEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRowChangeEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRowCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRowCreatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRowState.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRowVersion.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataRowView.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataSerializationFormat.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataSet.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataSetDateTime.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataSysAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTable.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTableClearEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTableClearEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTableCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTableNewRowEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTableNewRowEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTablePropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTableReader.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTableReaderListener.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataTableTypeConverter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataView.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataViewListener.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataViewManager.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataViewManagerListItemTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataViewRowState.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataViewSetting.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DataViewSettingCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DBConcurrencyException.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\dbtype.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\DefaultValueTypeConverter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\FillErrorEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\FillErrorEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\AggregateNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\BinaryNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\ConstNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\DataExpression.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\ExpressionNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\ExpressionParser.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\FilterException.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\FunctionNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\IFilter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\LookupNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\NameNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\Operators.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\UnaryNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Filter\ZeroOpNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ForeignKeyConstraint.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IColumnMapping.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IColumnMappingCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDataAdapter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDataParameter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDataParameterCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDataReader.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDataRecord.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDbCommand.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDbConnection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDbDataAdapter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDbDataParameter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IDbTransaction.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\IsolationLevel.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ITableMapping.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ITableMappingCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\LoadOption.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\MappingType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\MergeFailedEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\MergeFailedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Merger.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\MissingMappingAction.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\MissingSchemaAction.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\DbDataRecord.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\Odbc32.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcCommand.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcCommandBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionFactory.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionHandle.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionOpen.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionPoolProviderInfo.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionString.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionStringbuilder.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcDataAdapter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcDataReader.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcEnvironment.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcEnvironmentHandle.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcError.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcErrorCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcException.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcFactory.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcHandle.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcInfoMessageEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\odbcmetadatacollectionnames.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\odbcmetadatacolumnnames.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\odbcmetadatafactory.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcParameter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcParameterCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcReferenceCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcRowUpdatingEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcStatementHandle.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcTransaction.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcUtils.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\ColumnBinding.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\DBBindings.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\DBPropSet.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OLEDB_Enum.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OLEDB_Util.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbCommand.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbCommandBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbConnection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbConnectionFactory.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbConnectionInternal.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbConnectionPoolGroupProviderInfo.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\oledbconnectionstring.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OledbConnectionStringbuilder.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbDataAdapter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbDataReader.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbError.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbErrorCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbException.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbFactory.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbHResult.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbInfoMessageEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbInfoMessageEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbLiteral.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\oledbmetadatacollectionnames.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\oledbmetadatacolumnnames.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbMetaDataFactory.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbParameter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbParameterCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbPropertySetGuid.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbPropertyStatus.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbReferenceCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatedEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatingEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatingEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbSchemaGuid.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbStruct.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbTransaction.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\PropertyAttributes.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\PropertyIDSet.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\PropertyInfoSet.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\RowBinding.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\SafeHandles.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OperationAbortedException.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ParameterDirection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\PrimaryKeyTypeConverter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\PropertyCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DataReaderContainer.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbBuffer.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionClosed.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionFactory.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionInternal.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPool.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolAuthenticationContext.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolCounters.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolGroup.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolIdentity.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolOptions.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolProviderInfo.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataCollectionNames.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataColumnNames.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataFactory.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbReferenceCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\SchemaMapping.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\TimeoutTimer.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\WrappedIUnknown.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Range.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\RbTree.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\RecordManager.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\RecordsAffectedEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\RecordsAffectedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\RelatedView.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\RelationshipConverter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Rule.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SchemaSerializationMode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SchemaType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Select.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Selection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SimpleType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\IBinarySerialize.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\invalidudtexception.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlDataSourceEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlFacetAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlFunctionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlGenericUtil.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlNotificationRequest.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlProcedureAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlTriggerAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlUserDefinedAggregateAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlUserDefinedTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\TriggerAction.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\ApplicationIntent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\LocalDBAPI.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlClientEncryptionType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlClientPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlConnectionString.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlConnectionStringBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlError.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlErrorCollection.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlInfoMessageEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlUtil.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\TdsEnums.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\TdsParserStaticMethods.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlDbType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\INullable.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLBinary.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLBoolean.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLByte.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLBytes.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLChars.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlCharStream.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLDateTime.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLDecimal.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLDouble.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLGuid.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLInt16.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLInt32.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLInt64.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLMoney.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLResource.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLSingle.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLString.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SQLUtility.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlXml.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\StateChangeEvent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\StateChangeEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\StatementType.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\UniqueConstraint.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\UpdateRowSource.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\updatestatus.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\XDRSchema.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\XmlContent.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\XmlDataLoader.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\XMLDiffLoader.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\XmlKeywords.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\XmlReadMode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\xmlsaver.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\XMLSchema.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\XmlToDatasetMap.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\XmlWriteMode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\BaseTreeIterator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\DataDocumentXPathNavigator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\DataPointer.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\DataSetMappper.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\IXmlDataVirtualNode.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\RegionIterator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\TreeIterator.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\XmlBoundElement.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\XmlDataDocument.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\XmlDataImplementation.cs" />
+    <Compile Include="..\referencesource\System.Data\System\NewXml\XPathNodePointer.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Microsoft.SqlServer.Server\SqlDataRecord.cs" />
     <Compile Include="Microsoft.SqlServer.Server\SqlMetaData.cs" />
     <Compile Include="ReferenceSources\NativeOledbWrapper.cs" />
     <Compile Include="ReferenceSources\Res.cs" />
+    <Compile Include="ReferenceSources\Res.missing.cs" />
     <Compile Include="ReferenceSources\ResCategoryAttribute.cs" />
     <Compile Include="ReferenceSources\ResDescriptionAttribute.cs" />
     <Compile Include="ReferenceSources\SqlInternalConnectionTds.cs" />
@@ -500,15 +505,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs
index 8673fc48022..66c126fd520 100644
--- a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs
+++ b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs
@@ -447,7 +447,7 @@ namespace MonoTests.System.Data
 		{
 			DataTable dt = DataProvider.CreateParentDataTable();
 			dt.Constraints.Add("UniqueConstraint",dt.Columns["ParentId"],true);
-			Assert.AreEqual(1,dt.Constraints.Count,1); 
+			Assert.AreEqual(1,(double) dt.Constraints.Count,1); 
 			Assert.AreEqual("UniqueConstraint",dt.Constraints[0].ConstraintName,"CN34");			
 		}
 		
diff --git a/mcs/class/System.Data/Test/System.Data/DataRowTest.cs b/mcs/class/System.Data/Test/System.Data/DataRowTest.cs
index 5b2fd8ca9f3..e8487efaf6b 100644
--- a/mcs/class/System.Data/Test/System.Data/DataRowTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRowTest.cs
@@ -41,7 +41,7 @@ using System.Data;
 namespace MonoTests.System.Data
 {
 	[TestFixture]
-	public class DataRowTest : Assertion {
+	public class DataRowTest {
 	        private DataTable table;                                                
                 private DataRow row;    
 
@@ -101,7 +101,7 @@ namespace MonoTests.System.Data
                 private  void GetColumnErrorTest ()
                 {
                         // Print the error of a specified column.
-                        AssertEquals ("#A01", "Some error!", row.GetColumnError (1));
+                        Assert.AreEqual ("Some error!", row.GetColumnError (1), "#A01");
                 }
 
                 private void GetAllErrorsTest ()
@@ -112,7 +112,7 @@ namespace MonoTests.System.Data
                                 colArr = row.GetColumnsInError ();
                                                                                                     
                                 for (int i = 0; i < colArr.Length; i++) {
-                                        AssertEquals ("#A02", table.Columns [1], colArr [i]);
+                                        Assert.AreEqual (table.Columns [1], colArr [i], "#A02");
                                 }
                                 row.ClearErrors ();
                         }
@@ -135,7 +135,7 @@ namespace MonoTests.System.Data
                         int cnt = 1;
                         for (int i = 1; i < table.Rows.Count; i++) {
                                 DataRow r = table.Rows [i];
-                                AssertEquals ("#A03", "Name " + cnt, r ["fName"]);
+                                Assert.AreEqual ("Name " + cnt, r ["fName"], "#A03");
                                 cnt++;
                         }
                                                                                                     
@@ -146,20 +146,20 @@ namespace MonoTests.System.Data
 		        rc [2].Delete ();
                                                                                                     
                                                                                                     
-                        AssertEquals ("#A04", "Deleted", rc [0].RowState.ToString ());
-                        AssertEquals ("#A05", "Deleted", rc [2].RowState.ToString ());
+                        Assert.AreEqual ("Deleted", rc [0].RowState.ToString (), "#A04");
+                        Assert.AreEqual ("Deleted", rc [2].RowState.ToString (), "#A05");
                                                                                                     
                                                                                                     
                         // Accept changes
                         table.AcceptChanges ();
-                        AssertEquals ("#A06", "Name 1", (table.Rows [0]) [1]);
+                        Assert.AreEqual ("Name 1", (table.Rows [0]) [1], "#A06");
                         try  {
                                 object o = rc [2];
-                                Fail ("#A07");
+                                Assert.Fail ("#A07");
                         }
                         catch (Exception e) {
 				// Never premise English.
-                                //AssertEquals ("#A08", "There is no row at position 2.", e.Message);
+                                //Assert.AreEqual ("#A08", "There is no row at position 2.", e.Message);
                         }
                 }
 
@@ -179,40 +179,40 @@ namespace MonoTests.System.Data
                                                                                                     
                                 // Stage 1
                                 //Initially: After Add (Row) But Before Accept Changes");
-                                AssertEquals ("#A09", "My FName", row [1, DataRowVersion.Default]);
-                                AssertEquals ("#A10", "LName", row [2, DataRowVersion.Default]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Default], "#A09");
+                                Assert.AreEqual ("LName", row [2, DataRowVersion.Default], "#A10");
                                                                                                     
-                                AssertEquals ("#A11", "My FName", row [1, DataRowVersion.Current]);
-                                AssertEquals ("#A12", "LName", row [2, DataRowVersion.Current]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Current], "#A11");
+                                Assert.AreEqual ("LName", row [2, DataRowVersion.Current], "#A12");
                                                                                                     
                                 try {
                                       object o = row [1, DataRowVersion.Original];
                                       o = row [1, DataRowVersion.Proposed];
-                                        Fail ("#A13");
+                                        Assert.Fail ("#A13");
                                 }
                                 catch (Exception e) {
                                         if (e.GetType () != typeof (AssertionException)) {
-                                                AssertEquals ("#A14", typeof (VersionNotFoundException), e.GetType ());
+                                                Assert.AreEqual (typeof (VersionNotFoundException), e.GetType (), "#A14");
                                         }
                                 }
                                                                                                     
                                 // Stage 2
                                 //After Accept Changes
                                 table.AcceptChanges ();
-                                AssertEquals ("#A15", "My FName", row [1, DataRowVersion.Default]);
-                                AssertEquals ("#A16", "LName", row [2, DataRowVersion.Default]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Default], "#A15");
+                                Assert.AreEqual ("LName", row [2, DataRowVersion.Default], "#A16");
                                                                                                     
                                                                                                     
-                                AssertEquals ("#A17", "My FName", row [1, DataRowVersion.Current]);
-                                AssertEquals ("#A18", "LName", row [2, DataRowVersion.Current]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Current], "#A17");
+                                Assert.AreEqual ("LName", row [2, DataRowVersion.Current], "#A18");
                                 
 				try {
                                       object o = row [1, DataRowVersion.Proposed];
-                                        Fail ("#A19");
+                                        Assert.Fail ("#A19");
                                 }
                                 catch (Exception e) {
                                         if (e.GetType () != typeof (AssertionException)) {
-                                                AssertEquals ("#A20", typeof (VersionNotFoundException), e.GetType ());
+                                                Assert.AreEqual (typeof (VersionNotFoundException), e.GetType (), "#A20");
                                         }
                                 }
                                                                                                     
@@ -221,63 +221,64 @@ namespace MonoTests.System.Data
                                 table.Rows [0].BeginEdit ();
                                 table.Rows [0] ["LName"] = "My LName";
                                                                                                     
-                                AssertEquals ("#A21", "My FName", row [1, DataRowVersion.Default]);
-                                AssertEquals ("#A22", "My LName", row [2, DataRowVersion.Default]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Default], "#A21");
+                                Assert.AreEqual ("My LName", row [2, DataRowVersion.Default], "#A22");
                                                                                                                                                                                                          
-                                AssertEquals ("#A23", "My FName", row [1, DataRowVersion.Current]);
-                                AssertEquals ("#A24", "LName", row [2, DataRowVersion.Current]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Current], "#A23");
+                                Assert.AreEqual ("LName", row [2, DataRowVersion.Current], "#A24");
                                                                                                     
                                                                                                     
-                                AssertEquals ("#A25", "My FName", row [1, DataRowVersion.Original]);                                AssertEquals ("#A26", "LName", row [2, DataRowVersion.Original]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Original], "#A25");
+                                Assert.AreEqual ("LName", row [2, DataRowVersion.Original], "#A26");
                                                                                                     
-                                AssertEquals ("#A26", "My FName", row [1, DataRowVersion.Proposed]);
-	                        AssertEquals ("#A27", "My LName", row [2, DataRowVersion.Proposed]);                                                                                                    
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Proposed], "#A26");
+                                Assert.AreEqual ("My LName", row [2, DataRowVersion.Proposed], "#A27");                                                                                                    
                                                                                                     
                                                                                                     
                                 // Stage 4
                                 //After Edit sessions
                                 for (int i=0; i < table.Rows.Count;i++)
                                         table.Rows [i].EndEdit ();
-                                AssertEquals ("#A28", "My FName", row [1, DataRowVersion.Default]);
-                                AssertEquals ("#A29", "My LName", row [2, DataRowVersion.Default]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Default], "#A28");
+                                Assert.AreEqual ("My LName", row [2, DataRowVersion.Default], "#A29");
                                                                                                                                                                                                          
-                                AssertEquals ("#A30", "My FName", row [1, DataRowVersion.Original]);                                AssertEquals ("#A31", "LName", row [2, DataRowVersion.Original]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Original], "#A30");                                Assert.AreEqual ("LName", row [2, DataRowVersion.Original], "#A31");
                                                                                                     
                                                                                                     
-                                AssertEquals ("#A32", "My FName", row [1, DataRowVersion.Current]);
-                                AssertEquals ("#A33", "My LName", row [2, DataRowVersion.Current]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Current], "#A32");
+                                Assert.AreEqual ("My LName", row [2, DataRowVersion.Current], "#A33");
                                                                                                     
                                 try {
                                       object o = row [1, DataRowVersion.Proposed];
-                                        Fail ("#A34");
+                                        Assert.Fail ("#A34");
                                 }
                                 catch (Exception e) {
                                         if (e.GetType ()!=typeof (AssertionException)) {
-                                                AssertEquals ("#A35", typeof (VersionNotFoundException), e.GetType ());
+                                                Assert.AreEqual (typeof (VersionNotFoundException), e.GetType (), "#A35");
                                         }
                                 }
                                                                                                     
                                 //Stage 5
                                 //After Accept Changes
 				table.AcceptChanges ();
-				AssertEquals ("#A36", "My FName", row [1, DataRowVersion.Default]);
-                                AssertEquals ("#A37", "My LName", row [2, DataRowVersion.Default]);
+				Assert.AreEqual ("My FName", row [1, DataRowVersion.Default], "#A36");
+                                Assert.AreEqual ("My LName", row [2, DataRowVersion.Default], "#A37");
                                                                                                     
                                                                                                     
-                                AssertEquals ("#A38", "My FName", row [1, DataRowVersion.Original]);                                AssertEquals ("#A39", "My LName", row [2, DataRowVersion.Original]);                                                                                                    
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Original], "#A38");                                Assert.AreEqual (row [2, DataRowVersion.Original], "#A39", "My LName");                                                                                                    
                                                                                                     
-                                AssertEquals ("#A40", "My FName", row [1, DataRowVersion.Current]);
-                                AssertEquals ("#A41", "My LName", row [2, DataRowVersion.Current]);
+                                Assert.AreEqual ("My FName", row [1, DataRowVersion.Current], "#A40");
+                                Assert.AreEqual ("My LName", row [2, DataRowVersion.Current], "#A41");
                                                                                                     
                                                                                                     
                                 try {
                                       object o = row [1, DataRowVersion.Proposed];
-                                        Fail ("#A42");
+                                        Assert.Fail ("#A42");
                                 }
                                 catch (Exception e) {
                                                 if (e.GetType () != typeof (AssertionException)) {
-                                                        AssertEquals ("#A43", typeof (VersionNotFoundException),
-                                                                e.GetType ());
+                                                        Assert.AreEqual (typeof (VersionNotFoundException), e.GetType (),
+                                                                "#A43");
                                                 }
                                         }
                                                                                                     
@@ -328,22 +329,22 @@ namespace MonoTests.System.Data
                                                                                                     
                         rowC.SetParentRow (table.Rows [0], dr);
                                                                                                     
-                        AssertEquals ("#PRT-01", table.Rows [0], (tableC.Rows [0]).GetParentRow (dr));
-			AssertEquals ("#PRT-02", tableC.Rows [0], (table.Rows [0]).GetChildRows (dr) [0]);
+                        Assert.AreEqual (table.Rows [0], (tableC.Rows [0]).GetParentRow (dr), "#PRT-01");
+			Assert.AreEqual (tableC.Rows [0], (table.Rows [0]).GetChildRows (dr) [0], "#PRT-02");
 
                         ds.Relations.Clear ();
                         dr = new DataRelation ("PO", table.Columns ["Id"], tableC.Columns ["Id"], false);
                         ds.Relations.Add (dr);
                         rowC.SetParentRow (table.Rows [0], dr);
-                        AssertEquals ("#PRT-03", table.Rows [0], (tableC.Rows [0]).GetParentRow (dr));
-			AssertEquals ("#PRT-04", tableC.Rows [0], (table.Rows [0]).GetChildRows (dr) [0]);
+                        Assert.AreEqual (table.Rows [0], (tableC.Rows [0]).GetParentRow (dr), "#PRT-03");
+			Assert.AreEqual (tableC.Rows [0], (table.Rows [0]).GetChildRows (dr) [0], "#PRT-04");
 
                         ds.Relations.Clear ();
                         dr = new DataRelation ("PO", table.Columns ["Id"], tableC.Columns ["Id"], false);
                         tableC.ParentRelations.Add (dr);
                         rowC.SetParentRow (table.Rows [0]);
-                        AssertEquals ("#PRT-05", table.Rows [0], (tableC.Rows [0]).GetParentRow (dr));
-                        AssertEquals ("#PRT-06", tableC.Rows [0], (table.Rows [0]).GetChildRows (dr) [0]);
+                        Assert.AreEqual (table.Rows [0], (tableC.Rows [0]).GetParentRow (dr), "#PRT-05");
+                        Assert.AreEqual (tableC.Rows [0], (table.Rows [0]).GetChildRows (dr) [0], "#PRT-06");
 						
                 } 
 
@@ -377,8 +378,8 @@ namespace MonoTests.System.Data
                         rowC.SetParentRow (row, dr);
                         DataRow [] rows = rowC.GetParentRows (dr);
 
-                        AssertEquals ("#A49", 1, rows.Length);
-                        AssertEquals ("#A50", tableP.Rows [0], rows [0]);
+                        Assert.AreEqual (1, rows.Length, "#A49");
+                        Assert.AreEqual (tableP.Rows [0], rows [0], "#A50");
 
                         try{
                                 rows = row.GetParentRows (dr);
@@ -386,10 +387,10 @@ namespace MonoTests.System.Data
                                 //Test done
                                 return ;
                         }catch(Exception e){
-                                Fail("#A51, InvalidConstraintException expected, got : " + e);
+                                Assert.Fail("#A51, InvalidConstraintException expected, got : " + e);
                         }
                         
-                        Fail("#A52, InvalidConstraintException expected but got none.");
+                        Assert.Fail("#A52, InvalidConstraintException expected but got none.");
                 }
 
                 [Test]
@@ -434,8 +435,8 @@ namespace MonoTests.System.Data
                                                                                                     
                         DataRow [] rows = (table.Rows [0]).GetChildRows (dr);
 
-                        AssertEquals ("#A45", 1, rows.Length);
-                        AssertEquals ("#A46", tableC.Rows [0], rows [0]);
+                        Assert.AreEqual (1, rows.Length, "#A45");
+                        Assert.AreEqual (tableC.Rows [0], rows [0], "#A46");
                         
                 } 
 
@@ -469,8 +470,8 @@ namespace MonoTests.System.Data
                         rowC.SetParentRow (row, dr);
                         DataRow [] rows = row.GetChildRows (dr);
                         
-                        AssertEquals ("#A47", 1, rows.Length);
-                        AssertEquals ("#A48", tableC.Rows [0], rows [0]);
+                        Assert.AreEqual (1, rows.Length, "#A47");
+                        Assert.AreEqual (tableC.Rows [0], rows [0], "#A48");
 
                         try{
                             rows = rowC.GetChildRows (dr);
@@ -478,10 +479,10 @@ namespace MonoTests.System.Data
                             //Test done
                             return ;
                         }catch(Exception e){
-                            Fail("#A53, InvalidConstraintException expected, got : " + e);
+                            Assert.Fail("#A53, InvalidConstraintException expected, got : " + e);
                         }
                         
-                        Fail("#A54, InvalidConstraintException expected but got none.");
+                        Assert.Fail("#A54, InvalidConstraintException expected but got none.");
                 }
 
 		 [Category ("NotWorking")] //Mismatch in Exception namespace/class reference
@@ -528,35 +529,35 @@ namespace MonoTests.System.Data
                                 //Test Done
                                 return ;
                             }catch (Exception e){
-                                Fail ("#A55, VersionNotFoundException expected, got : " + e);
+                                Assert.Fail ("#A55, VersionNotFoundException expected, got : " + e);
                             }
-                            Fail ("#A56, VersionNotFoundException expected but got none.");
+                            Assert.Fail ("#A56, VersionNotFoundException expected but got none.");
                         }catch (Exception e){
-                            Fail ("#A57, VersionNotFoundException expected, got : " + e);
+                            Assert.Fail ("#A57, VersionNotFoundException expected, got : " + e);
                         }
                         
-                        Fail("#A58, VersionNotFoundException expected but got none.");
+                        Assert.Fail("#A58, VersionNotFoundException expected but got none.");
                 }
 
 		// tests item at row, column in table to be DBNull.Value
 		private void DBNullTest (string message, DataTable dt, int row, int column) 
 		{
 			object val = dt.Rows[row].ItemArray[column];
-			AssertEquals(message, DBNull.Value, val);
+			Assert.AreEqual(DBNull.Value, val, message);
 		}
 
 		// tests item at row, column in table to be null
 		private void NullTest (string message, DataTable dt, int row, int column) 
 		{
 			object val = dt.Rows[row].ItemArray[column];
-			AssertEquals(message, null, val);
+			Assert.AreEqual(null, val, message);
 		}
 
 		// tests item at row, column in table to be 
 		private void ValueTest (string message, DataTable dt, int row, int column, object value) 
 		{
 			object val = dt.Rows[row].ItemArray[column];
-			AssertEquals(message, value, val);
+			Assert.AreEqual(value, val, message);
 		}
 
 		// test set null, DBNull.Value, and ItemArray short count
@@ -588,7 +589,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e1) {
-				Fail("DR1: Exception Caught: " + e1);
+				Assert.Fail("DR1: Exception Caught: " + e1);
 			}
 			
 			table.Rows.Add(row);
@@ -606,7 +607,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e2) {
-				Fail("DR2: Exception Caught: " + e2);
+				Assert.Fail("DR2: Exception Caught: " + e2);
 			}
 			
 			table.Rows.Add(row);
@@ -624,7 +625,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e3) {
-				Fail("DR3: Exception Caught: " + e3);
+				Assert.Fail("DR3: Exception Caught: " + e3);
 			}
 			
 			table.Rows.Add(row);
@@ -646,7 +647,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e3) {
-				Fail("DR4: Exception Caught: " + e3);
+				Assert.Fail("DR4: Exception Caught: " + e3);
 			}
 			
 			table.Rows.Add(row);
@@ -698,7 +699,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e1) {
-				Fail("DR17: Exception Caught: " + e1);
+				Assert.Fail("DR17: Exception Caught: " + e1);
 			}
 			
 			table.Rows.Add(row);
@@ -715,7 +716,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e2) {
-				Fail("DR18: Exception Caught: " + e2);
+				Assert.Fail("DR18: Exception Caught: " + e2);
 			}
 			
 			table.Rows.Add(row);
@@ -733,7 +734,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e3) {
-				Fail("DR19: Exception Caught: " + e3);
+				Assert.Fail("DR19: Exception Caught: " + e3);
 			}
 			
 			table.Rows.Add(row);
@@ -753,7 +754,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e3) {
-				Fail("DR20: Exception Caught: " + e3);
+				Assert.Fail("DR20: Exception Caught: " + e3);
 			}
 			
 			table.Rows.Add(row);
@@ -802,7 +803,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e1) {
-				Fail("DR28:  Exception Caught: " + e1);
+				Assert.Fail("DR28:  Exception Caught: " + e1);
 			}
 			
 			table.Rows.Add(row);
@@ -819,7 +820,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e2) {
-				Fail("DR29:  Exception Caught: " + e2);
+				Assert.Fail("DR29:  Exception Caught: " + e2);
 			}
 			
 			table.Rows.Add(row);
@@ -836,7 +837,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e2) {
-				Fail("DR30: Exception Caught: " + e2);
+				Assert.Fail("DR30: Exception Caught: " + e2);
 			}
 			
 			table.Rows.Add(row);
@@ -853,7 +854,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e2) {
-				Fail("DR31: Exception Caught: " + e2);
+				Assert.Fail("DR31: Exception Caught: " + e2);
 			}
 			
 			table.Rows.Add(row);
@@ -872,7 +873,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e3) {
-				Fail("DR32: Exception Caught: " + e3);
+				Assert.Fail("DR32: Exception Caught: " + e3);
 			}
 			
 			table.Rows.Add(row);
@@ -889,7 +890,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e2) {
-				Fail("DR48: Exception Caught: " + e2);
+				Assert.Fail("DR48: Exception Caught: " + e2);
 			}
 			
 			table.Rows.Add(row);
@@ -909,7 +910,7 @@ namespace MonoTests.System.Data
 				row.ItemArray = obj;
 			}
 			catch(Exception e3) {
-				Fail("DR33: Exception Caught: " + e3);
+				Assert.Fail("DR33: Exception Caught: " + e3);
 			}
 			
 			table.Rows.Add(row);
@@ -986,7 +987,7 @@ namespace MonoTests.System.Data
 		        DataRow childRow = child.Rows.Add(new object[] { id });
 		        if (parentRow == childRow.GetParentRow(relateParentChild)) {
 		            foreach(DataColumn dc in parent.Columns)
-				AssertEquals(100,parentRow[dc]);
+				Assert.AreEqual(100,parentRow[dc]);
 		            
 		        }
 		            		
@@ -1002,9 +1003,9 @@ namespace MonoTests.System.Data
 			dt.Rows.Add ((new object [] {"val"}));
 
 			DataRow dr = dt.NewRow ();
-			AssertEquals (DataRowState.Detached, dr.RowState);
+			Assert.AreEqual (DataRowState.Detached, dr.RowState);
 			dr.CancelEdit ();
-			AssertEquals (DataRowState.Detached, dr.RowState);
+			Assert.AreEqual (DataRowState.Detached, dr.RowState);
 			object o = dr ["col"];
 		}
 
@@ -1056,20 +1057,20 @@ namespace MonoTests.System.Data
 			parent2.Rows.Add(parent2Row);
 
 			childRow1.SetParentRow(parent1Row);
-			AssertEquals ("p1c1", childRow1[childColumn1]);
-			AssertEquals (DBNull.Value, childRow1[childColumn2]);
+			Assert.AreEqual ("p1c1", childRow1[childColumn1]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn2]);
 
 			childRow1.SetParentRow(parent2Row);
-			AssertEquals ("p1c1", childRow1[childColumn1]);
-			AssertEquals ("p2c2", childRow1[childColumn2]);
+			Assert.AreEqual ("p1c1", childRow1[childColumn1]);
+			Assert.AreEqual ("p2c2", childRow1[childColumn2]);
 
 			childRow1.SetParentRow(null);
-			AssertEquals (DBNull.Value, childRow1[childColumn1]);
-			AssertEquals (DBNull.Value, childRow1[childColumn2]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn1]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn2]);
 
 			childRow1.SetParentRow(parent2Row);
-			AssertEquals (DBNull.Value, childRow1[childColumn1]);
-			AssertEquals ("p2c2", childRow1[childColumn2]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn1]);
+			Assert.AreEqual ("p2c2", childRow1[childColumn2]);
 		}
 
 		[Test]
@@ -1108,29 +1109,29 @@ namespace MonoTests.System.Data
 
 
 			childRow1.SetParentRow (null, relation2);
-			AssertEquals (DBNull.Value, childRow1[childColumn1]);
-			AssertEquals (DBNull.Value, childRow1[childColumn2]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn1]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn2]);
 
 			try {
 				childRow1.SetParentRow(parent1Row, relation2);
-				Fail ("Must throw InvalidConstaintException");
+				Assert.Fail ("Must throw InvalidConstaintException");
 			} catch (InvalidConstraintException e) {
 			}
-			AssertEquals (DBNull.Value, childRow1[childColumn1]);
-			AssertEquals (DBNull.Value, childRow1[childColumn2]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn1]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn2]);
 
 			childRow1.SetParentRow(parent1Row, relation1);
-			AssertEquals ("p1c1", childRow1[childColumn1]);
-			AssertEquals (DBNull.Value, childRow1[childColumn2]);
+			Assert.AreEqual ("p1c1", childRow1[childColumn1]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn2]);
 
 
 			childRow1.SetParentRow (null, relation2);
-			AssertEquals ("p1c1", childRow1[childColumn1]);
-			AssertEquals (DBNull.Value, childRow1[childColumn2]);
+			Assert.AreEqual ("p1c1", childRow1[childColumn1]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn2]);
 
 			childRow1.SetParentRow (null, relation1);
-			AssertEquals (DBNull.Value, childRow1[childColumn1]);
-			AssertEquals (DBNull.Value, childRow1[childColumn2]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn1]);
+			Assert.AreEqual (DBNull.Value, childRow1[childColumn2]);
 		}
 
 		[Test]
@@ -1161,8 +1162,8 @@ namespace MonoTests.System.Data
 			parent2.Rows.Add(parentRow);
 
 			childRow.SetParentRow(parentRow);
-			AssertEquals (DBNull.Value, childRow[childColumn1]);
-			AssertEquals ("value", childRow[childColumn2]);
+			Assert.AreEqual (DBNull.Value, childRow[childColumn1]);
+			Assert.AreEqual ("value", childRow[childColumn2]);
 		}
 
 	}
diff --git a/mcs/class/System.Data/Test/System.Data/DataRowViewTest.cs b/mcs/class/System.Data/Test/System.Data/DataRowViewTest.cs
index 51885f37bcb..60dbb9d3933 100644
--- a/mcs/class/System.Data/Test/System.Data/DataRowViewTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRowViewTest.cs
@@ -36,7 +36,7 @@ using System.ComponentModel;
 namespace MonoTests.System.Data
 {
 	[TestFixture]
-	public class DataRowViewTest : Assertion
+	public class DataRowViewTest 
 	{
 		private DataView CreateTestView ()
 		{
@@ -96,8 +96,8 @@ namespace MonoTests.System.Data
 			DataView dv = new DataView (dt1);
 			DataRowView dvr = dv [0];
 			DataView v = dvr.CreateChildView (dr);
-			AssertEquals ("RowFilter", "", v.RowFilter);
-			AssertEquals ("Sort", "", v.Sort);
+			Assert.AreEqual ("", v.RowFilter, "RowFilter");
+			Assert.AreEqual ("", v.Sort, "Sort");
 		}
 
 		[Test]
@@ -110,12 +110,12 @@ namespace MonoTests.System.Data
 			DataView dv = new DataView (dt);
 			DataRowView drv = dv [0];
 			dt.Rows [0].BeginEdit ();
-			AssertEquals ("DataView.Item", true, drv.IsEdit);
+			Assert.AreEqual (true, drv.IsEdit, "DataView.Item");
 
 			drv = dv.AddNew ();
 			drv.Row ["col"] = "test";
 			drv.Row.CancelEdit ();
-			AssertEquals ("AddNew", false, drv.IsEdit);
+			Assert.AreEqual (false, drv.IsEdit, "AddNew");
 		}
 
 		[Test]
@@ -127,7 +127,7 @@ namespace MonoTests.System.Data
 			DataView dv = new DataView (dt);
 			DataRowView drv = dv [0];
 			dt.Rows [0].BeginEdit ();
-			AssertEquals ("DataView.Item", "val", drv ["col"]);
+			Assert.AreEqual ("val", drv ["col"], "DataView.Item");
 		}
 
 		[Test]
@@ -153,18 +153,18 @@ namespace MonoTests.System.Data
 			dt.Rows.Add (new object [] {1});
 			DataView dv = new DataView (dt);
 			DataRowView drv = dv.AddNew ();
-			AssertEquals (DataRowVersion.Current, drv.RowVersion);
-			AssertEquals (DataRowVersion.Current, dv [0].RowVersion);
+			Assert.AreEqual (DataRowVersion.Current, drv.RowVersion);
+			Assert.AreEqual (DataRowVersion.Current, dv [0].RowVersion);
 			drv ["col"] = "mod";
-			AssertEquals (DataRowVersion.Current, drv.RowVersion);
-			AssertEquals (DataRowVersion.Current, dv [0].RowVersion);
+			Assert.AreEqual (DataRowVersion.Current, drv.RowVersion);
+			Assert.AreEqual (DataRowVersion.Current, dv [0].RowVersion);
 			dt.AcceptChanges ();
-			AssertEquals (DataRowVersion.Current, drv.RowVersion);
-			AssertEquals (DataRowVersion.Current, dv [0].RowVersion);
+			Assert.AreEqual (DataRowVersion.Current, drv.RowVersion);
+			Assert.AreEqual (DataRowVersion.Current, dv [0].RowVersion);
 			drv.EndEdit ();
 			dv [0].EndEdit ();
-			AssertEquals (DataRowVersion.Current, drv.RowVersion);
-			AssertEquals (DataRowVersion.Current, dv [0].RowVersion);
+			Assert.AreEqual (DataRowVersion.Current, drv.RowVersion);
+			Assert.AreEqual (DataRowVersion.Current, dv [0].RowVersion);
 		}
 	}
 }
diff --git a/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest.cs
index 05d0eddc7fb..bf34b01d1c6 100644
--- a/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest.cs
@@ -37,7 +37,7 @@ namespace MonoTests.System.Data
 {
 
 	[TestFixture]
-	public class DataTableCollectionTest : Assertion {
+	public class DataTableCollectionTest {
 		// common variables here
 		private DataSet [] _dataset;
 		private DataTable [] _tables;
@@ -76,11 +76,11 @@ namespace MonoTests.System.Data
 			
 			foreach( DataTable table in tbcol )
    			{
-				AssertEquals("test#1",_tables[i].TableName,table.TableName);
+				Assert.AreEqual(_tables[i].TableName,table.TableName,"test#1");
 				j=0;
        			foreach( DataColumn column in table.Columns )
        			{
-					AssertEquals("test#2",_tables[i].Columns[j].ColumnName,column.ColumnName);
+					Assert.AreEqual(_tables[i].Columns[j].ColumnName,column.ColumnName,"test#2");
 					j++;
        			}
 				i++;
@@ -90,11 +90,11 @@ namespace MonoTests.System.Data
 			i=0;
 			foreach( DataTable table in tbcol )
    			{
-				AssertEquals("test#3",_tables[i].TableName,table.TableName);
+				Assert.AreEqual(_tables[i].TableName,table.TableName,"test#3");
 				j=0;
        			foreach( DataColumn column in table.Columns )
        			{
-					AssertEquals("test#4",_tables[i].Columns[j].ColumnName,column.ColumnName);
+					Assert.AreEqual(_tables[i].Columns[j].ColumnName,column.ColumnName,"test#4");
 					j++;
        			}
 				i++;
@@ -143,9 +143,9 @@ namespace MonoTests.System.Data
 		{
 			DataTableCollection tbcol = _dataset[0].Tables;
 			tbcol.Add(_tables[0]);
-			AssertEquals("test#1",1, tbcol.Count);
+			Assert.AreEqual(1,tbcol.Count, "test#1");
 			tbcol.Add(_tables[1]);
-			AssertEquals("test#2",2, tbcol.Count);
+			Assert.AreEqual(2,tbcol.Count, "test#2");
 		}
 		
 		[Test]
@@ -159,11 +159,11 @@ namespace MonoTests.System.Data
 			i=0;
 			foreach( DataTable table in tbcol )
    			{
-				AssertEquals("test#1",_tables[i].TableName,table.TableName);
+				Assert.AreEqual(_tables[i].TableName,table.TableName,"test#1");
 				j=0;
        			foreach( DataColumn column in table.Columns )
        			{
-					AssertEquals("test#2",_tables[i].Columns[j].ColumnName,column.ColumnName);
+					Assert.AreEqual(_tables[i].Columns[j].ColumnName,column.ColumnName,"test#2");
 					j++;
        			}
 				i++;
@@ -179,11 +179,11 @@ namespace MonoTests.System.Data
 			tbcol.AddRange(_tables);
 			DataTable tbl = null;
 			/* checking for a recently input table, expecting true */
-			AssertEquals("test#1",true,tbcol.CanRemove(_tables[0]));
+			Assert.AreEqual(true,tbcol.CanRemove(_tables[0]),"test#1");
 			/* trying to check with a null reference, expecting false */
-			AssertEquals("test#2",false,tbcol.CanRemove(tbl));
+			Assert.AreEqual(false,tbcol.CanRemove(tbl),"test#2");
 			/* trying to check with a table that does not exist in collection, expecting false */
-			AssertEquals("test#3",false,tbcol.CanRemove(new DataTable("newTable")));
+			Assert.AreEqual(false,tbcol.CanRemove(new DataTable("newTable")),"test#3");
 		}
 		
 		[Test]
@@ -197,27 +197,27 @@ namespace MonoTests.System.Data
 			/* removing a recently added table */
 			int count = tbcol.Count;
 			tbcol.Remove(_tables[0]);
-			AssertEquals("test#1",count-1,tbcol.Count);
+			Assert.AreEqual(count-1,tbcol.Count,"test#1");
 			DataTable tbl = null;
 			/* removing a null reference. must generate an Exception */
 			try
 			{
 				tbcol.Remove(tbl);
-				Fail("Err:: tbcol.Rmove(null) must fail");
+				Assert.Fail("Err:: tbcol.Rmove(null) must fail");
 			}
 			catch(Exception e)
 			{
-				AssertEquals ("test#2", typeof (ArgumentNullException), e.GetType());
+				Assert.AreEqual (typeof (ArgumentNullException), e.GetType(), "test#2");
 			}
 			/* removing a table that is not there in collection */
 			try
 			{
 				tbcol.Remove(new DataTable("newTable"));
-				Fail("Err:: cannot remove a table that is not there in collection");
+				Assert.Fail("Err:: cannot remove a table that is not there in collection");
 			}
 			catch(Exception e)
 			{
-				AssertEquals ("test#3", typeof (ArgumentException), e.GetType());
+				Assert.AreEqual (typeof (ArgumentException), e.GetType(), "test#3");
 			}
 			
 		}
@@ -227,11 +227,11 @@ namespace MonoTests.System.Data
 			DataTableCollection tbcol = _dataset[0].Tables;
 			tbcol.Add(_tables[0]);
 			tbcol.Clear();
-			AssertEquals("Test#1",0,tbcol.Count);
+			Assert.AreEqual(0,tbcol.Count,"Test#1");
 			
 			tbcol.AddRange(new DataTable[] {_tables[0],_tables[1]});
 			tbcol.Clear();
-			AssertEquals("Test#2",0,tbcol.Count);
+			Assert.AreEqual(0,tbcol.Count,"Test#2");
 		}
 		[Test]
 		public void Contains()
@@ -242,11 +242,11 @@ namespace MonoTests.System.Data
 			tbcol.AddRange(_tables);
 			string tblname = "";
 			/* checking for a recently input table, expecting true */
-			AssertEquals("test#1",true,tbcol.Contains(_tables[0].TableName));
+			Assert.AreEqual(true,tbcol.Contains(_tables[0].TableName),"test#1");
 			/* trying to check with a empty string, expecting false */
-			AssertEquals("test#2",false,tbcol.Contains(tblname));
+			Assert.AreEqual(false,tbcol.Contains(tblname),"test#2");
 			/* trying to check for a table that donot exist, expecting false */
-			AssertEquals("test#3",false,tbcol.Contains("InvalidTableName"));
+			Assert.AreEqual(false,tbcol.Contains("InvalidTableName"),"test#3");
 		}
 		
 		[Test]
@@ -261,21 +261,21 @@ namespace MonoTests.System.Data
 			DataTable [] array = new DataTable[4];
 			/* copying to the beginning of the array */
 			tbcol.CopyTo(array,0);
-			AssertEquals ("test#01", 4, array.Length);
-			AssertEquals ("test#02", "Table1", array[0].TableName);
-			AssertEquals ("test#03", "Table2", array[1].TableName);
-			AssertEquals ("test#04", "Table3", array[2].TableName);
-			AssertEquals ("test#05", "Table4", array[3].TableName);
+			Assert.AreEqual (4, array.Length, "test#01");
+			Assert.AreEqual ("Table1", array[0].TableName, "test#02");
+			Assert.AreEqual ("Table2", array[1].TableName, "test#03");
+			Assert.AreEqual ("Table3", array[2].TableName, "test#04");
+			Assert.AreEqual ("Table4", array[3].TableName, "test#05");
 
 			/* copying with in a array */
 			DataTable [] array1 = new DataTable[6];
 			tbcol.CopyTo(array1,2);
-			AssertEquals("test#06",null,array1[0]);
-			AssertEquals("test#07",null,array1[1]);
-			AssertEquals("test#08","Table1",array1[2].TableName);
-			AssertEquals("test#09","Table2",array1[3].TableName);
-			AssertEquals("test#10","Table3",array1[4].TableName);
-			AssertEquals("test#11","Table4",array1[5].TableName);			
+			Assert.AreEqual(null,array1[0],"test#06");
+			Assert.AreEqual(null,array1[1],"test#07");
+			Assert.AreEqual("Table1",array1[2].TableName,"test#08");
+			Assert.AreEqual("Table2",array1[3].TableName,"test#09");
+			Assert.AreEqual("Table3",array1[4].TableName,"test#10");
+			Assert.AreEqual("Table4",array1[5].TableName,"test#11");			
 		}
 		[Test]
 		public void Equals()
@@ -287,16 +287,16 @@ namespace MonoTests.System.Data
 			tbcol2.Add(_tables[1]);
 			tbcol3 = tbcol1;
 			
-			AssertEquals("test#1",true,tbcol1.Equals(tbcol1));
-			AssertEquals("test#2",true,tbcol1.Equals(tbcol3));
-			AssertEquals("test#3",true,tbcol3.Equals(tbcol1));
+			Assert.AreEqual(true,tbcol1.Equals(tbcol1),"test#1");
+			Assert.AreEqual(true,tbcol1.Equals(tbcol3),"test#2");
+			Assert.AreEqual(true,tbcol3.Equals(tbcol1),"test#3");
 			
-			AssertEquals("test#4",false,tbcol1.Equals(tbcol2));
-			AssertEquals("test#5",false,tbcol2.Equals(tbcol1));
+			Assert.AreEqual(false,tbcol1.Equals(tbcol2),"test#4");
+			Assert.AreEqual(false,tbcol2.Equals(tbcol1),"test#5");
 			
-			AssertEquals("test#6",true,Object.Equals(tbcol1,tbcol3));
-			AssertEquals("test#7",true,Object.Equals(tbcol1,tbcol1));
-			AssertEquals("test#8",false,Object.Equals(tbcol1,tbcol2));
+			Assert.AreEqual(true,Object.Equals(tbcol1,tbcol3),"test#6");
+			Assert.AreEqual(true,Object.Equals(tbcol1,tbcol1),"test#7");
+			Assert.AreEqual(false,Object.Equals(tbcol1,tbcol2),"test#8");
 		}
 		[Test]
 		public void IndexOf()
@@ -306,16 +306,16 @@ namespace MonoTests.System.Data
 			tbcol.Add("table1");
 			tbcol.Add("table2");
 			
-			AssertEquals("test#1",0,tbcol.IndexOf(_tables[0]));
-			AssertEquals("test#2",-1,tbcol.IndexOf(_tables[1]));
-			AssertEquals("test#3",1,tbcol.IndexOf("table1"));
-			AssertEquals("test#4",2,tbcol.IndexOf("table2"));
+			Assert.AreEqual(0,tbcol.IndexOf(_tables[0]),"test#1");
+			Assert.AreEqual(-1,tbcol.IndexOf(_tables[1]),"test#2");
+			Assert.AreEqual(1,tbcol.IndexOf("table1"),"test#3");
+			Assert.AreEqual(2,tbcol.IndexOf("table2"),"test#4");
 			
-			AssertEquals("test#5",0,tbcol.IndexOf(tbcol[0]));
-			AssertEquals("test#6",1,tbcol.IndexOf(tbcol[1]));
-			AssertEquals("test#7",-1,tbcol.IndexOf("_noTable_"));
+			Assert.AreEqual(0,tbcol.IndexOf(tbcol[0]),"test#5");
+			Assert.AreEqual(1,tbcol.IndexOf(tbcol[1]),"test#6");
+			Assert.AreEqual(-1,tbcol.IndexOf("_noTable_"),"test#7");
 			DataTable tb = new DataTable("new_table");
-			AssertEquals("test#8",-1,tbcol.IndexOf(tb));
+			Assert.AreEqual(-1,tbcol.IndexOf(tb),"test#8");
 			
 		}
 		[Test]
@@ -328,7 +328,7 @@ namespace MonoTests.System.Data
 			try
 			{
 				tbcol.RemoveAt(-1);
-				Fail("the index was out of bound: must have failed");
+				Assert.Fail("the index was out of bound: must have failed");
 			}
 			catch(IndexOutOfRangeException e)
 			{
@@ -336,15 +336,15 @@ namespace MonoTests.System.Data
 			try
 			{
 				tbcol.RemoveAt(101);
-				Fail("the index was out of bound: must have failed");
+				Assert.Fail("the index was out of bound: must have failed");
 			}
 			catch(IndexOutOfRangeException e)
 			{
 			}
 			tbcol.RemoveAt (1);
-			AssertEquals ("test#5", 1, tbcol.Count);
+			Assert.AreEqual (1, tbcol.Count, "test#5");
 			tbcol.RemoveAt (0);
-			AssertEquals ("test#6", 0, tbcol.Count);
+			Assert.AreEqual (0, tbcol.Count, "test#6");
 		}
 
 		[Test]
@@ -354,46 +354,46 @@ namespace MonoTests.System.Data
 			tbcol.Add("Table1");
 			tbcol.Add("Table2");
 			tbcol.Add("Table3");
-			AssertEquals("test#1","System.Data.DataTableCollection",tbcol.ToString());
+			Assert.AreEqual("System.Data.DataTableCollection",tbcol.ToString(),"test#1");
 		}
 
 		[Test]
 		public void TableDataSetNamespaces ()
 		{
 			DataTable dt = new DataTable ("dt1");
-			AssertEquals ("#1-1", String.Empty, dt.Namespace);
-			AssertNull ("#1-2", dt.DataSet);
+			Assert.AreEqual (String.Empty, dt.Namespace, "#1-1");
+			Assert.IsNull (dt.DataSet, "#1-2");
 
 			DataSet ds1 = new DataSet ("ds1");
 			ds1.Tables.Add (dt);
-			AssertEquals ("#2-1", String.Empty, dt.Namespace);
-			AssertEquals ("#2-2", ds1, dt.DataSet);
+			Assert.AreEqual (String.Empty, dt.Namespace, "#2-1");
+			Assert.AreEqual (ds1, dt.DataSet, "#2-2");
 
 			ds1.Namespace = "ns1";
-			AssertEquals ("#3", "ns1", dt.Namespace);
+			Assert.AreEqual ("ns1", dt.Namespace, "#3");
 
 			// back to null again
 			ds1.Tables.Remove (dt);
-			AssertEquals ("#4-1", String.Empty, dt.Namespace);
-			AssertNull ("#4-2", dt.DataSet);
+			Assert.AreEqual (String.Empty, dt.Namespace, "#4-1");
+			Assert.IsNull (dt.DataSet, "#4-2");
 
 			// This table is being added to _already namespaced_
 			// dataset.
 			dt = new DataTable ("dt2");
 
 			ds1.Tables.Add (dt);
-			AssertEquals ("#5-1", "ns1", dt.Namespace);
-			AssertEquals ("#5-2", ds1, dt.DataSet);
+			Assert.AreEqual ("ns1", dt.Namespace, "#5-1");
+			Assert.AreEqual (ds1, dt.DataSet, "#5-2");
 
 			ds1.Tables.Remove (dt);
-			AssertEquals ("#6-1", String.Empty, dt.Namespace);
-			AssertNull ("#6-2", dt.DataSet);
+			Assert.AreEqual (String.Empty, dt.Namespace, "#6-1");
+			Assert.IsNull (dt.DataSet, "#6-2");
 
 			DataSet ds2 = new DataSet ("ds2");
 			ds2.Namespace = "ns2";
 			ds2.Tables.Add (dt);
-			AssertEquals ("#7-1", "ns2", dt.Namespace);
-			AssertEquals ("#7-2", ds2, dt.DataSet);
+			Assert.AreEqual ("ns2", dt.Namespace, "#7-1");
+			Assert.AreEqual (ds2, dt.DataSet, "#7-2");
 		}
 	}
 }
diff --git a/mcs/class/System.Data/Test/System.Data/DataViewManagerTest.cs b/mcs/class/System.Data/Test/System.Data/DataViewManagerTest.cs
index 57b5eb30846..392f9b0d4f4 100644
--- a/mcs/class/System.Data/Test/System.Data/DataViewManagerTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataViewManagerTest.cs
@@ -36,7 +36,7 @@ using System.ComponentModel;
 namespace MonoTests.System.Data
 {
 	[TestFixture]
-	public class DataViewManagerTest : Assertion
+	public class DataViewManagerTest 
 	{
 		[Test]
 		public void Ctor ()
@@ -46,40 +46,40 @@ namespace MonoTests.System.Data
 			string deleted = @"<DataViewSettingCollectionString><table2-1 Sort="""" RowFilter="""" RowStateFilter=""Deleted""/></DataViewSettingCollectionString>";
 
 			DataViewManager m = new DataViewManager (null);
-			AssertNull (m.DataSet);
-			AssertEquals ("", m.DataViewSettingCollectionString);
-			AssertNotNull (m.DataViewSettings);
+			Assert.IsNull (m.DataSet);
+			Assert.AreEqual ("", m.DataViewSettingCollectionString);
+			Assert.IsNotNull (m.DataViewSettings);
 			DataSet ds = new DataSet ("ds");
 			m.DataSet = ds;
-			AssertEquals ("default#1", defaultString,
-				m.DataViewSettingCollectionString);
+			Assert.AreEqual (defaultString, m.DataViewSettingCollectionString,
+				"default#1");
 
 			DataSet ds2 = new DataSet ("ds2");
-			AssertEquals ("default#2", defaultString,
-				ds.DefaultViewManager.DataViewSettingCollectionString);
+			Assert.AreEqual (defaultString, ds.DefaultViewManager.DataViewSettingCollectionString,
+				"default#2");
 			DataTable dt2_1 = new DataTable ("table2-1");
 			dt2_1.Namespace ="urn:foo"; // It is ignored though.
 			ds2.Tables.Add (dt2_1);
 			m.DataSet = ds2;
-			AssertEquals ("#3", current, m.DataViewSettingCollectionString);
+			Assert.AreEqual (current, m.DataViewSettingCollectionString, "#3");
 
 			// Note that " Deleted " is trimmed.
 			m.DataViewSettingCollectionString = @"<DataViewSettingCollectionString><table2-1 Sort='' RowFilter='' RowStateFilter=' Deleted '/></DataViewSettingCollectionString>";
-			AssertEquals ("#4", deleted, m.DataViewSettingCollectionString);
+			Assert.AreEqual (deleted, m.DataViewSettingCollectionString, "#4");
 
 			m.DataSet = ds2; //resets modified string.
-			AssertEquals ("#5", current, m.DataViewSettingCollectionString);
+			Assert.AreEqual (current, m.DataViewSettingCollectionString, "#5");
 
 			m.DataViewSettingCollectionString = @"<DataViewSettingCollectionString><table2-1 Sort='' RowFilter='' RowStateFilter='Deleted'/></DataViewSettingCollectionString>";
 			// it does not clear anything.
 			m.DataViewSettingCollectionString = "<DataViewSettingCollectionString/>";
-			AssertEquals ("#6", deleted, m.DataViewSettingCollectionString);
+			Assert.AreEqual (deleted, m.DataViewSettingCollectionString, "#6");
 
 			// text node is not rejected (ignored).
 			// RowFilter is not examined.
 			m.DataViewSettingCollectionString = "<DataViewSettingCollectionString>blah<table2-1 RowFilter='a=b' ApplyDefaultSort='true' /></DataViewSettingCollectionString>";
 			// LAMESPEC: MS.NET ignores ApplyDefaultSort.
-//			AssertEquals ("#7", @"<DataViewSettingCollectionString><table2-1 Sort="""" RowFilter=""a=b"" RowStateFilter=""Deleted""/></DataViewSettingCollectionString>", m.DataViewSettingCollectionString);
+//			Assert.AreEqual (@"<DataViewSettingCollectionString><table2-1 Sort="""" RowFilter=""a=b"" RowStateFilter=""Deleted""/></DataViewSettingCollectionString>", m.DataViewSettingCollectionString, "#7");
 		}
 
 		[Test]
diff --git a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
index 4be1824f667..8829819a450 100644
--- a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
@@ -42,7 +42,7 @@ using System.IO;
 namespace MonoTests.System.Data
 {
 	[TestFixture]
-	public class DataViewTest : Assertion
+	public class DataViewTest
 	{
 		DataTable dataTable;
 		DataView  dataView;
@@ -145,7 +145,7 @@ namespace MonoTests.System.Data
 			dv.Sort = "abc";
 			dv.Sort = string.Empty;
 			dv.Sort = "abc";
-			AssertEquals ("test#01", "abc", dv.Sort);
+			Assert.AreEqual ("abc", dv.Sort, "test#01");
 		}
 
 		[Test]
@@ -154,24 +154,24 @@ namespace MonoTests.System.Data
 			DataView dv1,dv2,dv3;
 			dv1 = new DataView ();
 			// AssertEquals ("test#01",null,dv1.Table);
-			AssertEquals ("test#02",true,dv1.AllowNew);
-			AssertEquals ("test#03",true,dv1.AllowEdit);
-			AssertEquals ("test#04",true,dv1.AllowDelete);
-			AssertEquals ("test#05",false,dv1.ApplyDefaultSort);
-			AssertEquals ("test#06",string.Empty,dv1.RowFilter);
-			AssertEquals ("test#07",DataViewRowState.CurrentRows,dv1.RowStateFilter);
-			AssertEquals ("test#08",string.Empty,dv1.Sort);
+			Assert.AreEqual (true,dv1.AllowNew,"test#02");;
+			Assert.AreEqual (true,dv1.AllowEdit,"test#03");;
+			Assert.AreEqual (true,dv1.AllowDelete,"test#04");;
+			Assert.AreEqual (false,dv1.ApplyDefaultSort,"test#05");;
+			Assert.AreEqual (string.Empty,dv1.RowFilter,"test#06");;
+			Assert.AreEqual (DataViewRowState.CurrentRows,dv1.RowStateFilter,"test#07");;
+			Assert.AreEqual (string.Empty,dv1.Sort,"test#08");;
 			
 			dv2 = new DataView (dataTable);
-			AssertEquals ("test#09","itemTable",dv2.Table.TableName);
-			AssertEquals ("test#10",string.Empty,dv2.Sort);
-			AssertEquals ("test#11",false,dv2.ApplyDefaultSort);
-			AssertEquals ("test#12",dataTable.Rows[0],dv2[0].Row);
+			Assert.AreEqual ("itemTable",dv2.Table.TableName,"test#09");;
+			Assert.AreEqual (string.Empty,dv2.Sort,"test#10");;
+			Assert.AreEqual (false,dv2.ApplyDefaultSort,"test#11");;
+			Assert.AreEqual (dataTable.Rows[0],dv2[0].Row,"test#12");;
 			
 			dv3 = new DataView (dataTable,"","itemId DESC",DataViewRowState.CurrentRows);
-			AssertEquals ("test#13","",dv3.RowFilter);
-			AssertEquals ("test#14","itemId DESC",dv3.Sort);
-			AssertEquals ("test#15",DataViewRowState.CurrentRows,dv3.RowStateFilter);
+			Assert.AreEqual ("",dv3.RowFilter,"test#13");;
+			Assert.AreEqual ("itemId DESC",dv3.Sort,"test#14");;
+			Assert.AreEqual (DataViewRowState.CurrentRows,dv3.RowStateFilter,"test#15");;
 			//AssertEquals ("test#16",dataTable.Rows.[(dataTable.Rows.Count-1)],dv3[0]);
 		}
 
@@ -179,20 +179,20 @@ namespace MonoTests.System.Data
 		 public void TestValue ()
 		 {
 			DataView TestView = new DataView (dataTable);
-			Assertion.AssertEquals ("Dv #1", "item 1", TestView [0]["itemId"]);
+			Assert.AreEqual ("item 1", TestView [0]["itemId"], "Dv #1");
 		 }
 
 		 [Test]
 		 public void TestCount ()
 		 {
 			DataView TestView = new DataView (dataTable);
-			Assertion.AssertEquals ("Dv #3", 5, TestView.Count);
+			Assert.AreEqual (5, TestView.Count, "Dv #3");
 		 }
 
 		[Test]
 		public void AllowNew ()
 		{
-			AssertEquals ("test#01",true,dataView.AllowNew);
+			Assert.AreEqual (true, dataView.AllowNew, "test#01");
 		}
 
 		[Test]
@@ -203,7 +203,7 @@ namespace MonoTests.System.Data
 			dataView.ApplyDefaultSort = true;
 			// dataView.Sort = "itemName";
 			// AssertEquals ("test#01","item 1",dataView[0]["itemId"]);
-			AssertEquals ("test#02",ListChangedType.Reset,listChangedArgs.ListChangedType);
+			Assert.AreEqual (ListChangedType.Reset,listChangedArgs.ListChangedType, "test#02");
 			// UnComment the line below to see if dataView is sorted
 			//   PrintTableOrView (dataView,"* OnApplyDefaultSort");
 		}
@@ -212,7 +212,7 @@ namespace MonoTests.System.Data
 		public void RowStateFilter ()
 		{
 			dataView.RowStateFilter = DataViewRowState.Deleted;
-			AssertEquals ("test#01",ListChangedType.Reset,listChangedArgs.ListChangedType);
+			Assert.AreEqual (ListChangedType.Reset,listChangedArgs.ListChangedType, "test#01");
 		}
 
 		[Test]
@@ -239,16 +239,16 @@ namespace MonoTests.System.Data
 			dataView [0] ["col1"] = -1;
 			dataView.RowStateFilter = DataViewRowState.ModifiedOriginal;
 			v = dataView [0] [0].ToString ();
-			AssertEquals ("ModifiedOriginal.Count", 1, dataView.Count);
-			AssertEquals ("ModifiedOriginal.Value", "1", v);
+			Assert.AreEqual (1, dataView.Count, "ModifiedOriginal.Count");
+			Assert.AreEqual ("1", v, "ModifiedOriginal.Value");
 
 			// Deleting the row
 			dataView.Delete (0);
 			dataView.RowStateFilter = DataViewRowState.Deleted;
 
 			v = dataView [0] [0].ToString ();
-			AssertEquals ("Deleted.Count", 1, dataView.Count);
-			AssertEquals ("Deleted.Value", "1", v);
+			Assert.AreEqual (1, dataView.Count, "Deleted.Count");
+			Assert.AreEqual ("1", v, "Deleted.Value");
 		}
 
 		//xamarin bug #18898 # / novell bug #595899
@@ -276,10 +276,10 @@ namespace MonoTests.System.Data
 			another_new_row[0] = "9";
 			another_new_row[1] = "10";
 
-			AssertEquals ("#1", dv[2][0], "9");
+			Assert.AreEqual (dv[2][0], "9", "#1");
 
 			//This should not throw a System.Data.VersionNotFoundException: "There is no Proposed data to accces"
-			AssertEquals ("#1", dv[1][0], "7");	
+			Assert.AreEqual (dv[1][0], "7", "#1");	
 
 		}
 
@@ -288,7 +288,7 @@ namespace MonoTests.System.Data
 		{
 			DataView dataview = new DataView ();
 			PropertyDescriptorCollection col = ((ITypedList)dataview).GetItemProperties (null);
-			AssertEquals ("1", 0, col.Count);
+			Assert.AreEqual (0, col.Count, "1");
 		}
 
 		#region Sort Tests
@@ -296,7 +296,7 @@ namespace MonoTests.System.Data
 		public void SortListChangedTest ()
 		{
 			dataView.Sort = "itemName DESC";
-			AssertEquals ("test#01",ListChangedType.Reset,listChangedArgs.ListChangedType);
+			Assert.AreEqual (ListChangedType.Reset,listChangedArgs.ListChangedType, "test#01");
 			// UnComment the line below to see if dataView is sorted
 			// PrintTableOrView (dataView);
 		}
@@ -338,60 +338,60 @@ namespace MonoTests.System.Data
 			DataView dataView = dataTable.DefaultView;
 
 			string s = "Default sorting: ";
-			AssertEquals (s + "First entry has wrong item", 1, dataView[0][0]);
-			AssertEquals (s + "Second entry has wrong item", 0, dataView[1][0]);
-			AssertEquals (s + "Third entry has wrong item", 3, dataView[2][0]);
-			AssertEquals (s + "Fourth entry has wrong item", 2, dataView[3][0]);
+			Assert.AreEqual (1, dataView[0][0], s + "First entry has wrong item");
+			Assert.AreEqual (0, dataView[1][0], s + "Second entry has wrong item");
+			Assert.AreEqual (3, dataView[2][0], s + "Third entry has wrong item");
+			Assert.AreEqual (2, dataView[3][0], s + "Fourth entry has wrong item");
 
 			s = "Ascending sorting 1: ";
 			dataView.Sort = "itemId ASC";
-			AssertEquals (s + "First entry has wrong item", 0, dataView[0][0]);
-			AssertEquals (s + "Second entry has wrong item", 1, dataView[1][0]);
-			AssertEquals (s + "Third entry has wrong item", 2, dataView[2][0]);
-			AssertEquals (s + "Fourth entry has wrong item", 3, dataView[3][0]);
+			Assert.AreEqual (0, dataView[0][0], s + "First entry has wrong item");
+			Assert.AreEqual (1, dataView[1][0], s + "Second entry has wrong item");
+			Assert.AreEqual (2, dataView[2][0], s + "Third entry has wrong item");
+			Assert.AreEqual (3, dataView[3][0], s + "Fourth entry has wrong item");
 
 			// bug #77104 (2-5)
 			s = "Ascending sorting 2: ";
 			dataView.Sort = "itemId     ASC";
-			AssertEquals (s + "First entry has wrong item", 0, dataView[0][0]);
-			AssertEquals (s + "Second entry has wrong item", 1, dataView[1][0]);
-			AssertEquals (s + "Third entry has wrong item", 2, dataView[2][0]);
-			AssertEquals (s + "Fourth entry has wrong item", 3, dataView[3][0]);
+			Assert.AreEqual (0, dataView[0][0], s + "First entry has wrong item");
+			Assert.AreEqual (1, dataView[1][0], s + "Second entry has wrong item");
+			Assert.AreEqual (2, dataView[2][0], s + "Third entry has wrong item");
+			Assert.AreEqual (3, dataView[3][0], s + "Fourth entry has wrong item");
 
 			s = "Ascending sorting 3: ";
 			dataView.Sort = "[itemId] ASC";
-			AssertEquals (s + "First entry has wrong item", 0, dataView[0][0]);
-			AssertEquals (s + "Second entry has wrong item", 1, dataView[1][0]);
-			AssertEquals (s + "Third entry has wrong item", 2, dataView[2][0]);
-			AssertEquals (s + "Fourth entry has wrong item", 3, dataView[3][0]);
+			Assert.AreEqual (0, dataView[0][0], s + "First entry has wrong item");
+			Assert.AreEqual (1, dataView[1][0], s + "Second entry has wrong item");
+			Assert.AreEqual (2, dataView[2][0], s + "Third entry has wrong item");
+			Assert.AreEqual (3, dataView[3][0], s + "Fourth entry has wrong item");
 
 			s = "Ascending sorting 4: ";
 			dataView.Sort = "[itemId]       ASC";
-			AssertEquals (s + "First entry has wrong item", 0, dataView[0][0]);
-			AssertEquals (s + "Second entry has wrong item", 1, dataView[1][0]);
-			AssertEquals (s + "Third entry has wrong item", 2, dataView[2][0]);
-			AssertEquals (s + "Fourth entry has wrong item", 3, dataView[3][0]);
+			Assert.AreEqual (0, dataView[0][0], s + "First entry has wrong item");
+			Assert.AreEqual (1, dataView[1][0], s + "Second entry has wrong item");
+			Assert.AreEqual (2, dataView[2][0], s + "Third entry has wrong item");
+			Assert.AreEqual (3, dataView[3][0], s + "Fourth entry has wrong item");
 
 			s = "Ascending sorting 5: ";
 			try {
 				dataView.Sort = "itemId \tASC";
-				AssertEquals (s + "Tab cannot be a separator" , true, false);
+				Assert.AreEqual (true, false, s + "Tab cannot be a separator");
 			}catch (IndexOutOfRangeException e) {
 			}
 
 			s = "Descending sorting : ";
 			dataView.Sort = "itemId DESC";
-			AssertEquals (s + "First entry has wrong item", 3, dataView[0][0]);
-			AssertEquals (s + "Second entry has wrong item", 2, dataView[1][0]);
-			AssertEquals (s + "Third entry has wrong item", 1, dataView[2][0]);
-			AssertEquals (s + "Fourth entry has wrong item", 0, dataView[3][0]);
+			Assert.AreEqual (3, dataView[0][0], s + "First entry has wrong item");
+			Assert.AreEqual (2, dataView[1][0], s + "Second entry has wrong item");
+			Assert.AreEqual (1, dataView[2][0], s + "Third entry has wrong item");
+			Assert.AreEqual (0, dataView[3][0], s + "Fourth entry has wrong item");
 
 			s = "Reverted to default sorting: ";
 			dataView.Sort = null;
-			AssertEquals (s + "First entry has wrong item", 1, dataView[0][0]);
-			AssertEquals (s + "Second entry has wrong item", 0, dataView[1][0]);
-			AssertEquals (s + "Third entry has wrong item", 3, dataView[2][0]);
-			AssertEquals (s + "Fourth entry has wrong item", 2, dataView[3][0]);
+			Assert.AreEqual (1, dataView[0][0], s + "First entry has wrong item");
+			Assert.AreEqual (0, dataView[1][0], s + "Second entry has wrong item");
+			Assert.AreEqual (3, dataView[2][0], s + "Third entry has wrong item");
+			Assert.AreEqual (2, dataView[3][0], s + "Fourth entry has wrong item");
 		}
 		
 		#endregion // Sort Tests
@@ -409,21 +409,21 @@ namespace MonoTests.System.Data
 		{
 			dataView.AllowNew = true;
 			DataRowView drv = dataView.AddNew ();
-			AssertEquals ("test#01",ListChangedType.ItemAdded,listChangedArgs.ListChangedType);
-			AssertEquals ("test#02",-1,listChangedArgs.OldIndex);
-			AssertEquals ("test#03",5,listChangedArgs.NewIndex);
-			AssertEquals ("test#04",drv["itemName"],dataView [dataView.Count - 1]["itemName"]);
+			Assert.AreEqual (ListChangedType.ItemAdded,listChangedArgs.ListChangedType, "test#01");
+			Assert.AreEqual (-1,listChangedArgs.OldIndex, "test#02");
+			Assert.AreEqual (5,listChangedArgs.NewIndex, "test#03");
+			Assert.AreEqual (drv["itemName"],dataView [dataView.Count - 1]["itemName"], "test#04");
 			listChangedArgs = null;
 			drv["itemId"] = "item " + 1001;
 			drv["itemName"] = "name " + rndm.Next();
 			drv["itemPrice"] = "Rs. " + (rndm.Next() % 1000);
 			drv["itemCategory"] = "Cat " + ((rndm.Next() % 10) + 1);
 			// Actually no events are arisen when items are set.
-			AssertNull ("test#05", listChangedArgs);
+			Assert.IsNull (listChangedArgs, "test#05");
 			drv.CancelEdit ();
-			AssertEquals ("test#06",ListChangedType.ItemDeleted,listChangedArgs.ListChangedType);
-			AssertEquals ("test#07",-1,listChangedArgs.OldIndex);
-			AssertEquals ("test#08",5,listChangedArgs.NewIndex);
+			Assert.AreEqual (ListChangedType.ItemDeleted,listChangedArgs.ListChangedType, "test#06");
+			Assert.AreEqual (-1,listChangedArgs.OldIndex, "test#07");
+			Assert.AreEqual (5,listChangedArgs.NewIndex, "test#08");
 		}
 
 		[Test]
@@ -439,15 +439,15 @@ namespace MonoTests.System.Data
 			table.Columns.AddRange (new DataColumn[] {col1,col2});
 
 			dv.Table = table;
-			AssertNull ("#1", dv.Table);
+			Assert.IsNull (dv.Table, "#1");
 			dv.EndInit ();
 
-			AssertNull ("#2", dv.Table); // still.
-			AssertEquals ("#3", 0, table.Columns.Count);
+			Assert.IsNull (dv.Table, "#2"); // still.
+			Assert.AreEqual (0, table.Columns.Count, "#3");
 
 			table.EndInit ();
-			AssertEquals ("#5", table, dv.Table);
-			AssertEquals ("#4", 2, table.Columns.Count);
+			Assert.AreEqual (table, dv.Table, "#4");
+			Assert.AreEqual (2, table.Columns.Count, "#5");
 		}
 
 		private bool dvInitialized;
@@ -472,19 +472,19 @@ namespace MonoTests.System.Data
 			table.Columns.AddRange (new DataColumn[] {col1,col2});
 
 			dv.Table = table;
-			AssertNull ("#1", dv.Table);
+			Assert.IsNull (dv.Table, "#1");
 			dv.EndInit ();
 			
-			AssertNull ("#2", dv.Table);
-			AssertEquals ("#3", 0, table.Columns.Count);
+			Assert.IsNull (dv.Table, "#2");
+			Assert.AreEqual (0, table.Columns.Count, "#3");
 
 			table.EndInit ();
 
 			dv.Initialized -= new EventHandler (OnDataViewInitialized); // this should not be unregistered before table.EndInit().
 			
-			AssertEquals ("#4", 2, table.Columns.Count);
-			AssertEquals ("#6", table, dv.Table);
-			AssertEquals ("DataViewInitialized #5", true, dvInitialized);
+			Assert.AreEqual (2, table.Columns.Count, "#4");
+			Assert.AreEqual (table, dv.Table, "#6");
+			Assert.AreEqual (true, dvInitialized, "DataViewInitialized #5");
 		}
 
 		[Test]
@@ -503,21 +503,21 @@ namespace MonoTests.System.Data
 			randInt = rndm.Next () % rowCount;
 			dataView.Sort = "itemId";
 			drv = dataView [randInt];
-			AssertEquals ("test#01",randInt,dataView.Find (drv ["itemId"]));
+			Assert.AreEqual (randInt,dataView.Find (drv ["itemId"]), "test#01");
 			
 			dataView.Sort = "itemId DESC";
 			drv = dataView [randInt];
-			AssertEquals ("test#02",randInt,dataView.Find (drv ["itemId"]));
+			Assert.AreEqual (randInt,dataView.Find (drv ["itemId"]), "test#02");
 			
 			dataView.Sort = "itemId, itemName";
 			drv = dataView [randInt];
 			object [] keys = new object [2];
 			keys [0] = drv ["itemId"];
 			keys [1] = drv ["itemName"];
-			AssertEquals ("test#03",randInt,dataView.Find (keys));
+			Assert.AreEqual (randInt,dataView.Find (keys), "test#03");
 			
 			dataView.Sort = "itemId";
-			AssertEquals ("test#04",-1,dataView.Find("no item"));
+			Assert.AreEqual (-1,dataView.Find("no item"), "test#04");
 
 		}
 
@@ -540,7 +540,7 @@ namespace MonoTests.System.Data
 		[Test]
 		public void ToStringTest ()
 		{
-			AssertEquals ("test#01","System.Data.DataView",dataView.ToString());
+			Assert.AreEqual ("System.Data.DataView",dataView.ToString(), "test#01");
 		}
 
 		[Test]
@@ -556,38 +556,38 @@ namespace MonoTests.System.Data
 			dataTable.Rows.Add(dr);
 
 			//PrintTableOrView(dataView, "ItemAdded");
-			AssertEquals ("test#01",ListChangedType.ItemAdded,listChangedArgs.ListChangedType);
+			Assert.AreEqual (ListChangedType.ItemAdded,listChangedArgs.ListChangedType, "test#01");
 			listChangedArgs = null;
 
 			dr ["itemId"] = "aitem 0";
 			// PrintTableOrView(dataView, "ItemChanged");
-			AssertEquals ("test#02",ListChangedType.ItemChanged,listChangedArgs.ListChangedType);
+			Assert.AreEqual (ListChangedType.ItemChanged,listChangedArgs.ListChangedType, "test#02");
 			listChangedArgs = null;
 
 			dr ["itemId"] = "zitem 0";
 			// PrintTableOrView(dataView, "ItemMoved");
-			AssertEquals ("test#03",ListChangedType.ItemMoved,listChangedArgs.ListChangedType);
+			Assert.AreEqual (ListChangedType.ItemMoved,listChangedArgs.ListChangedType, "test#03");
 			listChangedArgs = null;
 
 			dataTable.Rows.Remove (dr);
 			// PrintTableOrView(dataView, "ItemDeleted");
-			AssertEquals ("test#04",ListChangedType.ItemDeleted,listChangedArgs.ListChangedType);
+			Assert.AreEqual (ListChangedType.ItemDeleted,listChangedArgs.ListChangedType, "test#04");
 			
 			listChangedArgs = null;
 			DataColumn dc5 = new DataColumn ("itemDesc");
 			dataTable.Columns.Add (dc5);
 			// PrintTableOrView(dataView, "PropertyDescriptorAdded");
-			AssertEquals ("test#05",ListChangedType.PropertyDescriptorAdded,listChangedArgs.ListChangedType);
+			Assert.AreEqual (ListChangedType.PropertyDescriptorAdded,listChangedArgs.ListChangedType, "test#05");
 			
 			listChangedArgs = null;
 			dc5.ColumnName = "itemDescription";
 			// PrintTableOrView(dataView, "PropertyDescriptorChanged");
-			// AssertEquals ("test#06",ListChangedType.PropertyDescriptorChanged,listChangedArgs.ListChangedType);
+			// Assert.AreEqual ("test#06",ListChangedType.PropertyDescriptorChanged,listChangedArgs.ListChangedType);
 			
 			listChangedArgs = null;
 			dataTable.Columns.Remove (dc5);
 			// PrintTableOrView(dataView, "PropertyDescriptorDeleted");
-			AssertEquals ("test#07",ListChangedType.PropertyDescriptorDeleted,listChangedArgs.ListChangedType);
+			Assert.AreEqual (ListChangedType.PropertyDescriptorDeleted,listChangedArgs.ListChangedType, "test#07");
 		}
 	
 		[Test]
@@ -596,8 +596,8 @@ namespace MonoTests.System.Data
 			DataView TestView = new DataView (dataTable);
 			TestView.Sort = "itemId";
 			DataRowView[] Result = TestView.FindRows ("item 3");
-			Assertion.AssertEquals ("Dv #1", 1, Result.Length);
-			Assertion.AssertEquals ("Dv #2", "item 3", Result [0]["itemId"]);
+			Assert.AreEqual (1, Result.Length, "Dv #1");
+			Assert.AreEqual ("item 3", Result [0]["itemId"], "Dv #2");
 		}
 
 		[Test]
@@ -642,7 +642,7 @@ namespace MonoTests.System.Data
 			DataView TestView = new DataView (dataTable);
 			TestView.Delete (0);
 			DataRow r = TestView.Table.Rows [0];
-			Assertion.Assert ("Dv #1", !((string)r ["itemId"] == "item 1"));
+			Assert.IsTrue (!((string)r ["itemId"] == "item 1"), "Dv #1");
 		}
 
 		[Test]
@@ -685,13 +685,13 @@ namespace MonoTests.System.Data
 
 			DataView dataView = new DataView (dataset.Tables[0]);
 
-			AssertEquals ("before delete", 3, dataView.Count);
+			Assert.AreEqual (3, dataView.Count, "before delete");
 			dataView.AllowDelete = true;
 
 			// Deleting the first row
 			dataView.Delete (0);
 
-			AssertEquals ("before delete", 2, dataView.Count);
+			Assert.AreEqual (2, dataView.Count, "before delete");
 		}
 
 		[Test]
@@ -746,7 +746,7 @@ namespace MonoTests.System.Data
 			eventWriter.Write (" ------" + dv.Count);
 			DataRowView a3 = dv.AddNew ();
 
-			AssertEquals (reference, eventWriter.ToString ());
+			Assert.AreEqual (reference, eventWriter.ToString ());
 		}
 
 		[Test]
@@ -766,7 +766,7 @@ table was set.
 
 			dc2.ColumnName = "new_column_name";
 
-			AssertEquals (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
+			Assert.AreEqual (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
 		}
 
 		private void ListChanged (object o, ListChangedEventArgs e)
@@ -830,7 +830,7 @@ removed relation 2
 			ds.Relations.Remove (dr);
 			eventWriter.WriteLine ("removed relation 2");
 
-			AssertEquals (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
+			Assert.AreEqual (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
 		}
 
 		[Test]
@@ -942,7 +942,7 @@ table changed.
 			dv.Table = new DataTable ("table2");
 			eventWriter.WriteLine ("table changed.");
 
-			AssertEquals (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
+			Assert.AreEqual (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
 		}
 
 		[Test]
@@ -982,7 +982,7 @@ table was set.
 			dt.Columns.Add ("");
 			eventWriter.WriteLine (" add a column with an empty name.");
 
-			AssertEquals (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
+			Assert.AreEqual (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
 			GC.KeepAlive (dv);
 		}
 
diff --git a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
index 6e5d2a4df92..21742eb3aa3 100644
--- a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
@@ -38,7 +38,7 @@ using System.Data;
 namespace MonoTests.System.Data
 {
 	[TestFixture]
-	public class ForeignKeyConstraintTest : Assertion
+	public class ForeignKeyConstraintTest
 	{
 		private DataSet _ds;
 
@@ -73,23 +73,23 @@ namespace MonoTests.System.Data
 		{
 			DataTable Table =  _ds.Tables [0];
 			
-			AssertEquals ("test#01", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#01");
 			Table =  _ds.Tables [1];
-			AssertEquals ("test#02", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#02");
 			
 			// ctor (string, DataColumn, DataColumn
 			ForeignKeyConstraint Constraint = new ForeignKeyConstraint ("test", _ds.Tables [0].Columns [2], _ds.Tables [1].Columns [0]);
 			Table = _ds.Tables [1];
 			Table.Constraints.Add (Constraint);
 			
-			AssertEquals ("test#03", 1, Table.Constraints.Count);
-			AssertEquals ("test#04", "test", Table.Constraints [0].ConstraintName);
-			AssertEquals ("test#05", typeof (ForeignKeyConstraint), Table.Constraints [0].GetType ());
+			Assert.AreEqual (1, Table.Constraints.Count, "test#03");
+			Assert.AreEqual ("test", Table.Constraints [0].ConstraintName, "test#04");
+			Assert.AreEqual (typeof (ForeignKeyConstraint), Table.Constraints [0].GetType (), "test#05");
 
 			Table = _ds.Tables [0];
-			AssertEquals ("test#06", 1, Table.Constraints.Count);
-			AssertEquals ("test#07", "Constraint1", Table.Constraints [0].ConstraintName);
-			AssertEquals ("test#08", typeof (UniqueConstraint), Table.Constraints [0].GetType ());
+			Assert.AreEqual (1, Table.Constraints.Count, "test#06");
+			Assert.AreEqual ("Constraint1", Table.Constraints [0].ConstraintName, "test#07");
+			Assert.AreEqual (typeof (UniqueConstraint), Table.Constraints [0].GetType (), "test#08");
 		}
 		
 		// Tests ctor (DataColumn, DataColumn)
@@ -98,23 +98,23 @@ namespace MonoTests.System.Data
 		{
 			DataTable Table =  _ds.Tables [0];
 			
-			AssertEquals ("test#01", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#01");
 			Table =  _ds.Tables [1];
-			AssertEquals ("test#02", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#02");
 			
 			// ctor (string, DataColumn, DataColumn
 			ForeignKeyConstraint Constraint = new ForeignKeyConstraint (_ds.Tables [0].Columns [2], _ds.Tables [1].Columns [0]);
 			Table = _ds.Tables [1];
 			Table.Constraints.Add (Constraint);
 			
-			AssertEquals ("test#03", 1, Table.Constraints.Count);
-			AssertEquals ("test#04", "Constraint1", Table.Constraints [0].ConstraintName);
-			AssertEquals ("test#05", typeof (ForeignKeyConstraint), Table.Constraints [0].GetType ());
+			Assert.AreEqual (1, Table.Constraints.Count, "test#03");
+			Assert.AreEqual ("Constraint1", Table.Constraints [0].ConstraintName, "test#04");
+			Assert.AreEqual (typeof (ForeignKeyConstraint), Table.Constraints [0].GetType (), "test#05");
 
 			Table = _ds.Tables [0];
-			AssertEquals ("test#06", 1, Table.Constraints.Count);
-			AssertEquals ("test#07", "Constraint1", Table.Constraints [0].ConstraintName);
-			AssertEquals ("test#08", typeof (UniqueConstraint), Table.Constraints [0].GetType ());
+			Assert.AreEqual (1, Table.Constraints.Count, "test#06");
+			Assert.AreEqual ("Constraint1", Table.Constraints [0].ConstraintName, "test#07");
+			Assert.AreEqual (typeof (UniqueConstraint), Table.Constraints [0].GetType (), "test#08");
 		}
 		
 		// Test ctor (DataColumn [], DataColumn [])
@@ -123,9 +123,9 @@ namespace MonoTests.System.Data
 		{
 			DataTable Table =  _ds.Tables [0];
 			
-			AssertEquals ("test#01", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#01");
 			Table =  _ds.Tables [1];
-			AssertEquals ("test#02", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#02");
 						
 			DataColumn [] Cols1 = new DataColumn [2];
 			Cols1 [0] = _ds.Tables [0].Columns [1];
@@ -139,14 +139,14 @@ namespace MonoTests.System.Data
 			Table = _ds.Tables [1];
 			Table.Constraints.Add (Constraint);
 			
-			AssertEquals ("test#03", 1, Table.Constraints.Count);
-			AssertEquals ("test#04", "Constraint1", Table.Constraints [0].ConstraintName);
-			AssertEquals ("test#05", typeof (ForeignKeyConstraint), Table.Constraints [0].GetType ());
+			Assert.AreEqual (1, Table.Constraints.Count, "test#03");
+			Assert.AreEqual ("Constraint1", Table.Constraints [0].ConstraintName, "test#04");
+			Assert.AreEqual (typeof (ForeignKeyConstraint), Table.Constraints [0].GetType (), "test#05");
 
 			Table = _ds.Tables [0];
-			AssertEquals ("test#06", 1, Table.Constraints.Count);
-			AssertEquals ("test#07", "Constraint1", Table.Constraints [0].ConstraintName);
-			AssertEquals ("test#08", typeof (UniqueConstraint), Table.Constraints [0].GetType ());
+			Assert.AreEqual (1, Table.Constraints.Count, "test#06");
+			Assert.AreEqual ("Constraint1", Table.Constraints [0].ConstraintName, "test#07");
+			Assert.AreEqual (typeof (UniqueConstraint), Table.Constraints [0].GetType (), "test#08");
 
 		}
 	
@@ -156,9 +156,9 @@ namespace MonoTests.System.Data
 		{
 			DataTable Table =  _ds.Tables [0];
 			
-			AssertEquals ("test#01", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#01");
 			Table =  _ds.Tables [1];
-			AssertEquals ("test#02", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#02");
 						
 			DataColumn [] Cols1 = new DataColumn [2];
 			Cols1 [0] = _ds.Tables [0].Columns [1];
@@ -172,14 +172,14 @@ namespace MonoTests.System.Data
 			Table = _ds.Tables [1];
 			Table.Constraints.Add (Constraint);
 			
-			AssertEquals ("test#03", 1, Table.Constraints.Count);
-			AssertEquals ("test#04", "Test", Table.Constraints [0].ConstraintName);
-			AssertEquals ("test#05", typeof (ForeignKeyConstraint), Table.Constraints [0].GetType ());
+			Assert.AreEqual (1, Table.Constraints.Count, "test#03");
+			Assert.AreEqual ("Test", Table.Constraints [0].ConstraintName, "test#04");
+			Assert.AreEqual (typeof (ForeignKeyConstraint), Table.Constraints [0].GetType (), "test#05");
 
 			Table = _ds.Tables [0];
-			AssertEquals ("test#06", 1, Table.Constraints.Count);
-			AssertEquals ("test#07", "Constraint1", Table.Constraints [0].ConstraintName);
-			AssertEquals ("test#08", typeof (UniqueConstraint), Table.Constraints [0].GetType ());			
+			Assert.AreEqual (1, Table.Constraints.Count, "test#06");
+			Assert.AreEqual ("Constraint1", Table.Constraints [0].ConstraintName, "test#07");
+			Assert.AreEqual (typeof (UniqueConstraint), Table.Constraints [0].GetType (), "test#08");
 		}
 		
 		[Test]
@@ -211,7 +211,7 @@ namespace MonoTests.System.Data
 			 ForeignKeyConstraint fkc = new ForeignKeyConstraint ("hello world", parentTableName, parentColumnNames, childColumnNames, AcceptRejectRule.Cascade, Rule.Cascade, Rule.Cascade);                                                                                                                            // Assert that the Constraint object does not belong to any table yet
 			try {
 				DataTable tmp = fkc.Table;
-				Fail ("When table is null, get_Table causes an InvalidOperationException.");
+				Assert.Fail ("When table is null, get_Table causes an InvalidOperationException.");
 			} catch (NullReferenceException) { // actually .NET throws this (bug)
 			} catch (InvalidOperationException) {
 			}
@@ -234,9 +234,12 @@ namespace MonoTests.System.Data
                         // OK - So AddRange() is the only way!
                         table2.Constraints.AddRange (constraints);
 			   // After AddRange(), Check the properties of ForeignKeyConstraint object
-                        Assertion.Assert("#A04", fkc.RelatedColumns [0].ColumnName.Equals ("col1"));                        Assertion.Assert("#A05", fkc.RelatedColumns [1].ColumnName.Equals ("col2"));                        Assertion.Assert("#A06", fkc.RelatedColumns [2].ColumnName.Equals ("col3"));                        Assertion.Assert("#A07", fkc.Columns [0].ColumnName.Equals ("col4"));
-                        Assertion.Assert("#A08", fkc.Columns [1].ColumnName.Equals ("col5"));
-                        Assertion.Assert("#A09", fkc.Columns [2].ColumnName.Equals ("col6"));
+                        Assert.IsTrue(fkc.RelatedColumns [0].ColumnName.Equals ("col1"), "#A04");
+                        Assert.IsTrue(fkc.RelatedColumns [1].ColumnName.Equals ("col2"), "#A05");
+                        Assert.IsTrue(fkc.RelatedColumns [2].ColumnName.Equals ("col3"), "#A06");
+                        Assert.IsTrue(fkc.Columns [0].ColumnName.Equals ("col4"), "#A07");
+                        Assert.IsTrue(fkc.Columns [1].ColumnName.Equals ("col5"), "#A08");
+                        Assert.IsTrue(fkc.Columns [2].ColumnName.Equals ("col6"), "#A09");
 #endif
                         // Try to add columns with names which do not exist in the table
                         parentColumnNames [2] = "noColumn";
@@ -255,7 +258,7 @@ namespace MonoTests.System.Data
                         
 #if false // FIXME: Here this test crashes under MS.NET.
                         // Check whether the child table really contains the foreign key constraint named "hello world"
-                        Assertion.Assert("#A11 ", table2.Constraints.Contains ("hello world"));
+                        Assert.IsTrue(table2.Constraints.Contains ("hello world"), "#A11 ");
 #endif
                 }
 
@@ -267,20 +270,20 @@ namespace MonoTests.System.Data
 		{
 			DataTable Table =  _ds.Tables [0];
 			
-			AssertEquals ("test#01", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#01");
 			Table =  _ds.Tables [1];
-			AssertEquals ("test#02", 0, Table.Constraints.Count);
+			Assert.AreEqual (0, Table.Constraints.Count, "test#02");
 						
 			
 			ForeignKeyConstraint Constraint = new ForeignKeyConstraint ("Test", _ds.Tables [0].Columns [0], _ds.Tables [0].Columns [2]);
 			Table = _ds.Tables [0];
 			Table.Constraints.Add (Constraint);
 			
-			AssertEquals ("test#03", 2, Table.Constraints.Count);
-			AssertEquals ("test#04", "Constraint1", Table.Constraints [0].ConstraintName);
-			AssertEquals ("test#05", typeof (UniqueConstraint), Table.Constraints [0].GetType ());
-			AssertEquals ("test#04", "Test", Table.Constraints [1].ConstraintName);
-			AssertEquals ("test#05", typeof (ForeignKeyConstraint), Table.Constraints [1].GetType ());
+			Assert.AreEqual (2, Table.Constraints.Count, "test#03");
+			Assert.AreEqual ("Constraint1", Table.Constraints [0].ConstraintName, "test#04");
+			Assert.AreEqual (typeof (UniqueConstraint), Table.Constraints [0].GetType (), "test#05");
+			Assert.AreEqual ("Test", Table.Constraints [1].ConstraintName, "test#04");
+			Assert.AreEqual (typeof (ForeignKeyConstraint), Table.Constraints [1].GetType (), "test#05");
 
 		}
 
@@ -297,45 +300,45 @@ namespace MonoTests.System.Data
 			try
 			{
 				fkc = new ForeignKeyConstraint((DataColumn)null,(DataColumn)null);
-				Fail("Failed to throw ArgumentNullException.");
+				Assert.Fail("Assert.Failed to throw ArgumentNullException.");
 			}
 			catch (NullReferenceException) {}
 			catch (AssertionException exc) {throw exc;}
 			catch (Exception exc)
 			{
-				Fail("A1: Wrong Exception type. " + exc.ToString());
+				Assert.Fail("A1: Wrong Exception type. " + exc.ToString());
 			}
 
 			//zero length collection
 			try
 			{
 				fkc = new ForeignKeyConstraint(new DataColumn[]{},new DataColumn[]{});
-				Fail("B1: Failed to throw ArgumentException.");
+				Assert.Fail("B1: Assert.Failed to throw ArgumentException.");
 			}
 			catch (ArgumentException) {}
 			catch (AssertionException exc) {throw exc;}
 			catch (Exception exc)
 			{
-				Fail("A2: Wrong Exception type. " + exc.ToString());
+				Assert.Fail("A2: Wrong Exception type. " + exc.ToString());
 			}
 
 			//different datasets
 			try
 			{
 				fkc = new ForeignKeyConstraint(_ds.Tables[0].Columns[0], localTable.Columns[0]);
-				Fail("Failed to throw InvalidOperationException.");
+				Assert.Fail("Assert.Failed to throw InvalidOperationException.");
 			}
 			catch (InvalidOperationException) {}
 			catch (AssertionException exc) {throw exc;}
 			catch (Exception exc)
 			{
-				Fail("A3: Wrong Exception type. " + exc.ToString());
+				Assert.Fail("A3: Wrong Exception type. " + exc.ToString());
 			}
 
 			try
 			{
 				fkc = new ForeignKeyConstraint(_ds.Tables[0].Columns[0], localTable.Columns[1]);
-				Fail("Failed to throw InvalidConstraintException.");
+				Assert.Fail("Assert.Failed to throw InvalidConstraintException.");
 			}
 			// tables in different datasets
 			catch (InvalidOperationException) {}
@@ -345,7 +348,7 @@ namespace MonoTests.System.Data
                         try                                           
                         {                                             
                                 fkc = new ForeignKeyConstraint(new DataColumn [] {_ds.Tables[0].Columns[0], _ds.Tables[0].Columns[1]}, new DataColumn [] {localTable.Columns[1], _ds.Tables[1].Columns [0]});    
-                                Fail("Failed to throw InvalidOperationException.");                                         
+                                Assert.Fail("Assert.Failed to throw InvalidOperationException.");                                         
                         }                                             
                         catch (InvalidConstraintException) {}         
                         catch (AssertionException exc) {throw exc;} 
@@ -362,13 +365,13 @@ namespace MonoTests.System.Data
 			try 
 			{
 				fkc = new ForeignKeyConstraint(col, _ds.Tables[0].Columns[0]);
-				Fail("FTT1: Failed to throw ArgumentException.");
+				Assert.Fail("FTT1: Assert.Failed to throw ArgumentException.");
 			}
 			catch (ArgumentException) {}
 			catch (AssertionException exc) {throw exc;}
 //			catch (Exception exc)
 //			{
-//				Fail("WET1: Wrong Exception type. " + exc.ToString());
+//				Assert.Fail("WET1: Wrong Exception type. " + exc.ToString());
 //			}
 
 			//Columns must belong to the same table
@@ -382,13 +385,13 @@ namespace MonoTests.System.Data
 								 _ds.Tables[0].Columns[1],
 								_ds.Tables[0].Columns[0]});
 					
-				Fail("FTT2: Failed to throw InvalidConstraintException.");
+				Assert.Fail("FTT2: Assert.Failed to throw InvalidConstraintException.");
 			}
 			catch (InvalidConstraintException) {}
 			catch (AssertionException exc) {throw exc;}
 			catch (Exception exc)
 			{
-				Fail("WET2: Wrong Exception type. " + exc.ToString());
+				Assert.Fail("WET2: Wrong Exception type. " + exc.ToString());
 			}
 
 
@@ -403,13 +406,13 @@ namespace MonoTests.System.Data
 				fkc = new ForeignKeyConstraint(twoCol, 
 					new DataColumn[] { _ds.Tables[0].Columns[0]});
 					
-				Fail("FTT3: Failed to throw ArgumentException.");
+				Assert.Fail("FTT3: Assert.Failed to throw ArgumentException.");
 			}
 			catch (ArgumentException) {}
 			catch (AssertionException exc) {throw exc;}
 			catch (Exception exc)
 			{
-				Fail("WET3: Wrong Exception type. " + exc.ToString());
+				Assert.Fail("WET3: Wrong Exception type. " + exc.ToString());
 			}
 
 			//InvalidOperation: Parent and child are the same column.
@@ -418,13 +421,13 @@ namespace MonoTests.System.Data
 				fkc = new ForeignKeyConstraint( _ds.Tables[0].Columns[0],
 					_ds.Tables[0].Columns[0] );
 					
-				Fail("FTT4: Failed to throw InvalidOperationException.");
+				Assert.Fail("FTT4: Assert.Failed to throw InvalidOperationException.");
 			}
 			catch (InvalidOperationException) {}
 			catch (AssertionException exc) {throw exc;}
 			catch (Exception exc)
 			{
-				Fail("WET4: Wrong Exception type. " + exc.ToString());
+				Assert.Fail("WET4: Wrong Exception type. " + exc.ToString());
 			}
 
 		}
@@ -446,14 +449,14 @@ namespace MonoTests.System.Data
 			ForeignKeyConstraint fkcDiff = 
 				new ForeignKeyConstraint( tbl.Columns[1], tbl.Columns[2]);
 		
-			Assert( "Equals failed. 1" , fkc.Equals(fkc2));
-			Assert( "Equals failed. 2" , fkc2.Equals(fkc));
-			Assert( "Equals failed. 3" , fkc.Equals(fkc));
+			Assert.IsTrue( fkc.Equals(fkc2) , "Equals Assert.IsTrue.Failed. 1");
+			Assert.IsTrue( fkc2.Equals(fkc) , "Equals Assert.IsTrue.Failed. 2");
+			Assert.IsTrue( fkc.Equals(fkc) , "Equals Assert.IsTrue.Failed. 3");
 
-			Assert( "Equals failed diff. 1" , fkc.Equals(fkcDiff) == false);
+			Assert.IsTrue( fkc.Equals(fkcDiff) == false , "Equals Assert.IsTrue.Failed diff. 1");
 
-			//Assert( "Hash Code Failed. 1", fkc.GetHashCode() == fkc2.GetHashCode() );
-			Assert( "Hash Code Failed. 2", fkc.GetHashCode() != fkcDiff.GetHashCode() );
+			//Assert.IsTrue( "Hash Code Assert.IsTrue.Failed. 1", fkc.GetHashCode() == fkc2.GetHashCode() );
+			Assert.IsTrue( fkc.GetHashCode() != fkcDiff.GetHashCode() , "Hash Code Assert.IsTrue.Failed. 2");
 	
 		}
 
@@ -512,7 +515,7 @@ namespace MonoTests.System.Data
 			t2.Rows.Add (new object [] {10});
 
 			t1.Rows [0][0]=20;
-			Assert("#1", (int)t2.Rows [0][0] == 20);
+			Assert.IsTrue((int)t2.Rows [0][0] == 20, "#1");
 		}
 
 		[Test]
diff --git a/mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest2.cs b/mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest2.cs
index cc8196e0c96..0a99b71bc32 100644
--- a/mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest2.cs
+++ b/mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest2.cs
@@ -38,7 +38,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Xml
 {
 	[TestFixture]
-	public class XmlDataDocumentTest2 : Assertion
+	public class XmlDataDocumentTest2 
 	{
 		string xml = "<NewDataSet><table><row><col1>1</col1><col2>2</col2></row></table></NewDataSet>";
 
@@ -53,8 +53,8 @@ namespace MonoTests.System.Xml
 		public void TestDefaultCtor ()
 		{
 			XmlDataDocument doc = new XmlDataDocument ();
-			AssertNotNull (doc.DataSet);
-			AssertEquals ("NewDataSet", doc.DataSet.DataSetName);
+			Assert.IsNotNull (doc.DataSet);
+			Assert.AreEqual ("NewDataSet", doc.DataSet.DataSetName);
 		}
 
 		[Test]
@@ -117,73 +117,73 @@ namespace MonoTests.System.Xml
 			ds.Relations.Add (rel);
 			XmlDataDocument doc = new XmlDataDocument (ds);
 			doc.LoadXml ("<set><tab1><col1>1</col1><col2/><child><ref>1</ref><val>aaa</val></child></tab1></set>");
-			AssertEquals (1, ds.Tables [0].Rows.Count);
-			AssertEquals (1, ds.Tables [1].Rows.Count);
+			Assert.AreEqual (1, ds.Tables [0].Rows.Count);
+			Assert.AreEqual (1, ds.Tables [1].Rows.Count);
 
 			// document element - no mapped row
 			XmlElement el = doc.DocumentElement;
-			AssertNull (doc.GetRowFromElement (el));
+			Assert.IsNull (doc.GetRowFromElement (el));
 
 			// tab1 element - has mapped row
 			el = el.FirstChild as XmlElement;
 			DataRow row = doc.GetRowFromElement (el);
-			AssertNotNull (row);
-			AssertEquals (DataRowState.Added, row.RowState);
+			Assert.IsNotNull (row);
+			Assert.AreEqual (DataRowState.Added, row.RowState);
 
 			// col1 - it is column. no mapped row
 			el = el.FirstChild as XmlElement;
 			row = doc.GetRowFromElement (el);
-			AssertNull (row);
+			Assert.IsNull (row);
 
 			// col2 - it is column. np mapped row
 			el = el.NextSibling as XmlElement;
 			row = doc.GetRowFromElement (el);
-			AssertNull (row);
+			Assert.IsNull (row);
 
 			// child - has mapped row
 			el = el.NextSibling as XmlElement;
 			row = doc.GetRowFromElement (el);
-			AssertNotNull (row);
-			AssertEquals (DataRowState.Added, row.RowState);
+			Assert.IsNotNull (row);
+			Assert.AreEqual (DataRowState.Added, row.RowState);
 
 			// created (detached) table 1 element (used later)
 			el = doc.CreateElement ("tab1");
 			row = doc.GetRowFromElement (el);
-			AssertEquals (DataRowState.Detached, row.RowState);
-			AssertEquals (1, dt.Rows.Count); // not added yet
+			Assert.AreEqual (DataRowState.Detached, row.RowState);
+			Assert.AreEqual (1, dt.Rows.Count); // not added yet
 
 			// adding a node before setting EnforceConstraints
 			// raises an error
 			try {
 				doc.DocumentElement.AppendChild (el);
-				Fail ("Invalid Operation should occur; EnforceConstraints prevents addition.");
+				Assert.Fail ("Invalid Operation should occur; EnforceConstraints prevents addition.");
 			} catch (InvalidOperationException) {
 			}
 
 			// try again...
 			ds.EnforceConstraints = false;
-			AssertEquals (1, dt.Rows.Count); // not added yet
+			Assert.AreEqual (1, dt.Rows.Count); // not added yet
 			doc.DocumentElement.AppendChild (el);
-			AssertEquals (2, dt.Rows.Count); // added
+			Assert.AreEqual (2, dt.Rows.Count); // added
 			row = doc.GetRowFromElement (el);
-			AssertEquals (DataRowState.Added, row.RowState); // changed
+			Assert.AreEqual (DataRowState.Added, row.RowState); // changed
 
 			// Irrelevant element
 			XmlElement el2 = doc.CreateElement ("hoge");
 			row = doc.GetRowFromElement (el2);
-			AssertNull (row);
+			Assert.IsNull (row);
 
 			// created table 2 element (used later)
 			el = doc.CreateElement ("child");
 			row = doc.GetRowFromElement (el);
-			AssertEquals (DataRowState.Detached, row.RowState);
+			Assert.AreEqual (DataRowState.Detached, row.RowState);
 
 			// Adding it to irrelevant element performs no row state change.
-			AssertEquals (1, dt2.Rows.Count); // not added yet
+			Assert.AreEqual (1, dt2.Rows.Count); // not added yet
 			el2.AppendChild (el);
-			AssertEquals (1, dt2.Rows.Count); // still not added
+			Assert.AreEqual (1, dt2.Rows.Count); // still not added
 			row = doc.GetRowFromElement (el);
-			AssertEquals (DataRowState.Detached, row.RowState); // still detached here
+			Assert.AreEqual (DataRowState.Detached, row.RowState); // still detached here
 		}
 
 		// bug #54505
@@ -244,8 +244,8 @@ namespace MonoTests.System.Xml
 			StringReader sr = new StringReader (sw.ToString());
 			doc1.Load (sr);
 
-			AssertEquals ("#1", 1, ds1.Tables [0].Rows.Count);
-			AssertEquals ("#2", 1, ds1.Tables [0].Rows [0][0]);
+			Assert.AreEqual (1, ds1.Tables [0].Rows.Count, "#1");
+			Assert.AreEqual (1, ds1.Tables [0].Rows [0][0], "#2");
 		}
 
 		[Test]
@@ -267,8 +267,8 @@ namespace MonoTests.System.Xml
 			StringReader sr = new StringReader (sw.ToString());
 			doc1.Load (sr);
 
-			AssertEquals ("#1", 1, ds1.Tables [0].Rows [0][0]);
-			AssertEquals ("#2", true, ds1.Tables [0].Rows [0].IsNull (1));
+			Assert.AreEqual (1, ds1.Tables [0].Rows [0][0], "#1");
+			Assert.AreEqual (true, ds1.Tables [0].Rows [0].IsNull (1), "#2");
 		}
 
 		[Test]
@@ -301,9 +301,9 @@ namespace MonoTests.System.Xml
 			StringReader sreader = new StringReader (swriter.ToString ());
 			DataSet ds1 = ds.Clone ();
 			XmlDataDocument doc1 = new XmlDataDocument (ds1);
-			AssertEquals ("#2" , 0, ds1.Tables [0].Rows.Count);
+			Assert.AreEqual (0 , ds1.Tables [0].Rows.Count, "#2");
 			doc1.Load (sreader);
-			AssertEquals ("#3" , 3, ds1.Tables [0].Rows.Count);
+			Assert.AreEqual (3 , ds1.Tables [0].Rows.Count, "#3");
 		}
 	}
 }
diff --git a/mcs/class/System.Data/mobile_static_System.Data_test.dll.excludes b/mcs/class/System.Data/mobile_static_System.Data_test.dll.exclude.sources
index 0022a9e9f1b..0022a9e9f1b 100644
--- a/mcs/class/System.Data/mobile_static_System.Data_test.dll.excludes
+++ b/mcs/class/System.Data/mobile_static_System.Data_test.dll.exclude.sources
diff --git a/mcs/class/System.Deployment/System.Deployment-net_4_x.csproj b/mcs/class/System.Deployment/System.Deployment-net_4_x.csproj
new file mode 100644
index 00000000000..bd40ae2f3a7
--- /dev/null
+++ b/mcs/class/System.Deployment/System.Deployment-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{E378448B-0D48-4338-BAE0-CEB9A7CB3B80}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699</NoWarn>
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Deployment</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="Assembly\AssemblyInfo.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
index 3dc11aa3b01..1e9a30c444c 100644
--- a/mcs/class/System.Design/Makefile
+++ b/mcs/class/System.Design/Makefile
@@ -13,6 +13,10 @@ TEST_MCS_FLAGS =
 include ../../build/library.make
 
 ifneq (plaindesign/,$(intermediate))
+csproj-local:
+	$(MAKE) csproj-local intermediate=plaindesign/
+
 $(the_libdir_base)plaindesign/System.Design.dll:
 	$(MAKE) intermediate=plaindesign/ $(the_libdir_base)plaindesign/System.Design.dll
 endif
+
diff --git a/mcs/class/System.Design/System.Design-net_4_x.csproj b/mcs/class/System.Design/System.Design-net_4_x.csproj
index 9431cc176bf..4750c28d29f 100644
--- a/mcs/class/System.Design/System.Design-net_4_x.csproj
+++ b/mcs/class/System.Design/System.Design-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -379,15 +382,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Design/System.Design-plaindesign-net_4_x.csproj b/mcs/class/System.Design/System.Design-plaindesign-net_4_x.csproj
new file mode 100644
index 00000000000..1248aef2a74
--- /dev/null
+++ b/mcs/class/System.Design/System.Design-plaindesign-net_4_x.csproj
@@ -0,0 +1,440 @@
+<?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>{DCE556E9-EF89-45F3-A51F-83D3C3E0FEF5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699</NoWarn>
+    <OutputPath>./../../class/lib/net_4_x/plaindesign</OutputPath>
+    <IntermediateOutputPath>obj-plaindesign</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Design</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Compile Include="..\..\build\common\Consts.cs" />
+    <Compile Include="..\..\build\common\Locale.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptor.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptorCollection.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DataSourceGroup.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DataSourceGroupCollection.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DataSourceProviderService.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DesignerDataColumn.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DesignerDataConnection.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DesignerDataParameter.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DesignerDataRelationship.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DesignerDataSchemaClass.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DesignerDataStoredProcedure.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DesignerDataTable.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DesignerDataTableBase.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\DesignerDataView.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\IDataEnvironment.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\IDesignerDataSchema.cs" />
+    <Compile Include="System.ComponentModel.Design.Data\QueryBuilderMode.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\BasicDesignerLoader.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomComponentSerializationService.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomDesignerLoader.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomLocalizationModel.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomLocalizationProvider.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializationProvider.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializerBase.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializerException.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\CollectionCodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\ComponentCodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializationManager.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\EnumCodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\EventCodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\ExpressionContext.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\ICodeDomDesignerReload.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\MemberCodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\ObjectStatementCollection.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\PrimitiveCodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\PropertyCodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\RootCodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\RootContext.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\SerializeAbsoluteContext.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\StatementContext.cs" />
+    <Compile Include="System.ComponentModel.Design.Serialization\TypeCodeDomSerializer.cs" />
+    <Compile Include="System.ComponentModel.Design\ActiveDesignSurfaceChangedEventArgs.cs" />
+    <Compile Include="System.ComponentModel.Design\ActiveDesignSurfaceChangedEventHandler.cs" />
+    <Compile Include="System.ComponentModel.Design\ArrayEditor.cs" />
+    <Compile Include="System.ComponentModel.Design\BinaryEditor.cs" />
+    <Compile Include="System.ComponentModel.Design\ByteViewer.cs" />
+    <Compile Include="System.ComponentModel.Design\CollectionEditor.cs" />
+    <Compile Include="System.ComponentModel.Design\ComponentActionsType.cs" />
+    <Compile Include="System.ComponentModel.Design\ComponentDesigner.cs" />
+    <Compile Include="System.ComponentModel.Design\DateTimeEditor.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionHeaderItem.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionItem.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionItemCollection.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionList.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionListCollection.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedEventArgs.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedEventHandler.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedType.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionMethodItem.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionPropertyItem.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionService.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionTextItem.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionUIService.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeEventArgs.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeEventHandler.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeType.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerCommandSet.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerEventService.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignerHost.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignModeNestedContainer.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignModeSite.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurface.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceCollection.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventArgs.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventHandler.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceManager.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceServiceContainer.cs" />
+    <Compile Include="System.ComponentModel.Design\DisplayMode.cs" />
+    <Compile Include="System.ComponentModel.Design\EventBindingService.cs" />
+    <Compile Include="System.ComponentModel.Design\ExceptionCollection.cs" />
+    <Compile Include="System.ComponentModel.Design\ExtenderService.cs" />
+    <Compile Include="System.ComponentModel.Design\IComponentDesignerDebugService.cs" />
+    <Compile Include="System.ComponentModel.Design\IComponentDesignerStateService.cs" />
+    <Compile Include="System.ComponentModel.Design\InheritanceService.cs" />
+    <Compile Include="System.ComponentModel.Design\LoadedEventArgs.cs" />
+    <Compile Include="System.ComponentModel.Design\LoadedEventHandler.cs" />
+    <Compile Include="System.ComponentModel.Design\LocalizationExtenderProvider.cs" />
+    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventArgs.cs" />
+    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventHandler.cs" />
+    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedType.cs" />
+    <Compile Include="System.ComponentModel.Design\MenuCommandService.cs" />
+    <Compile Include="System.ComponentModel.Design\MultilineStringEditor.cs" />
+    <Compile Include="System.ComponentModel.Design\ObjectSelectorEditor.cs" />
+    <Compile Include="System.ComponentModel.Design\ReferenceService.cs" />
+    <Compile Include="System.ComponentModel.Design\SelectionService.cs" />
+    <Compile Include="System.ComponentModel.Design\TypeDescriptorFilterService.cs" />
+    <Compile Include="System.ComponentModel.Design\UndoEngine.cs" />
+    <Compile Include="System.Data.Design\MethodSignatureGenerator.cs" />
+    <Compile Include="System.Data.Design\ParameterGenerationOption.cs" />
+    <Compile Include="System.Data.Design\TypedDataSetGenerator.cs" />
+    <Compile Include="System.Data.Design\TypedDataSetGeneratorException.cs" />
+    <Compile Include="System.Data.Design\TypedDataSetSchemaImporterExtension.cs" />
+    <Compile Include="System.Design\DummyClass.cs" />
+    <Compile Include="System.Diagnostics.Design\LogConverter.cs" />
+    <Compile Include="System.Diagnostics.Design\ProcessDesigner.cs" />
+    <Compile Include="System.Diagnostics.Design\ProcessModuleDesigner.cs" />
+    <Compile Include="System.Diagnostics.Design\ProcessThreadDesigner.cs" />
+    <Compile Include="System.Diagnostics.Design\StringValueConverter.cs" />
+    <Compile Include="System.Messaging.Design\MessageDesigner.cs" />
+    <Compile Include="System.Resources.Tools\StronglyTypedResourceBuilder.cs" />
+    <Compile Include="System.ServiceProcess.Design\ServiceControllerDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.Util\DummyClass.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\AdRotatorDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\BaseDataBoundControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\BaseDataListComponentEditor.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\BaseDataListDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\BaseValidatorDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\ButtonDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\CalendarAutoFormatDialog.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\CalendarDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\CheckBoxDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\CompositeControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\DataBoundControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\DataListComponentEditor.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\DataProviderNameConverter.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\DataSourceIDConverter.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\HierarchicalDataBoundControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\HyperLinkDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\LabelDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\LinkButtonDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\ListControlDataBindingHandler.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\ListControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\PanelDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\RegexEditorDialog.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\RegexTypeEditor.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\RepeaterDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\TableCellsCollectionEditor.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\TableDesigner.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\TableRowsCollectionEditor.cs" />
+    <Compile Include="System.Web.UI.Design.WebControls\XmlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\AppSettingsExpressionEditor.cs" />
+    <Compile Include="System.Web.UI.Design\CalendarDataBindingHandler.cs" />
+    <Compile Include="System.Web.UI.Design\ClientScriptItem.cs" />
+    <Compile Include="System.Web.UI.Design\ClientScriptItemCollection.cs" />
+    <Compile Include="System.Web.UI.Design\ColorBuilder.cs" />
+    <Compile Include="System.Web.UI.Design\ConnectionStringEditor.cs" />
+    <Compile Include="System.Web.UI.Design\ConnectionStringsExpressionEditor.cs" />
+    <Compile Include="System.Web.UI.Design\ContainerControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\ContentDefinition.cs" />
+    <Compile Include="System.Web.UI.Design\ContentDesignerState.cs" />
+    <Compile Include="System.Web.UI.Design\ControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\ControlDesignerState.cs" />
+    <Compile Include="System.Web.UI.Design\ControlLocation.cs" />
+    <Compile Include="System.Web.UI.Design\ControlParser.cs" />
+    <Compile Include="System.Web.UI.Design\ControlPersister.cs" />
+    <Compile Include="System.Web.UI.Design\DataBindingCollectionConverter.cs" />
+    <Compile Include="System.Web.UI.Design\DataBindingCollectionEditor.cs" />
+    <Compile Include="System.Web.UI.Design\DataBindingHandler.cs" />
+    <Compile Include="System.Web.UI.Design\DataBindingValueUIHandler.cs" />
+    <Compile Include="System.Web.UI.Design\DataColumnSelectionConverter.cs" />
+    <Compile Include="System.Web.UI.Design\DataFieldConverter.cs" />
+    <Compile Include="System.Web.UI.Design\DataMemberConverter.cs" />
+    <Compile Include="System.Web.UI.Design\DataSetFieldSchema.cs" />
+    <Compile Include="System.Web.UI.Design\DataSetSchema.cs" />
+    <Compile Include="System.Web.UI.Design\DataSetViewSchema.cs" />
+    <Compile Include="System.Web.UI.Design\DataSourceBooleanViewSchemaConverter.cs" />
+    <Compile Include="System.Web.UI.Design\DataSourceConverter.cs" />
+    <Compile Include="System.Web.UI.Design\DataSourceDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\DataSourceViewSchemaConverter.cs" />
+    <Compile Include="System.Web.UI.Design\DesignerAutoFormat.cs" />
+    <Compile Include="System.Web.UI.Design\DesignerAutoFormatCollection.cs" />
+    <Compile Include="System.Web.UI.Design\DesignerAutoFormatStyle.cs" />
+    <Compile Include="System.Web.UI.Design\DesignerDataSourceView.cs" />
+    <Compile Include="System.Web.UI.Design\DesignerHierarchicalDataSourceView.cs" />
+    <Compile Include="System.Web.UI.Design\DesignerObject.cs" />
+    <Compile Include="System.Web.UI.Design\DesignerRegion.cs" />
+    <Compile Include="System.Web.UI.Design\DesignerRegionCollection.cs" />
+    <Compile Include="System.Web.UI.Design\DesignerRegionMouseEventArgs.cs" />
+    <Compile Include="System.Web.UI.Design\DesignTimeData.cs" />
+    <Compile Include="System.Web.UI.Design\DesignTimeResourceProviderFactory.cs" />
+    <Compile Include="System.Web.UI.Design\EditableDesignerRegion.cs" />
+    <Compile Include="System.Web.UI.Design\ExpressionEditor.cs" />
+    <Compile Include="System.Web.UI.Design\ExpressionEditorSheet.cs" />
+    <Compile Include="System.Web.UI.Design\ExpressionsCollectionConverter.cs" />
+    <Compile Include="System.Web.UI.Design\ExpressionsCollectionEditor.cs" />
+    <Compile Include="System.Web.UI.Design\HierarchicalDataSourceConverter.cs" />
+    <Compile Include="System.Web.UI.Design\HierarchicalDataSourceDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\HtmlControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\HtmlIntrinsicControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\HyperLinkDataBindingHandler.cs" />
+    <Compile Include="System.Web.UI.Design\IContentResolutionService.cs" />
+    <Compile Include="System.Web.UI.Design\IControlDesignerBehaviour.cs" />
+    <Compile Include="System.Web.UI.Design\IControlDesignerTag.cs" />
+    <Compile Include="System.Web.UI.Design\IControlDesignerView.cs" />
+    <Compile Include="System.Web.UI.Design\IDataBindingSchemaProvider.cs" />
+    <Compile Include="System.Web.UI.Design\IDataSourceDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\IDataSourceFieldSchema.cs" />
+    <Compile Include="System.Web.UI.Design\IDataSourceProvider.cs" />
+    <Compile Include="System.Web.UI.Design\IDataSourceSchema.cs" />
+    <Compile Include="System.Web.UI.Design\IDataSourceViewSchema.cs" />
+    <Compile Include="System.Web.UI.Design\IDesignTimeResourceProviderFactoryService.cs" />
+    <Compile Include="System.Web.UI.Design\IDesignTimeResourceWriter.cs" />
+    <Compile Include="System.Web.UI.Design\IDocumentProjectItem.cs" />
+    <Compile Include="System.Web.UI.Design\IFolderProjectItem.cs" />
+    <Compile Include="System.Web.UI.Design\IHierarchicalDataSourceDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\IHtmlControlDesignerBehavior.cs" />
+    <Compile Include="System.Web.UI.Design\ImageUrlEditor.cs" />
+    <Compile Include="System.Web.UI.Design\IProjectItem.cs" />
+    <Compile Include="System.Web.UI.Design\ITemplateEditingFrame.cs" />
+    <Compile Include="System.Web.UI.Design\ITemplateEditingService.cs" />
+    <Compile Include="System.Web.UI.Design\IWebAdministrationService.cs" />
+    <Compile Include="System.Web.UI.Design\IWebApplication.cs" />
+    <Compile Include="System.Web.UI.Design\IWebFormReferenceManager.cs" />
+    <Compile Include="System.Web.UI.Design\IWebFormsBuilderUIService.cs" />
+    <Compile Include="System.Web.UI.Design\IWebFormsDocumentService.cs" />
+    <Compile Include="System.Web.UI.Design\MailFileEditor.cs" />
+    <Compile Include="System.Web.UI.Design\MdbDataFileEditor.cs" />
+    <Compile Include="System.Web.UI.Design\ReadWriteControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\ResourceExpressionEditor.cs" />
+    <Compile Include="System.Web.UI.Design\ResourceExpressionEditorSheet.cs" />
+    <Compile Include="System.Web.UI.Design\SkinIDTypeConverter.cs" />
+    <Compile Include="System.Web.UI.Design\SupportsPreviewControlAttribute.cs" />
+    <Compile Include="System.Web.UI.Design\TemplatedControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\TemplatedEditableDesignerRegion.cs" />
+    <Compile Include="System.Web.UI.Design\TemplateDefinition.cs" />
+    <Compile Include="System.Web.UI.Design\TemplateEditingService.cs" />
+    <Compile Include="System.Web.UI.Design\TemplateEditingVerb.cs" />
+    <Compile Include="System.Web.UI.Design\TemplateGroup.cs" />
+    <Compile Include="System.Web.UI.Design\TemplateGroupCollection.cs" />
+    <Compile Include="System.Web.UI.Design\TemplateModeChangedEventArgs.cs" />
+    <Compile Include="System.Web.UI.Design\TextControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\TextDataBindingHandler.cs" />
+    <Compile Include="System.Web.UI.Design\TransactedChangeCallback.cs" />
+    <Compile Include="System.Web.UI.Design\TypeSchema.cs" />
+    <Compile Include="System.Web.UI.Design\UrlBuilder.cs" />
+    <Compile Include="System.Web.UI.Design\UrlBuilderOptions.cs" />
+    <Compile Include="System.Web.UI.Design\UrlEditor.cs" />
+    <Compile Include="System.Web.UI.Design\UserControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\UserControlFileEditor.cs" />
+    <Compile Include="System.Web.UI.Design\ViewEvent.cs" />
+    <Compile Include="System.Web.UI.Design\ViewEventArgs.cs" />
+    <Compile Include="System.Web.UI.Design\ViewEventHandler.cs" />
+    <Compile Include="System.Web.UI.Design\ViewFlags.cs" />
+    <Compile Include="System.Web.UI.Design\ViewRendering.cs" />
+    <Compile Include="System.Web.UI.Design\WebControlToolboxItem.cs" />
+    <Compile Include="System.Web.UI.Design\WebFormsDesignerActionService.cs" />
+    <Compile Include="System.Web.UI.Design\WebFormsReferenceManager.cs" />
+    <Compile Include="System.Web.UI.Design\WebFormsRootDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\XmlDataFileEditor.cs" />
+    <Compile Include="System.Web.UI.Design\XmlDocumentSchema.cs" />
+    <Compile Include="System.Web.UI.Design\XmlFileEditor.cs" />
+    <Compile Include="System.Web.UI.Design\XmlUrlEditor.cs" />
+    <Compile Include="System.Web.UI.Design\XsdSchemaFileEditor.cs" />
+    <Compile Include="System.Web.UI.Design\XslTransformFileEditor.cs" />
+    <Compile Include="System.Web.UI.Design\XslUrlEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\Adorner.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\Behavior.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorDragDropEventArgs.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorDragDropEventHandler.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorService.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorServiceAdornerCollection.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorServiceAdornerCollectionEnumerator.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\ComponentGlyph.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\ControlBodyGlyph.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\Glyph.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\GlyphCollection.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\GlyphSelectionType.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLine.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLinePriority.cs" />
+    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLineType.cs" />
+    <Compile Include="System.Windows.Forms.Design\AnchorEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\AxImporter.cs" />
+    <Compile Include="System.Windows.Forms.Design\AxParameterData.cs" />
+    <Compile Include="System.Windows.Forms.Design\AxWrapperGen.cs" />
+    <Compile Include="System.Windows.Forms.Design\BorderSidesEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\ComponentDocumentDesigner.cs" />
+    <Compile Include="System.Windows.Forms.Design\ComponentTray.cs" />
+    <Compile Include="System.Windows.Forms.Design\ControlBindingsConverter.cs" />
+    <Compile Include="System.Windows.Forms.Design\ControlCodeDomSerializer.cs" />
+    <Compile Include="System.Windows.Forms.Design\ControlCollectionCodeDomSerializer.cs" />
+    <Compile Include="System.Windows.Forms.Design\ControlDataObject.cs" />
+    <Compile Include="System.Windows.Forms.Design\ControlDesigner.cs" />
+    <Compile Include="System.Windows.Forms.Design\DataMemberFieldConverter.cs" />
+    <Compile Include="System.Windows.Forms.Design\DataMemberFieldEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\DataMemberListEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\DataSourceConverter.cs" />
+    <Compile Include="System.Windows.Forms.Design\DefaultMenuCommands.cs" />
+    <Compile Include="System.Windows.Forms.Design\DesignerOptions.cs" />
+    <Compile Include="System.Windows.Forms.Design\DockEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\DocumentDesigner.cs" />
+    <Compile Include="System.Windows.Forms.Design\EventHandlerService.cs" />
+    <Compile Include="System.Windows.Forms.Design\FileNameEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\FolderNameEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\FormatStringEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\FormDocumentDesigner.cs" />
+    <Compile Include="System.Windows.Forms.Design\ImageCollectionEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\ImageIndexEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\ImageListCodeDomSerializer.cs" />
+    <Compile Include="System.Windows.Forms.Design\ImageListImageEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\IMenuEditorService.cs" />
+    <Compile Include="System.Windows.Forms.Design\IMessageReceiver.cs" />
+    <Compile Include="System.Windows.Forms.Design\IOleDragClient.cs" />
+    <Compile Include="System.Windows.Forms.Design\ISelectionUIHandler.cs" />
+    <Compile Include="System.Windows.Forms.Design\IUISelectionService.cs" />
+    <Compile Include="System.Windows.Forms.Design\ListControlStringCollectionEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\MaskDescriptor.cs" />
+    <Compile Include="System.Windows.Forms.Design\MenuCommands.cs" />
+    <Compile Include="System.Windows.Forms.Design\Native.cs" />
+    <Compile Include="System.Windows.Forms.Design\PanelDesigner.cs" />
+    <Compile Include="System.Windows.Forms.Design\ParentControlDesigner.cs" />
+    <Compile Include="System.Windows.Forms.Design\ScrollableControlDesigner.cs" />
+    <Compile Include="System.Windows.Forms.Design\SelectionFrame.cs" />
+    <Compile Include="System.Windows.Forms.Design\SelectionRules.cs" />
+    <Compile Include="System.Windows.Forms.Design\ShortcutKeysEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\SplitContainerDesigner.cs" />
+    <Compile Include="System.Windows.Forms.Design\StringArrayEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\StringCollectionEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\TabPageCollectionEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\UISelectionService.cs" />
+    <Compile Include="System.Windows.Forms.Design\WindowsFormsDesignerOptionService.cs" />
+    <Compile Include="System.Windows.Forms.Design\WndProcRouter.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../System/System-net_4_x.csproj">
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
+      <Name>System-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../System.XML/System.Xml-net_4_x.csproj">
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
+      <Name>System.Xml-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../System.Web/System.Web-plainweb-net_4_x.csproj">
+      <Project>{DE51B021-D51C-4F26-99EE-B0729D97631E}</Project>
+      <Name>System.Web-plainweb-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_x.csproj">
+      <Project>{108227C7-8ED9-4483-949D-07BF0DA1A201}</Project>
+      <Name>System.Windows.Forms-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_x.csproj">
+      <Project>{584A5E46-2958-4CB2-8DF9-188B420D0BB0}</Project>
+      <Name>System.Drawing-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../Accessibility/Accessibility-net_4_x.csproj">
+      <Project>{E51283DC-7090-479E-B723-01C0953F18EA}</Project>
+      <Name>Accessibility-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../System.Data/System.Data-net_4_x.csproj">
+      <Project>{EC439BB8-FFED-4A32-A05D-2FA3A70CAD64}</Project>
+      <Name>System.Data-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
+      <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
+      <Name>System.Configuration-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_x.csproj b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_x.csproj
index 5190562fe73..f00cf92ef4e 100644
--- a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_x.csproj
+++ b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -155,15 +158,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_x.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_x.csproj
index c31a24cab6f..31cfc603485 100644
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_x.csproj
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -188,15 +191,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_x.csproj b/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_x.csproj
index 989a4fb01a7..cd524385006 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_x.csproj
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -69,15 +72,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj b/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj
index 717d644d3d6..00f54219c78 100644
--- a/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj
+++ b/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -247,15 +250,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/PngCodecTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/PngCodecTest.cs
index a7964880cd6..c7ee9e4201b 100644
--- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/PngCodecTest.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/PngCodecTest.cs
@@ -71,6 +71,27 @@ namespace MonoTests.System.Drawing.Imaging {
 			return sRslt;
 		}
 
+		private bool IsArm64Process ()
+		{
+			if (Environment.OSVersion.Platform != PlatformID.Unix || !Environment.Is64BitProcess)
+				return false;
+
+			try {
+				var process = new global::System.Diagnostics.Process ();
+				process.StartInfo.FileName = "uname";
+				process.StartInfo.Arguments = "-m";
+				process.StartInfo.RedirectStandardOutput = true;
+				process.StartInfo.UseShellExecute = false;
+				process.Start ();
+				process.WaitForExit ();
+				var output = process.StandardOutput.ReadToEnd ();
+
+				return output.Trim () == "aarch64";
+			} catch {
+				return false;
+			}
+		}
+
 		/* Checks bitmap features on a known 1bbp bitmap */
 		[Test]
 		public void Bitmap1bitFeatures ()
@@ -290,6 +311,9 @@ namespace MonoTests.System.Drawing.Imaging {
 		[Test]
 		public void Bitmap2bitFeatures ()
 		{
+			if (IsArm64Process ())
+				Assert.Ignore ("https://bugzilla.xamarin.com/show_bug.cgi?id=41171");
+
 			string sInFile = getInFile ("bitmaps/81674-2bpp.png");
 			using (Bitmap bmp = new Bitmap (sInFile)) {
 				GraphicsUnit unit = GraphicsUnit.World;
@@ -318,6 +342,9 @@ namespace MonoTests.System.Drawing.Imaging {
 		[Test]
 		public void Bitmap2bitPixels ()
 		{
+			if (IsArm64Process ())
+				Assert.Ignore ("https://bugzilla.xamarin.com/show_bug.cgi?id=41171");
+
 			string sInFile = getInFile ("bitmaps/81674-2bpp.png");
 			using (Bitmap bmp = new Bitmap (sInFile)) {
 #if false
@@ -350,6 +377,9 @@ namespace MonoTests.System.Drawing.Imaging {
 		[Test]
 		public void Bitmap2bitData ()
 		{
+			if (IsArm64Process ())
+				Assert.Ignore ("https://bugzilla.xamarin.com/show_bug.cgi?id=41171");
+
 			string sInFile = getInFile ("bitmaps/81674-2bpp.png");
 			using (Bitmap bmp = new Bitmap (sInFile)) {
 				BitmapData data = bmp.LockBits (new Rectangle (0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb);
diff --git a/mcs/class/System.Dynamic/System.Dynamic-net_4_x.csproj b/mcs/class/System.Dynamic/System.Dynamic-net_4_x.csproj
index 66e4a839e55..788104cabe5 100644
--- a/mcs/class/System.Dynamic/System.Dynamic-net_4_x.csproj
+++ b/mcs/class/System.Dynamic/System.Dynamic-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,414,169</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -108,15 +111,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_x.csproj b/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_x.csproj
index ad856760b9a..d0a7c52ddb6 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_x.csproj
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,168,162</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -166,15 +169,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj
index 12081f084f3..63bf1dbfbf1 100644
--- a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj
+++ b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -58,15 +61,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.IO.Compression.FileSystem/Test/System.IO.Compression.FileSystem/ZipTest.cs b/mcs/class/System.IO.Compression.FileSystem/Test/System.IO.Compression.FileSystem/ZipTest.cs
index 0354311b478..4321db8534e 100644
--- a/mcs/class/System.IO.Compression.FileSystem/Test/System.IO.Compression.FileSystem/ZipTest.cs
+++ b/mcs/class/System.IO.Compression.FileSystem/Test/System.IO.Compression.FileSystem/ZipTest.cs
@@ -105,5 +105,31 @@ namespace MonoTests.System.IO.Compression.FileSystem
 
 			Directory.Delete ("extract", true);
 		}
+
+		[Test]
+		public void ZipCreateFromEntryChangeTimestamp()
+		{
+			if (File.Exists ("foo.zip"))
+				File.Delete ("foo.zip");
+
+			var file = "foo/foo.txt";
+			using (var archive = new ZipArchive(File.Open("foo.zip", FileMode.Create),
+				ZipArchiveMode.Update))
+			{
+				archive.CreateEntryFromFile(file, file);
+			}
+
+			var date = File.GetLastWriteTimeUtc(file);
+
+			using (var archive = new ZipArchive (File.Open ("foo.zip", FileMode.Open),
+				ZipArchiveMode.Read))
+			{
+				var entry = archive.GetEntry (file);
+				Assert.IsNotNull (entry);
+				Assert.AreEqual(entry.LastWriteTime.Year, date.Year);
+				Assert.AreEqual(entry.LastWriteTime.Month, date.Month);
+				Assert.AreEqual(entry.LastWriteTime.Day, date.Day);
+			}
+		}
 	}
 }
diff --git a/mcs/class/System.IO.Compression.FileSystem/ZipFileExtensions.cs b/mcs/class/System.IO.Compression.FileSystem/ZipFileExtensions.cs
index 07a8448171e..36c4146b485 100644
--- a/mcs/class/System.IO.Compression.FileSystem/ZipFileExtensions.cs
+++ b/mcs/class/System.IO.Compression.FileSystem/ZipFileExtensions.cs
@@ -56,6 +56,7 @@ namespace System.IO.Compression
 				FileAccess.Read, FileShare.Read))
 			{
 				var zipArchiveEntry = destination.CreateEntry (entryName, compressionLevel);
+				zipArchiveEntry.LastWriteTime = File.GetLastWriteTimeUtc(sourceFileName);
 
 				using (Stream entryStream = zipArchiveEntry.Open ())
 					stream.CopyTo (entryStream);
diff --git a/mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipArchiveEntry.cs b/mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipArchiveEntry.cs
index 121a6b31130..37cf1fcf7a8 100644
--- a/mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipArchiveEntry.cs
+++ b/mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipArchiveEntry.cs
@@ -32,5 +32,10 @@ namespace SharpCompress.Archive.Zip
         {
             get { return (Parts.Single() as SeekableZipFilePart).Comment; }
         }
+
+        public override string ToString()
+        {
+            return this.Key;
+        }
     }
 }
 \ No newline at end of file
diff --git a/mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipWritableArchiveEntry.cs b/mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipWritableArchiveEntry.cs
index acb5e2ddc29..f19a9c27647 100644
--- a/mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipWritableArchiveEntry.cs
+++ b/mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipWritableArchiveEntry.cs
@@ -10,7 +10,6 @@ namespace SharpCompress.Archive.Zip
     {
         private readonly string path;
         private readonly long size;
-        private readonly DateTime? lastModified;
         private readonly bool closeStream;
         private readonly Stream stream;
         private bool isDisposed;
@@ -22,7 +21,7 @@ namespace SharpCompress.Archive.Zip
             this.stream = stream;
             this.path = path;
             this.size = size;
-            this.lastModified = lastModified;
+            this.LastModifiedTime = lastModified;
             this.closeStream = closeStream;
         }
 
@@ -46,11 +45,6 @@ namespace SharpCompress.Archive.Zip
             get { return size; }
         }
 
-        public override DateTime? LastModifiedTime
-        {
-            get { return lastModified; }
-        }
-
         public override DateTime? CreatedTime
         {
             get { return null; }
diff --git a/mcs/class/System.IO.Compression/SharpCompress/Common/Zip/ZipEntry.cs b/mcs/class/System.IO.Compression/SharpCompress/Common/Zip/ZipEntry.cs
index 6ed742eeca3..2c0ec07e784 100644
--- a/mcs/class/System.IO.Compression/SharpCompress/Common/Zip/ZipEntry.cs
+++ b/mcs/class/System.IO.Compression/SharpCompress/Common/Zip/ZipEntry.cs
@@ -16,6 +16,13 @@ namespace SharpCompress.Common.Zip
                 this.filePart = filePart;
                 lastModifiedTime = Utility.DosDateToDateTime(filePart.Header.LastModifiedDate,
                                                              filePart.Header.LastModifiedTime);
+                if (lastModifiedTime == default(DateTime))
+                {
+                    // On .NET on Windows, for zip entries that don't have a last write time,
+                    // the return value for ZipArchiveEntry.LastWriteTime is:
+                    //   1/1/1980 12:00:00 AM, Ticks=624511296000000000
+                    lastModifiedTime = new DateTime(624511296000000000);
+                }
             }
         }
 
diff --git a/mcs/class/System.IO.Compression/SharpCompress/IO/ReadOnlySubStream.cs b/mcs/class/System.IO.Compression/SharpCompress/IO/ReadOnlySubStream.cs
index 1393dd6c70c..05c89d37194 100644
--- a/mcs/class/System.IO.Compression/SharpCompress/IO/ReadOnlySubStream.cs
+++ b/mcs/class/System.IO.Compression/SharpCompress/IO/ReadOnlySubStream.cs
@@ -16,6 +16,7 @@ namespace SharpCompress.IO
             {
                 stream.Position = origin.Value;
             }
+            length = bytesToRead;
             BytesLeftToRead = bytesToRead;
         }
 
@@ -27,6 +28,8 @@ namespace SharpCompress.IO
             }
         }
 
+        private long length;
+
         private long BytesLeftToRead { get; set; }
 
         public Stream Stream { get; private set; }
@@ -53,12 +56,12 @@ namespace SharpCompress.IO
 
         public override long Length
         {
-            get { throw new System.NotImplementedException(); }
+            get { return length; }
         }
 
         public override long Position
         {
-            get { throw new System.NotImplementedException(); }
+            get { return Length - BytesLeftToRead; }
             set { throw new System.NotImplementedException(); }
         }
 
diff --git a/mcs/class/System.IO.Compression/SharpCompress/Writer/Zip/ZipCentralDirectoryEntry.cs b/mcs/class/System.IO.Compression/SharpCompress/Writer/Zip/ZipCentralDirectoryEntry.cs
index 5060897cb9a..fb58a3c1fbb 100644
--- a/mcs/class/System.IO.Compression/SharpCompress/Writer/Zip/ZipCentralDirectoryEntry.cs
+++ b/mcs/class/System.IO.Compression/SharpCompress/Writer/Zip/ZipCentralDirectoryEntry.cs
@@ -22,7 +22,7 @@ namespace SharpCompress.Writer.Zip
             byte[] encodedFilename = Encoding.UTF8.GetBytes(FileName);
             byte[] encodedComment = Encoding.UTF8.GetBytes(Comment);
 
-            outputStream.Write(new byte[] {80, 75, 1, 2, 0x14, 0, 0x0A, 0}, 0, 8);
+            outputStream.Write(new byte[] {80, 75, 1, 2, 0x14, 0, 0x14, 0}, 0, 8);
             HeaderFlags flags = HeaderFlags.UTF8;
             if (!outputStream.CanSeek)
             {
diff --git a/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj b/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj
index 8b0dc94c4ee..48529c618dd 100644
--- a/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj
+++ b/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -147,15 +150,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.IO.Compression/Test/System.IO.Compression/ZipTest.cs b/mcs/class/System.IO.Compression/Test/System.IO.Compression/ZipTest.cs
index 36903c675b4..64b102c2d3d 100644
--- a/mcs/class/System.IO.Compression/Test/System.IO.Compression/ZipTest.cs
+++ b/mcs/class/System.IO.Compression/Test/System.IO.Compression/ZipTest.cs
@@ -239,6 +239,58 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		public void ZipEnumerateEntriesModifiedTime()
+		{
+			File.Copy("archive.zip", "test.zip", overwrite: true);
+			var date = DateTimeOffset.Now;
+			using (var archive = new ZipArchive(File.Open("test.zip", FileMode.Open),
+				ZipArchiveMode.Update))
+			{
+				var entry = archive.GetEntry("foo.txt");
+				entry.LastWriteTime = date;
+			}
+
+			using (var archive = new ZipArchive(File.Open("test.zip", FileMode.Open),
+				ZipArchiveMode.Read))
+			{
+				var entry = archive.GetEntry("foo.txt");
+				Assert.AreEqual(entry.LastWriteTime.Year, date.Year);
+				Assert.AreEqual(entry.LastWriteTime.Month, date.Month);
+				Assert.AreEqual(entry.LastWriteTime.Day, date.Day);
+
+			}
+
+			File.Delete ("test.zip");
+		}		
+
+		[Test]
+		public void ZipEnumerateArchiveDefaultLastWriteTime()
+		{
+			using (var archive = new ZipArchive(File.Open("test.nupkg", FileMode.Open),
+				ZipArchiveMode.Read))
+			{
+				var entry = archive.GetEntry("_rels/.rels");
+				Assert.AreEqual(new DateTime(624511296000000000).Ticks, entry.LastWriteTime.Ticks);
+				Assert.IsNotNull(entry);
+			}
+		}
+
+		[Test]
+		public void ZipGetArchiveEntryStreamLengthPositionReadMode()
+		{
+			using (var archive = new ZipArchive(File.Open("test.nupkg", FileMode.Open),
+				ZipArchiveMode.Read))
+			{
+				var entry = archive.GetEntry("_rels/.rels");
+				using (var stream = entry.Open())
+				{
+					Assert.AreEqual(0, stream.Position);
+					Assert.AreEqual(425, stream.Length);
+				}
+			}
+		}
+
+		[Test]
 		public void ZipEnumerateEntriesReadMode()
 		{
 			File.Copy("archive.zip", "test.zip", overwrite: true);
@@ -259,6 +311,87 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		public void ZipWriteEntriesUpdateMode()
+		{
+			File.Copy("archive.zip", "test.zip", overwrite: true);
+			using (var archive = new ZipArchive(File.Open("test.zip", FileMode.Open),
+				ZipArchiveMode.Update))
+			{
+				var foo = archive.GetEntry("foo.txt");
+				using (var stream = foo.Open())
+				using (var sw = new StreamWriter(stream))
+				{
+					sw.Write("TEST");
+				}
+			}
+
+			using (var archive = new ZipArchive(File.Open("test.zip", FileMode.Open),
+				ZipArchiveMode.Read))
+			{
+				var foo = archive.GetEntry("foo.txt");
+				using (var stream = foo.Open())
+				using (var sr = new StreamReader(stream))
+				{
+					var line = sr.ReadLine();
+					Assert.AreEqual("TEST", line);
+				}
+			}
+
+			File.Delete ("test.zip");
+		}
+
+		[Test]
+		public void ZipWriteEntriesUpdateModeNewEntry()
+		{
+			var stream = new MemoryStream();
+			var zipArchive = new ZipArchive(stream, ZipArchiveMode.Update);
+
+			var newEntry = zipArchive.CreateEntry("testEntry");
+
+			using (var newStream = newEntry.Open())
+			{
+				using (var sw = new StreamWriter(newStream))
+				{
+					sw.Write("TEST");
+				}
+			}
+		}
+
+		[Test]
+		public void ZipWriteEntriesUpdateModeNonZeroPosition()
+		{
+			File.Copy("archive.zip", "test.zip", overwrite: true);
+			using (var archive = new ZipArchive(File.Open("test.zip", FileMode.Open),
+				ZipArchiveMode.Update))
+			{
+				var foo = archive.GetEntry("foo.txt");
+				using (var stream = foo.Open())
+				{
+					var line = stream.ReadByte();
+					using (var sw = new StreamWriter(stream))
+					{
+						sw.Write("TEST");
+					}
+				}
+			}
+
+			using (var archive = new ZipArchive(File.Open("test.zip", FileMode.Open),
+				ZipArchiveMode.Read))
+			{
+				var entries = archive.Entries;
+				var foo = archive.GetEntry("foo.txt");
+				using (var stream = foo.Open())
+				using (var sr = new StreamReader(stream))
+				{
+					var line = sr.ReadLine();
+					Assert.AreEqual("fTEST", line);
+				}
+			}
+
+			File.Delete ("test.zip");
+		}
+
+		[Test]
 		public void ZipEnumerateEntriesUpdateMode()
 		{
 			File.Copy("archive.zip", "test.zip", overwrite: true);
diff --git a/mcs/class/System.IO.Compression/ZipArchive.cs b/mcs/class/System.IO.Compression/ZipArchive.cs
index f2ef892a910..4f0c7bb70b9 100644
--- a/mcs/class/System.IO.Compression/ZipArchive.cs
+++ b/mcs/class/System.IO.Compression/ZipArchive.cs
@@ -161,6 +161,14 @@ namespace System.IO.Compression
 			return CreateEntry(entryName, CompressionLevel.Optimal);
 		}
 
+		internal SharpCompress.Archive.Zip.ZipArchiveEntry CreateEntryInternal(string entryName)
+		{
+			var memoryStream = new MemoryStream();
+			var entry = zipFile.AddEntry(entryName, memoryStream);
+
+			return entry;
+		}
+
 		public ZipArchiveEntry CreateEntry (string entryName, CompressionLevel compressionLevel)
 		{
 			if (disposed)
@@ -178,9 +186,8 @@ namespace System.IO.Compression
 			if (zipFile == null)
 				throw new InvalidDataException("The zip archive is corrupt, and its entries cannot be retrieved.");
 
-			var memoryStream = new MemoryStream();
-			var entry = zipFile.AddEntry(entryName, memoryStream);
-			var archiveEntry = new ZipArchiveEntry(this, entry);
+			var internalEntry = CreateEntryInternal(entryName);
+			var archiveEntry = new ZipArchiveEntry(this, internalEntry);
 			entries[entryName] = archiveEntry;
 
 			return archiveEntry;
diff --git a/mcs/class/System.IO.Compression/ZipArchiveEntry.cs b/mcs/class/System.IO.Compression/ZipArchiveEntry.cs
index 0bc69786418..002b6f14ceb 100644
--- a/mcs/class/System.IO.Compression/ZipArchiveEntry.cs
+++ b/mcs/class/System.IO.Compression/ZipArchiveEntry.cs
@@ -32,7 +32,7 @@ namespace System.IO.Compression
 	internal class ZipArchiveEntryStream : Stream, IDisposable
 	{
 		private readonly ZipArchiveEntry entry;
-		private readonly Stream stream;
+		private Stream stream;
 
 		public override bool CanRead {
 			get { 
@@ -42,13 +42,13 @@ namespace System.IO.Compression
 
 		public override bool CanSeek {
 			get {
-				return stream.CanSeek;
+				return entry.Archive.Mode != ZipArchiveMode.Read;
 			}
 		}
 
 		public override bool CanWrite {
 			get {
-				return stream.CanWrite;
+				return entry.Archive.Mode != ZipArchiveMode.Read;
 			}
 		}
 
@@ -95,9 +95,40 @@ namespace System.IO.Compression
 
 		public override void Write (byte[] buffer, int offset, int count)
 		{
+			if (entry.Archive.Mode == ZipArchiveMode.Update && !entry.wasWritten)
+			{
+				// Replace the read-only stream with a writeable memory stream.
+				if (!stream.CanWrite)
+				    SetWriteable();
+				entry.wasWritten = true;
+			}
+
 			stream.Write(buffer, offset, count);
 		}
 
+		internal void SetWriteable()
+		{
+			var archive = entry.Archive;
+
+			var internalEntry = entry.entry;
+			var newEntry = archive.CreateEntryInternal(internalEntry.Key);
+			var newStream = newEntry.OpenEntryStream();
+
+			var openStream = stream;
+			var position = openStream.Position;
+
+			entry.openStream = null;
+			entry.Open();
+
+			openStream.CopyTo(newStream);
+			newStream.Position = position;
+			openStream.Dispose();
+
+			archive.zipFile.RemoveEntry(internalEntry);
+			entry.entry = newEntry;
+			stream = newStream;
+		}
+
 		public new void Dispose()
 		{
 			Dispose(true);
@@ -117,8 +148,9 @@ namespace System.IO.Compression
 
 	public class ZipArchiveEntry
 	{
-		readonly SharpCompress.Archive.Zip.ZipArchiveEntry entry;
+		internal SharpCompress.Archive.Zip.ZipArchiveEntry entry;
 		internal ZipArchiveEntryStream openStream;
+        internal bool wasWritten;
 		private bool wasDeleted;
 
 		internal ZipArchiveEntry(ZipArchive	archive, SharpCompress.Archive.Zip.ZipArchiveEntry entry)
@@ -174,7 +206,7 @@ namespace System.IO.Compression
 			if (Archive.disposed)
 				throw new ObjectDisposedException("The zip archive for this entry has been disposed.");
 
-			if (Archive.Mode !=	ZipArchiveMode.Update)
+			if (Archive.Mode != ZipArchiveMode.Update)
 				throw new NotSupportedException("The zip archive for this entry was opened in a mode other than Update.");
 
 			if (openStream != null)
@@ -198,9 +230,15 @@ namespace System.IO.Compression
 			if (Archive.Mode == ZipArchiveMode.Create && openStream != null)
 				throw new IOException("The archive for this entry was opened with the Create mode, and this entry has already been written to.");
 
-			openStream = new ZipArchiveEntryStream(this, entry.OpenEntryStream());
+			var entryStream = entry.OpenEntryStream();
+			openStream = new ZipArchiveEntryStream(this, entryStream);
 
 			return openStream;
 		}
+
+		public override string ToString()
+		{
+			return FullName;
+		}
 	}
 }
diff --git a/mcs/class/System.IO.Compression/test.nupkg b/mcs/class/System.IO.Compression/test.nupkg
new file mode 100644
index 00000000000..0a7fe0575c0
--- /dev/null
+++ b/mcs/class/System.IO.Compression/test.nupkg
diff --git a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_x.csproj b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_x.csproj
index a7f602619e0..e834a58af15 100644
--- a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_x.csproj
+++ b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -68,15 +71,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.IdentityModel/System.IdentityModel-net_4_x.csproj b/mcs/class/System.IdentityModel/System.IdentityModel-net_4_x.csproj
index 5a0a057bb66..ea349ebcc43 100644
--- a/mcs/class/System.IdentityModel/System.IdentityModel-net_4_x.csproj
+++ b/mcs/class/System.IdentityModel/System.IdentityModel-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -184,15 +187,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -203,10 +205,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
-      <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
-      <Name>System.Web.ApplicationServices-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -235,6 +233,10 @@
       <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>
       <Name>System.Web-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
+      <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
+      <Name>System.Web.ApplicationServices-net_4_x</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/System.Json.Microsoft/Makefile b/mcs/class/System.Json.Microsoft/Makefile
index 4c2329392d3..56c51c6330d 100644
--- a/mcs/class/System.Json.Microsoft/Makefile
+++ b/mcs/class/System.Json.Microsoft/Makefile
@@ -2,14 +2,11 @@ thisdir = class/System.Json.Microsoft
 SUBDIRS = 
 include ../../build/rules.make
 
-System.Json.Properties.Resources.resources: System.Json/Properties/Resources.resx
-	$(RESGEN) "$<" "$@"
+RESOURCE_DEFS = System.Json.Properties.Resources,System.Json/Properties/Resources.resx
 
 LIBRARY = System.Json.Microsoft.dll
 LIB_REFS = System System.Xml System.Core System.Runtime.Serialization
-LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \
-		/resource:System.Json.Properties.Resources.resources
-
+LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign 
 EXTRA_DISTFILES = System.Json/Properties/Resources.resx
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
@@ -24,5 +21,3 @@ endif
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 include ../../build/library.make
-
-$(the_lib): System.Json.Properties.Resources.resources
diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj
index a44cb7d17f1..136d3cc0f0f 100644
--- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj
+++ b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -79,15 +82,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -123,7 +125,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="System.Json.Properties.Resources.resources">
+    <EmbeddedResource Include="System.Json/Properties/Resources.resx">
       <LogicalName>System.Json.Properties.Resources.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Json/System.Json-net_4_x.csproj b/mcs/class/System.Json/System.Json-net_4_x.csproj
index a9259ace8db..5a5dadfa168 100644
--- a/mcs/class/System.Json/System.Json-net_4_x.csproj
+++ b/mcs/class/System.Json/System.Json-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -61,15 +64,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Management/System.Management-net_4_x.csproj b/mcs/class/System.Management/System.Management-net_4_x.csproj
index 39722008329..7d9b5c40172 100644
--- a/mcs/class/System.Management/System.Management-net_4_x.csproj
+++ b/mcs/class/System.Management/System.Management-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -124,15 +127,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Messaging/System.Messaging-net_4_x.csproj b/mcs/class/System.Messaging/System.Messaging-net_4_x.csproj
index d0bfd99eb32..939068bd6f7 100644
--- a/mcs/class/System.Messaging/System.Messaging-net_4_x.csproj
+++ b/mcs/class/System.Messaging/System.Messaging-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -107,15 +110,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Net.Http.Formatting/Makefile b/mcs/class/System.Net.Http.Formatting/Makefile
index e6bee285bd1..43895c07c86 100644
--- a/mcs/class/System.Net.Http.Formatting/Makefile
+++ b/mcs/class/System.Net.Http.Formatting/Makefile
@@ -4,19 +4,12 @@ include ../../build/rules.make
 
 LIBRARY = System.Net.Http.Formatting.dll
 
-System.Net.Http.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx
-	$(RESGEN) "$<" "$@"
+RESOURCE_DEFS = \
+	System.Net.Http.Properties.CommonWebApiResources,../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx \
+	System.Net.Http.Properties.Resources,../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Properties/Resources.resx
 
-System.Net.Http.Properties.Resources.resources: ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Properties/Resources.resx
-	$(RESGEN) "$<" "$@"
 
 LIB_REFS = System.Core System System.Net.Http System.Xml System.Runtime.Serialization System.Xml.Linq System.Data System.Configuration
-LIB_MCS_FLAGS = \
-		-d:ASPNETMVC -keyfile:../winfx.pub -delaysign \
-		-resource:System.Net.Http.Properties.CommonWebApiResources.resources \
-		-resource:System.Net.Http.Properties.Resources.resources
+LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign 
 
 include ../../build/library.make
-
-$(the_lib): System.Net.Http.Properties.CommonWebApiResources.resources \
-	System.Net.Http.Properties.Resources.resources
diff --git a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj
index 528b66c4fbd..f987c65b4e4 100644
--- a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj
+++ b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -295,15 +298,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -351,10 +353,10 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="System.Net.Http.Properties.CommonWebApiResources.resources">
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx">
       <LogicalName>System.Net.Http.Properties.CommonWebApiResources.resources</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="System.Net.Http.Properties.Resources.resources">
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Properties/Resources.resx">
       <LogicalName>System.Net.Http.Properties.Resources.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest-net_4_x.csproj b/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest-net_4_x.csproj
index 9b7f6d8af71..519b2833cba 100644
--- a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest-net_4_x.csproj
+++ b/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -57,15 +60,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Net.Http/CFNetworkHandler.cs b/mcs/class/System.Net.Http/CFNetworkHandler.cs
index 5723acb0b1c..6daf9e10a27 100644
--- a/mcs/class/System.Net.Http/CFNetworkHandler.cs
+++ b/mcs/class/System.Net.Http/CFNetworkHandler.cs
@@ -61,7 +61,9 @@ namespace System.Net.Http
 			public void Close ()
 			{
 				CancellationTokenRegistration.Dispose ();
-				ContentStream.Close ();
+                                if (ContentStream != null) {
+                                    ContentStream.Close ();
+                                }
 			}
 		}
 
@@ -98,7 +100,7 @@ namespace System.Net.Http
 
 		public CookieContainer CookieContainer {
 			get {
-				return cookies;
+				return cookies ?? (cookies = new CookieContainer ());
 			}
 			set {
 				EnsureModifiability ();
diff --git a/mcs/class/System.Net.Http/System.Net.Http-net_4_x.csproj b/mcs/class/System.Net.Http/System.Net.Http-net_4_x.csproj
index c27b6d1bb5e..e6e2d68457e 100644
--- a/mcs/class/System.Net.Http/System.Net.Http-net_4_x.csproj
+++ b/mcs/class/System.Net.Http/System.Net.Http-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -107,15 +110,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
index 0a9d60fb98e..94ad2ffb274 100644
--- a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
@@ -245,8 +245,6 @@ namespace System.Net.Http
 				wr.KeepAlive = request.Headers.ConnectionClose != true;
 			}
 
-			wr.ServicePoint.Expect100Continue = request.Headers.ExpectContinue == true;
-
 			if (allowAutoRedirect) {
 				wr.AllowAutoRedirect = true;
 				wr.MaximumAutomaticRedirections = maxAutomaticRedirections;
@@ -270,8 +268,13 @@ namespace System.Net.Http
 
 			if (useProxy) {
 				wr.Proxy = proxy;
+			} else {
+				// Disables default WebRequest.DefaultWebProxy value
+				wr.Proxy = null;
 			}
 
+			wr.ServicePoint.Expect100Continue = request.Headers.ExpectContinue == true;
+
 			// Add request headers
 			var headers = wr.Headers;
 			foreach (var header in request.Headers) {
@@ -294,7 +297,7 @@ namespace System.Net.Http
 				if (values_formated == null)
 					continue;
 
-				headers.AddValue (header.Key, values_formated);
+				headers.AddInternal (header.Key, values_formated);
 			}
 			
 			return wr;
@@ -343,7 +346,7 @@ namespace System.Net.Http
 
 						foreach (var header in content.Headers) {
 							foreach (var value in header.Value) {
-								headers.AddValue (header.Key, value);
+								headers.AddInternal (header.Key, value);
 							}
 						}
 
diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
index 4d9265a6ac7..aa678a036e6 100644
--- a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
+++ b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
@@ -150,6 +150,29 @@ namespace MonoTests.System.Net.Http
 			}
 		}
 
+		class ThrowOnlyProxy : IWebProxy
+		{
+			public ICredentials Credentials {
+				get {
+					throw new NotImplementedException ();
+				}
+
+				set {
+					throw new NotImplementedException ();
+				}
+			}
+
+			public Uri GetProxy (Uri destination)
+			{
+				throw new NotImplementedException ();
+			}
+
+			public bool IsBypassed (Uri host)
+			{
+				throw new NotImplementedException ();
+			}
+		}
+
 		const int WaitTimeout = 5000;
 
 		string TestHost, LocalServer;
@@ -298,6 +321,25 @@ namespace MonoTests.System.Net.Http
 		}
 
 		[Test]
+		public void Proxy_Disabled ()
+		{
+			var pp = WebRequest.DefaultWebProxy;
+
+			try {
+				WebRequest.DefaultWebProxy = new ThrowOnlyProxy ();
+
+				var request = new HttpClientHandler {
+					UseProxy = false
+				};
+
+				var client = new HttpClient (request);
+				Assert.IsTrue (client.GetAsync ("http://google.com").Wait (5000), "needs internet access");
+			} finally {
+				WebRequest.DefaultWebProxy = pp;
+			}
+		}
+
+		[Test]
 		public void Send ()
 		{
 			var mh = new HttpMessageHandlerMock ();
diff --git a/mcs/class/System.Net/System.Net-net_4_x.csproj b/mcs/class/System.Net/System.Net-net_4_x.csproj
index 560915d4412..ac5858d1adb 100644
--- a/mcs/class/System.Net/System.Net-net_4_x.csproj
+++ b/mcs/class/System.Net/System.Net-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,1720</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -58,15 +61,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors-net_4_x.csproj b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors-net_4_x.csproj
index 4d1c89c2b95..f782c91e5cd 100644
--- a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors-net_4_x.csproj
+++ b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -56,15 +59,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Numerics/System.Numerics-net_4_x.csproj b/mcs/class/System.Numerics/System.Numerics-net_4_x.csproj
index ce687f78e5b..6fe1d3aa59a 100644
--- a/mcs/class/System.Numerics/System.Numerics-net_4_x.csproj
+++ b/mcs/class/System.Numerics/System.Numerics-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,13 +48,13 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\BigInteger.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\BigIntegerBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\BigNumber.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\Complex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\NumericsHelpers.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.Numerics\System\Numerics\BigInteger.cs" />
+    <Compile Include="..\referencesource\System.Numerics\System\Numerics\BigIntegerBuilder.cs" />
+    <Compile Include="..\referencesource\System.Numerics\System\Numerics\BigNumber.cs" />
+    <Compile Include="..\referencesource\System.Numerics\System\Numerics\Complex.cs" />
+    <Compile Include="..\referencesource\System.Numerics\System\Numerics\NumericsHelpers.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\Environment.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
  </ItemGroup>
@@ -63,15 +66,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj b/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
index 0667fe1e877..7b3dfa248de 100644
--- a/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -138,15 +141,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -157,10 +159,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_x.csproj">
-      <Project>{0DA7868F-C598-4E45-B33C-86FBB482DB76}</Project>
-      <Name>System.Reactive.Interfaces-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -178,7 +176,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_Core.resources">
+    <EmbeddedResource Include="Strings_Core.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_Core.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_x.csproj b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_x.csproj
index 67062add4da..0fef571313a 100644
--- a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -62,15 +65,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_x.csproj b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_x.csproj
index 3c232a80ea8..55e768b3fa4 100644
--- a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -70,15 +73,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_x.csproj b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_x.csproj
index dac48b46c5f..f0057b389b2 100644
--- a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -84,15 +87,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj b/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
index 42bc7b4cecb..67b2b8a8844 100644
--- a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -231,15 +234,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -250,10 +252,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_x.csproj">
-      <Project>{52F7F1BD-9D67-494E-A53A-C291FF5424B4}</Project>
-      <Name>System.Reactive.Core-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -275,7 +273,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_Linq.resources">
+    <EmbeddedResource Include="Strings_Linq.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_Linq.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_x.csproj b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_x.csproj
index 5d0d156abcf..fcff09f9daf 100644
--- a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -62,15 +65,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -81,10 +83,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj">
-      <Project>{22187CB5-7451-45B4-B21B-337D956FF05D}</Project>
-      <Name>System.Reactive.Providers-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
diff --git a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
index bbc57d1ad74..538ff9529d9 100644
--- a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
+++ b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -79,15 +82,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -98,10 +100,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj">
-      <Project>{EE5FC05D-135B-460A-9F0D-7F5084F4DBD7}</Project>
-      <Name>System.Reactive.Linq-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -127,7 +125,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_PlatformServices.resources">
+    <EmbeddedResource Include="Strings_PlatformServices.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_PlatformServices.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
index cec12f112e1..0099448bd54 100644
--- a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -72,15 +75,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -91,10 +93,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj">
-      <Project>{EE5FC05D-135B-460A-9F0D-7F5084F4DBD7}</Project>
-      <Name>System.Reactive.Linq-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -120,7 +118,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_Providers.resources">
+    <EmbeddedResource Include="Strings_Providers.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_Providers.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_x.csproj b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_x.csproj
index c33479a03fe..2802930f4d4 100644
--- a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -64,15 +67,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -83,10 +85,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj">
-      <Project>{EE5FC05D-135B-460A-9F0D-7F5084F4DBD7}</Project>
-      <Name>System.Reactive.Linq-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
diff --git a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_x.csproj b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_x.csproj
index c3d0ff04d86..6aacf0d324f 100644
--- a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -64,15 +67,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -83,10 +85,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_x.csproj">
-      <Project>{108227C7-8ED9-4483-949D-07BF0DA1A201}</Project>
-      <Name>System.Windows.Forms-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
diff --git a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
index 2922af8368b..2399dc270ca 100644
--- a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -68,15 +71,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -87,10 +89,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../WindowsBase/WindowsBase-net_4_x.csproj">
-      <Project>{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}</Project>
-      <Name>WindowsBase-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -120,7 +118,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_WindowsThreading.resources">
+    <EmbeddedResource Include="Strings_WindowsThreading.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_WindowsThreading.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj
index 9f23ad69ec2..3089b404bdf 100644
--- a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj
+++ b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,414</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,51 +48,51 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\Resources\RH.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryChangeMonitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedArguments.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedReason.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryUpdateArguments.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryUpdateCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheItem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheItemPolicy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheItemPriority.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheMemoryMonitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\ChangeMonitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\CachingSectionGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\ConfigUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\MemoryCacheElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\MemoryCacheSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\MemoryCacheSettingsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Dbg.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\DefaultCacheCapabilities.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\EntryState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\FileChangeMonitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\FileChangeNotificationSystem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\HostFileChangeMonitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Hosting\IApplicationIdentifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Hosting\IFileChangeNotificationSystem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Hosting\IMemoryCacheManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheEntryChangeMonitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheKeyEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheStatistics.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheStore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryMonitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\ObjectCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\OnChangedCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\PerfCounterName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\PerfCounters.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\PhysicalMemoryMonitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\SafeBitVector32.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\SafeRegistryHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\SqlChangeMonitor.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\Resources\RH.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheEntryChangeMonitor.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedArguments.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedCallback.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedReason.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheEntryUpdateArguments.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheEntryUpdateCallback.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheItem.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheItemPolicy.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheItemPriority.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheMemoryMonitor.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\ChangeMonitor.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\Configuration\CachingSectionGroup.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\Configuration\ConfigUtil.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\Configuration\MemoryCacheElement.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\Configuration\MemoryCacheSection.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\Configuration\MemoryCacheSettingsCollection.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\Dbg.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\DefaultCacheCapabilities.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\EntryState.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\FileChangeMonitor.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\FileChangeNotificationSystem.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\HostFileChangeMonitor.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\Hosting\IApplicationIdentifier.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\Hosting\IFileChangeNotificationSystem.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\Hosting\IMemoryCacheManager.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\MemoryCache.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheEntry.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheEntryChangeMonitor.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheKey.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheKeyEqualityComparer.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheStatistics.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheStore.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\MemoryMonitor.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\ObjectCache.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\OnChangedCallback.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\PerfCounterName.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\PerfCounters.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\PhysicalMemoryMonitor.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\SafeBitVector32.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\SafeRegistryHandle.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\SqlChangeMonitor.cs" />
     <Compile Include="..\System.Web\System.Web.Configuration_2.0\NullableStringValidator.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\CacheEntryCollection.cs" />
@@ -105,15 +108,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_x.csproj b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_x.csproj
index 49893fe21ca..480589216b3 100644
--- a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_x.csproj
+++ b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,54 +48,54 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\DisassociateInstanceKeysExtension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\IDurableInstancingOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceCollisionException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceCompleteException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceHandleConflictException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceHandleReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyCollisionException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyCompleteException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyNotReadyException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockedException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockLostException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockQueryResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceNormalEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceNotReadyException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwnerException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwnerQueryResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistence.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceCommandException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceStore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceStoreQueryResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceValue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceValueConsistency.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceValueOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\ICancelable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\IPersistencePipelineModule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\PersistenceMetadataNamespace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\PersistencePipeline.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\TransactedAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\TransactionHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\Workflow45Namespace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\WorkflowNamespace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\WorkflowServiceNamespace.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\AssemblyInfo.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\DisassociateInstanceKeysExtension.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\IDurableInstancingOptions.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceCollisionException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceCompleteException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceHandle.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceHandleConflictException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceHandleReference.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKey.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyCollisionException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyCompleteException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyNotReadyException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyState.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyView.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockedException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockLostException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockQueryResult.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceNormalEvent.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceNotReadyException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwner.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwnerException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwnerQueryResult.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistence.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceCommand.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceCommandException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceContext.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceEvent.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceState.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceStore.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceStoreQueryResult.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceValue.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceValueConsistency.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceValueOptions.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceView.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\ICancelable.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\IPersistencePipelineModule.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\PersistenceMetadataNamespace.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\PersistencePipeline.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\TransactedAsyncResult.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\TransactionHelper.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\Workflow45Namespace.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\WorkflowNamespace.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\WorkflowServiceNamespace.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="SRCore.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -103,15 +106,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj
index 8dccbd5b0a2..5601f7c47a1 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -120,15 +123,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -143,10 +145,6 @@
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Web/System.Web-net_4_x.csproj">
-      <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>
-      <Name>System.Web-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System.XML/System.Xml-net_4_x.csproj">
       <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
       <Name>System.Xml-net_4_x</Name>
@@ -155,6 +153,10 @@
       <Project>{A157AD69-59D4-49DE-94B3-DB883B2BEAA5}</Project>
       <Name>System.Runtime.Serialization.Formatters.Soap-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../System.Web/System.Web-net_4_x.csproj">
+      <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>
+      <Name>System.Web-net_4_x</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_x.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_x.csproj
index 6a3669bd10e..d5192c051b0 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_x.csproj
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -61,15 +64,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/InternalSoapValuesTest.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/InternalSoapValuesTest.cs
index cbab4c217e3..86b4617162f 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/InternalSoapValuesTest.cs
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/InternalSoapValuesTest.cs
@@ -53,7 +53,7 @@ namespace SoapShared
 			Serialize(obj, ms);
 			ms.Position = 0;
 			Object des = Deserialize(ms);
-			Assertion.AssertEquals(obj.GetType(), des.GetType());
+			Assert.AreEqual (obj.GetType(), des.GetType());
 		}
 
 		private void Serialize(object ob, Stream stream)
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SerializationTest.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SerializationTest.cs
index d3914d9b327..3aee88df4a8 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SerializationTest.cs
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SerializationTest.cs
@@ -222,7 +222,7 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap
 			if (expected != null && expected.GetType().IsArray)
 				EqualsArray (message, (Array)expected, (Array)actual);
 			else
-				Assertion.AssertEquals (message, expected, actual);
+				Assert.AreEqual (expected, actual, message);
 		}
 
 		public static void EqualsArray (string message, object oar1, object oar2)
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SoapFormatterTest.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SoapFormatterTest.cs
index 9735ce04b04..91fdd7857d8 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SoapFormatterTest.cs
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SoapFormatterTest.cs
@@ -171,8 +171,8 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
 		
 		private object Serialize(object objGraph) {
 			MemoryStream stream = new MemoryStream();
-			Assertion.Assert(objGraph != null);
-			Assertion.Assert(stream != null);
+			Assert.IsTrue(objGraph != null);
+			Assert.IsTrue(stream != null);
 			_soapFormatter.SurrogateSelector = _surrogate;
 			_soapFormatter.Serialize(stream, objGraph);
 			
@@ -182,8 +182,8 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
 			stream.Position = 0;
 			
 			object objReturn = _soapFormatterDeserializer.Deserialize(stream);
-			Assertion.Assert(objReturn != null);
-			Assertion.AssertEquals("#Tests "+objGraph.GetType(), objGraph.GetType(), objReturn.GetType());
+			Assert.IsTrue(objReturn != null);
+			Assert.AreEqual(objGraph.GetType(), objReturn.GetType(), "#Tests "+objGraph.GetType());
 			stream = new MemoryStream();
 			_soapFormatter.Serialize(stream, objReturn);
 			stream.Position = 0;
@@ -209,19 +209,19 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
 		public void TestValueTypes() {
 			object objReturn;
 			objReturn = Serialize((short)1);
-			Assertion.AssertEquals("#int16", objReturn, 1);
+			Assert.AreEqual(objReturn, 1, "#int16");
 			objReturn = Serialize(1);
-			Assertion.AssertEquals("#int32", objReturn, 1);
+			Assert.AreEqual(objReturn, 1, "#int32");
 			objReturn = Serialize((Single)0.1234);
-			Assertion.AssertEquals("#Single", objReturn, 0.123400003f);
+			Assert.AreEqual(objReturn, 0.123400003f, "#Single");
 			objReturn = Serialize((Double)1234567890.0987654321);
-			Assertion.AssertEquals("#iDouble", objReturn, 1234567890.0987654321);
+			Assert.AreEqual(objReturn, 1234567890.0987654321, "#iDouble");
 			objReturn = Serialize(true);
-			Assertion.AssertEquals("#Bool", objReturn, true);
+			Assert.AreEqual(objReturn, true, "#Bool");
 			objReturn = Serialize((Int64) 1234567890);
-			Assertion.AssertEquals("#Int64", objReturn, 1234567890);
+			Assert.AreEqual(objReturn, 1234567890, "#Int64");
 			objReturn = Serialize('c');
-			Assertion.AssertEquals("#Char", objReturn, 'c');
+			Assert.AreEqual(objReturn, 'c', "#Char");
 		}
 		
 		[Test]
@@ -229,7 +229,7 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
 			object objReturn;
 			objReturn = Serialize("");
 			objReturn = Serialize("hello world!");
-			Assertion.AssertEquals("#string", "hello world!", objReturn);
+			Assert.AreEqual("hello world!", objReturn, "#string");
 			SoapMessage soapMsg = new SoapMessage();
 			soapMsg.Headers = new Header[0];
 			soapMsg.MethodName = "Equals";
@@ -242,27 +242,27 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
 			_soapFormatterDeserializer.TopObject = null;
 			SimpleObject obj = new SimpleObject("simple object", 1);
 			objReturn = Serialize(obj);
-			Assertion.AssertEquals("#SimpleObject", obj, objReturn);
+			Assert.AreEqual(obj, objReturn, "#SimpleObject");
 			objReturn = Serialize(typeof(SimpleObject));
-			Assertion.AssertEquals("#Type", typeof(SimpleObject), (Type)objReturn);
+			Assert.AreEqual(typeof(SimpleObject), (Type)objReturn, "#Type");
 			objReturn = Serialize(obj.GetType().Assembly);
-			Assertion.AssertEquals("#Assembly", obj.GetType().Assembly, objReturn);
+			Assert.AreEqual(obj.GetType().Assembly, objReturn, "#Assembly");
 		}
 		
 		public static bool CheckArray(object objTest, object objReturn) {
 			Array objTestAsArray = objTest as Array;
 			Array objReturnAsArray = objReturn as Array;
 			
-			Assertion.Assert("#Not an Array "+objTest, objReturnAsArray != null);
-			Assertion.AssertEquals("#Different lengths "+objTest, objTestAsArray.Length, objReturnAsArray.Length);
-			
+			Assert.IsTrue(objReturnAsArray != null, "#Not an Array "+objTest);
+			Assert.AreEqual(objTestAsArray.Length, objReturnAsArray.Length, "#Different lengths "+objTest);
+			
 			IEnumerator iEnum = objReturnAsArray.GetEnumerator();
 			iEnum.Reset();
 			object obj2;
 			foreach(object obj1 in objTestAsArray) {
 				iEnum.MoveNext();
 				obj2 = iEnum.Current;
-				Assertion.AssertEquals("#The content of the 2 arrays is different", obj1, obj2);
+				Assert.AreEqual(obj1, obj2, "#The content of the 2 arrays is different");
 			}
 			
 			return true;
@@ -315,9 +315,9 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
 			MoreComplexObject objReturn;
 			MoreComplexObject objTest = new MoreComplexObject();
 			objReturn = (MoreComplexObject) Serialize(objTest);
-			Assertion.AssertEquals("#Equals", objTest, objReturn);
+			Assert.AreEqual(objTest, objReturn, "#Equals");
 			objReturn.OnTrucEvent("bidule");
-			Assertion.AssertEquals("#dlg", "bidule", objReturn.ObjString);
+			Assert.AreEqual("bidule", objReturn.ObjString, "#dlg");
 		}
 
 		[Test]
@@ -333,9 +333,9 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
 			_soapFormatterDeserializer.Binder = new Version1ToVersion2Binder();
 			objReturn = _soapFormatterDeserializer.Deserialize(stream);
 
-			Assertion.AssertEquals("#Version1 Version2", "Version2", objReturn.GetType().Name);
-			Assertion.AssertEquals("#_value", 123, ((Version2) objReturn)._value);
-			Assertion.AssertEquals("#_foo", "Default value", ((Version2) objReturn)._foo);
+			Assert.AreEqual("Version2", objReturn.GetType().Name, "#Version1 Version2");
+			Assert.AreEqual(123, ((Version2) objReturn)._value, "#_value");
+			Assert.AreEqual("Default value", ((Version2) objReturn)._foo, "#_foo");
 		}
 		
 		[Test]
@@ -360,17 +360,17 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
 			sf.TopObject = t;
 			t = (SoapMessage) sf.Deserialize (ms);
 			
-			Assertion.AssertNotNull ("#1", t.Headers[0].Value);
-			Assertion.AssertEquals ("#2", t.Headers[0].Value.GetType (), typeof(Type[]));
+			Assert.IsNotNull (t.Headers[0].Value, "#1");
+			Assert.AreEqual (t.Headers[0].Value.GetType (), typeof(Type[]), "#2");
 			
 			Type[] ts = (Type[]) t.Headers[0].Value;
 			
-			Assertion.AssertEquals ("#3", 2, ts.Length);
-			Assertion.AssertNotNull ("#4", ts[0]);
-			Assertion.AssertNotNull ("#5", ts[1]);
+			Assert.AreEqual (2, ts.Length, "#3");
+			Assert.IsNotNull (ts[0], "#4");
+			Assert.IsNotNull (ts[1], "#5");
 			Console.WriteLine ("PPP:" + ts[0].GetType());
-			Assertion.AssertEquals ("#6", typeof(string), ts[0]);
-			Assertion.AssertEquals ("#7", typeof(SignatureTest[]), ts[1]);
+			Assert.AreEqual (typeof(string), ts[0], "#6");
+			Assert.AreEqual (typeof(SignatureTest[]), ts[1], "#7");
 		}
 
 		[Test]
@@ -398,14 +398,14 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
 			public void OnDeserialization (StreamingContext context)
 			{
 				var ci = Thread.CurrentThread.CurrentCulture;
-				Assertion.AssertEquals("#1", "German (Germany)", ci.EnglishName);
+				Assert.AreEqual("German (Germany)", ci.EnglishName, "#1");
 			}
 			
 			[OnSerialized]
 			public void OnSerialized (StreamingContext context)
 			{
 				var ci = Thread.CurrentThread.CurrentCulture;
-				Assertion.AssertEquals("#2", "German (Germany)", ci.EnglishName);
+				Assert.AreEqual("German (Germany)", ci.EnglishName, "#2");
 			}
 		}
 	}
diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj
index 702e3ea0000..f5de8b68d7f 100644
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,168,169,219,414</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,157 +48,157 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\AppSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Attributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ClassDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CodeExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CollectionDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CollectionDataContractAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ConfigurationStrings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DataContractSerializerSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeElementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeValidatorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\NetDataContractSerializerSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ParameterElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ParameterElementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\Properties.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\SerializationSectionGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\TypeElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\TypeElementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ContractCodeDomInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ContractNamespaceAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractSerializerSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataMemberAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DateTimeFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DateTimeOffsetAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Diagnostics\TraceCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Diagnostics\TraceUtility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DictionaryGlobals.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\EmitTypeInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\EnumDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\EnumMemberAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ExportOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ExtensionDataObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ExtensionDataReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\GenericParameterDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Globals.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\HybridObjectCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\IDataContractSurrogate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\IExtensibleDataObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\IgnoreDataMemberAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ImportOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\InvalidDataContractException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\ByteArrayHelperWithString.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\DataContractJsonSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\DataContractJsonSerializerSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\IXmlJsonReaderInitializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\IXmlJsonWriterInitializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonByteArrayDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonClassDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonCollectionDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonEncodingStreamWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonEnumDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonFormatGeneratorStatics.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonFormatReaderGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonFormatWriterGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonGlobals.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonNodeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonObjectDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonQNameDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonReaderDelegator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonReaderWriterFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonStringDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonUriDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonWriterDelegator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonXmlDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlJsonReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlJsonWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlObjectSerializerReadContextComplexJson.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlObjectSerializerWriteContextComplexJson.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\KnownTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\KnownTypeDataContractResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\NetDataContractSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ObjectReferenceStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ObjectToIdCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\PrimitiveDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ScopedKnownTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SerializationMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SerializationPermissionNotRequiredAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SerializationTrace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SpecialTypeDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SurrogateDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\TypeInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlDataContract.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatGeneratorStatics.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatReaderGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatWriterGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerReadContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerReadContextComplex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerWriteContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerWriteContextComplex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlReaderDelegator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableServices.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlWriterDelegator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XPathQueryGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XsdDataContractExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XsdDataContractImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Text\Base64Encoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Text\BinHexEncoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Text\SurrogateChar.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\ArrayHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\EncodingStreamWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\IFragmentCapableXmlDictionaryWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\IStreamProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\IXmlDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\PrefixHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\StringHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\UniqueID.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\ValueHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBaseReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBaseWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryNodeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryReaderSession.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryWriterSession.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBufferReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlC14NWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDelegatedReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDelegatedWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryReaderQuotas.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryString.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlMtomReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlMtomWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlNodeWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlNodeWriterWriteBase64TextArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlSigningNodeWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlStreamNodeWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlUTF8TextReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlUTF8TextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlWriteBase64AsyncArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\TD.Designer.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\AppSettings.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Attributes.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ClassDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CodeExporter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CollectionDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CollectionDataContractAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ConfigurationStrings.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DataContractSerializerSection.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeElement.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeValidator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeValidatorAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\NetDataContractSerializerSection.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ParameterElement.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ParameterElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\Properties.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\SerializationSectionGroup.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\TypeElement.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\TypeElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ContractCodeDomInfo.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ContractNamespaceAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractResolver.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractSerializer.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractSerializerSettings.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractSet.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataMember.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataMemberAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DateTimeFormat.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DateTimeOffsetAdapter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Diagnostics\TraceCode.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Diagnostics\TraceUtility.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DictionaryGlobals.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\EmitTypeInformation.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\EnumDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\EnumMemberAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ExportOptions.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ExtensionDataObject.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ExtensionDataReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\GenericParameterDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Globals.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\HybridObjectCache.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\IDataContractSurrogate.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\IExtensibleDataObject.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\IgnoreDataMemberAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ImportOptions.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\InvalidDataContractException.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\ByteArrayHelperWithString.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\DataContractJsonSerializer.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\DataContractJsonSerializerSettings.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\IXmlJsonReaderInitializer.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\IXmlJsonWriterInitializer.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonByteArrayDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonClassDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonCollectionDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonEncodingStreamWrapper.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonEnumDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonFormatGeneratorStatics.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonFormatReaderGenerator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonFormatWriterGenerator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonGlobals.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonNodeType.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonObjectDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonQNameDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonReaderDelegator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonReaderWriterFactory.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonStringDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonUriDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonWriterDelegator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonXmlDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlJsonReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlJsonWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlObjectSerializerReadContextComplexJson.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlObjectSerializerWriteContextComplexJson.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\KnownTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\KnownTypeDataContractResolver.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\NetDataContractSerializer.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ObjectReferenceStack.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ObjectToIdCache.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\PrimitiveDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaExporter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaHelper.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaImporter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ScopedKnownTypes.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SerializationMode.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SerializationPermissionNotRequiredAttribute.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SerializationTrace.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SpecialTypeDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SurrogateDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\TypeInformation.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlDataContract.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatGeneratorStatics.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatReaderGenerator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatWriterGenerator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializer.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerContext.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerReadContext.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerReadContextComplex.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerWriteContext.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerWriteContextComplex.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlReaderDelegator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableServices.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlWriterDelegator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XPathQueryGenerator.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XsdDataContractExporter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XsdDataContractImporter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Text\Base64Encoding.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Text\BinHexEncoding.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Text\SurrogateChar.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\ArrayHelper.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\EncodingStreamWrapper.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\IFragmentCapableXmlDictionaryWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\IStreamProvider.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\IXmlDictionary.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\PrefixHandle.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\StringHandle.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\UniqueID.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\ValueHandle.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlBaseReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlBaseWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryNodeType.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryReaderSession.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryWriterSession.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlBufferReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlC14NWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlConverter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlDelegatedReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlDelegatedWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionary.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryReaderQuotas.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryString.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlMtomReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlMtomWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlNodeWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlNodeWriterWriteBase64TextArgs.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlSigningNodeWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlStreamNodeWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlUTF8TextReader.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlUTF8TextWriter.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Xml\XmlWriteBase64AsyncArgs.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\TD.Designer.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\BitFlagsGenerator.cs" />
     <Compile Include="ReferenceSources\CodeInterpreter.cs" />
@@ -204,7 +207,7 @@
     <Compile Include="ReferenceSources\JsonFormatReaderGenerator_static.cs" />
     <Compile Include="ReferenceSources\JsonFormatWriterGenerator_static.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
-    <Compile Include="ReferenceSources\SR_missing.cs" />
+    <Compile Include="ReferenceSources\SR.missing.cs" />
     <Compile Include="ReferenceSources\XmlDataContract_static.cs" />
     <Compile Include="ReferenceSources\XmlExceptionHelper.cs" />
     <Compile Include="ReferenceSources\XmlFormatReaderGenerator_static.cs" />
@@ -217,15 +220,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Security/System.Security-net_4_x.csproj b/mcs/class/System.Security/System.Security-net_4_x.csproj
index 4c40f53ac3b..c272c83959d 100644
--- a/mcs/class/System.Security/System.Security-net_4_x.csproj
+++ b/mcs/class/System.Security/System.Security-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618,414</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -149,15 +152,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj
index c6b8ff0b357..e959175b733 100644
--- a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj
+++ b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -58,15 +61,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_x.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_x.csproj
index cf98e7b9dfe..3f021276d44 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_x.csproj
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -151,15 +154,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -170,10 +172,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
-      <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
-      <Name>System.Configuration-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
diff --git a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj
index 1d1bf773539..39e5a6128f2 100644
--- a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj
+++ b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,82 +48,83 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\ActionItem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\AssertHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncCompletionResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncEventArgsCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncWaitHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\BackoffTimeoutHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\BufferedOutputStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\CallbackException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\HopperCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\NullableKeyDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\ObjectCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\ObjectCacheItem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\ObjectCacheSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\OrderedDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\ValidatingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\CompletedAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\ComputerNameFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\ActivityControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DiagnosticEventProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DiagnosticTraceBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DiagnosticTraceSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DictionaryTraceRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EtwDiagnosticTrace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EtwProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventLogCategory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventLogEventId.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventLogger.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventTraceActivity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\ITraceSourceStringProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\PerformanceCounterNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\StringTraceRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\TraceRecord.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\DiagnosticStrings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\DuplicateDetector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\ExceptionTrace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\FastAsyncCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\FatalException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Fx.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\FxCop.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\HashHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\IAsyncEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\InputQueue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\InternalBufferManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\SafeEventLogWriteHandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\UnsafeNativeMethods.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\IOThreadCancellationTokenSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\IOThreadScheduler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\IOThreadTimer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\MruCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\NameGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\PartialTrustHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\ReadOnlyDictionaryInternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\ReadOnlyKeyedCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\ScheduleActionItemAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\SignalGate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\SynchronizedPool.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\TaskExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\ThreadNeutralSemaphore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\Ticks.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\TimeoutHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\TraceChannel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\TraceEventLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\TraceEventOpcode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\TraceLevelHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\TracePayload.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\TypedAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\TypeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\UrlUtility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\System\Runtime\WaitCallbackActionItem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.ServiceModel.Internals\TraceCore.Designer.cs" />
+    <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\AssemblyInfo.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\ActionItem.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\AssertHelper.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncCompletionResult.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncEventArgs.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncEventArgsCallback.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncResult.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\AsyncWaitHandle.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\BackoffTimeoutHelper.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\BufferedOutputStream.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\CallbackException.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\HopperCache.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\NullableKeyDictionary.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\ObjectCache.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\ObjectCacheItem.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\ObjectCacheSettings.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\OrderedDictionary.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\ValidatingCollection.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\CompletedAsyncResult.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\ComputerNameFormat.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\ActivityControl.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DiagnosticEventProvider.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DiagnosticTraceBase.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DiagnosticTraceSource.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DictionaryTraceRecord.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EtwDiagnosticTrace.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EtwProvider.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventDescriptor.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventLogCategory.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventLogEventId.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventLogger.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\EventTraceActivity.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\ITraceSourceStringProvider.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\PerformanceCounterNameAttribute.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\StringTraceRecord.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\TraceRecord.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\DiagnosticStrings.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\DuplicateDetector.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\ExceptionTrace.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\FastAsyncCallback.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\FatalException.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Fx.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\FxCop.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\HashHelper.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\IAsyncEventArgs.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\InputQueue.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\InternalBufferManager.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\SafeEventLogWriteHandle.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\UnsafeNativeMethods.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\IOThreadCancellationTokenSource.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\IOThreadScheduler.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\IOThreadTimer.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\MruCache.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\NameGenerator.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\PartialTrustHelpers.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\ReadOnlyDictionaryInternal.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\ReadOnlyKeyedCollection.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\ScheduleActionItemAsyncResult.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\SignalGate.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\SynchronizedPool.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TaskExtensions.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\ThreadNeutralSemaphore.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Ticks.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TimeoutHelper.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TraceChannel.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TraceEventLevel.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TraceEventOpcode.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TraceLevelHelper.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TracePayload.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TypedAsyncResult.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TypeHelper.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\UrlUtility.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\WaitCallbackActionItem.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\TraceCore.Designer.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="EventLogEntryType.cs" />
     <Compile Include="InternalSR.cs" />
  </ItemGroup>
@@ -132,15 +136,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_x.csproj b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_x.csproj
index 2e2dbae71b3..35714061b5b 100644
--- a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_x.csproj
+++ b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -82,15 +85,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -101,10 +103,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
-      <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
-      <Name>System.Configuration-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_x.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_x.csproj
index 706ee0df050..6724c378631 100644
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_x.csproj
+++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -100,15 +103,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj
index ef3d1d30350..e986534126d 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj
+++ b/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -1065,15 +1068,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -1084,10 +1086,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj">
-      <Project>{7A23227C-591B-4F80-9D62-4D0271073D82}</Project>
-      <Name>System.ServiceModel.Activation-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -1144,6 +1142,10 @@
       <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>
       <Name>System.Web-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj">
+      <Project>{7A23227C-591B-4F80-9D62-4D0271073D82}</Project>
+      <Name>System.ServiceModel.Activation-net_4_x</Name>
+    </ProjectReference>
     <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
       <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
       <Name>System.Web.ApplicationServices-net_4_x</Name>
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_x.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_x.csproj
index a6594d490a6..4608b887c5e 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_x.csproj
+++ b/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x/plainservice</OutputPath>
+    <IntermediateOutputPath>obj-plainservice</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -1065,15 +1068,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_x.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_x.csproj
index 34959bee636..ade3d433339 100644
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_x.csproj
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -81,15 +84,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj
index 8a3a31b9e5e..a793bf739fc 100644
--- a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj
+++ b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -92,15 +95,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Transactions/System.Transactions-net_4_x.csproj b/mcs/class/System.Transactions/System.Transactions-net_4_x.csproj
index 3b41db88672..0040fd6840b 100644
--- a/mcs/class/System.Transactions/System.Transactions-net_4_x.csproj
+++ b/mcs/class/System.Transactions/System.Transactions-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -81,6 +84,7 @@
     <Compile Include="System.Transactions\TransactionOptions.cs" />
     <Compile Include="System.Transactions\TransactionPromotionException.cs" />
     <Compile Include="System.Transactions\TransactionScope.cs" />
+    <Compile Include="System.Transactions\TransactionScopeAsyncFlowOption.cs" />
     <Compile Include="System.Transactions\TransactionScopeOption.cs" />
     <Compile Include="System.Transactions\TransactionStatus.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -91,15 +95,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Transactions/System.Transactions.dll.sources b/mcs/class/System.Transactions/System.Transactions.dll.sources
index 36d981ebe95..4c5394f957b 100644
--- a/mcs/class/System.Transactions/System.Transactions.dll.sources
+++ b/mcs/class/System.Transactions/System.Transactions.dll.sources
@@ -31,6 +31,7 @@ System.Transactions/TransactionManagerCommunicationException.cs
 System.Transactions/TransactionOptions.cs
 System.Transactions/TransactionPromotionException.cs
 System.Transactions/TransactionScope.cs
+System.Transactions/TransactionScopeAsyncFlowOption.cs
 System.Transactions/TransactionScopeOption.cs
 System.Transactions/TransactionStatus.cs
 System.Transactions/Configuration/DefaultSettingsSection.cs
diff --git a/mcs/class/System.Transactions/System.Transactions/TransactionScope.cs b/mcs/class/System.Transactions/System.Transactions/TransactionScope.cs
index 129967d9e27..167d47e8d3a 100644
--- a/mcs/class/System.Transactions/System.Transactions/TransactionScope.cs
+++ b/mcs/class/System.Transactions/System.Transactions/TransactionScope.cs
@@ -31,12 +31,20 @@ namespace System.Transactions
 		bool completed;
 		bool isRoot;
 
+		bool asyncFlowEnabled;
+
 		public TransactionScope ()
 			: this (TransactionScopeOption.Required,
 				TransactionManager.DefaultTimeout)
 		{
 		}
 
+		public TransactionScope(TransactionScopeAsyncFlowOption asyncFlow)
+			: this(TransactionScopeOption.Required,
+				TransactionManager.DefaultTimeout, asyncFlow)
+		{
+		}
+
 		public TransactionScope (Transaction transaction)
 			: this (transaction, TransactionManager.DefaultTimeout)
 		{
@@ -53,7 +61,7 @@ namespace System.Transactions
 			TimeSpan timeout, DTCOption opt)
 		{
 			Initialize (TransactionScopeOption.Required,
-				transaction, defaultOptions, opt, timeout);
+				transaction, defaultOptions, opt, timeout, TransactionScopeAsyncFlowOption.Suppress);
 		}
 
 		public TransactionScope (TransactionScopeOption option)
@@ -62,10 +70,21 @@ namespace System.Transactions
 		}
 
 		public TransactionScope (TransactionScopeOption option,
-			TimeSpan timeout)
+ 			TimeSpan timeout)
+ 			: this (option, timeout, TransactionScopeAsyncFlowOption.Suppress)
+		{
+		}
+
+		public TransactionScope(TransactionScopeOption option, TransactionScopeAsyncFlowOption asyncFlow)
+			: this(option, TransactionManager.DefaultTimeout, asyncFlow)
+		{
+		}
+
+    	public TransactionScope (TransactionScopeOption option,
+			TimeSpan timeout, TransactionScopeAsyncFlowOption asyncFlow)
 		{
 			Initialize (option, null, defaultOptions,
-				DTCOption.None, timeout);
+				DTCOption.None, timeout, asyncFlow);
 		}
 
 		public TransactionScope (TransactionScopeOption scopeOption,
@@ -80,16 +99,17 @@ namespace System.Transactions
 			DTCOption opt)
 		{
 			Initialize (scopeOption, null, options, opt,
-				TransactionManager.DefaultTimeout);
+				TransactionManager.DefaultTimeout, TransactionScopeAsyncFlowOption.Suppress);
 		}
 
 		void Initialize (TransactionScopeOption scopeOption,
 			Transaction tx, TransactionOptions options,
-			DTCOption interop, TimeSpan timeout)
+			DTCOption interop, TimeSpan timeout, TransactionScopeAsyncFlowOption asyncFlow)
 		{
 			completed = false;
 			isRoot = false;
 			nested = 0;
+			asyncFlowEnabled = asyncFlow == TransactionScopeAsyncFlowOption.Enabled;
 
 			if (timeout < TimeSpan.Zero)
 				throw new ArgumentOutOfRangeException ("timeout");
@@ -165,36 +185,67 @@ namespace System.Transactions
 				throw new InvalidOperationException ("TransactionScope nested incorrectly");
 			}
 
-			if (Transaction.CurrentInternal != transaction) {
+			if (Transaction.CurrentInternal != transaction && !asyncFlowEnabled) {
 				if (transaction != null)
 					transaction.Rollback ();
 				if (Transaction.CurrentInternal != null)
 					Transaction.CurrentInternal.Rollback ();
 
 				throw new InvalidOperationException ("Transaction.Current has changed inside of the TransactionScope");
-			}
+			} 
 
-			if (Transaction.CurrentInternal == oldTransaction && oldTransaction != null)
-				oldTransaction.Scope = parentScope;
+			if (asyncFlowEnabled) {
+				if (oldTransaction != null)
+					oldTransaction.Scope = parentScope;
 
-			Transaction.CurrentInternal = oldTransaction;
+				var variedTransaction = Transaction.CurrentInternal;
 
-			if (transaction == null)
-				/* scope was not in a transaction, (Suppress) */
-				return;
+				if (transaction == null && variedTransaction == null)
+					/* scope was not in a transaction, (Suppress) */
+					return;
 
-			transaction.Scope = null;
+				variedTransaction.Scope = parentScope;
+				Transaction.CurrentInternal = oldTransaction;
 
-			if (!IsComplete) {
-				transaction.Rollback ();
-				return;
-			}
+				transaction.Scope = null;
 
-			if (!isRoot)
-				/* Non-root scope has completed+ended */
-				return;
+				if (!IsComplete) {
+					transaction.Rollback ();
+					variedTransaction.Rollback();
+					return;
+				}
+
+				if (!isRoot)
+					/* Non-root scope has completed+ended */
+					return;
+
+				variedTransaction.CommitInternal();
+				transaction.CommitInternal();
+			} else {
+				if (Transaction.CurrentInternal == oldTransaction && oldTransaction != null)
+					oldTransaction.Scope = parentScope;
+
+				Transaction.CurrentInternal = oldTransaction;
 
-			transaction.CommitInternal ();
+				if (transaction == null)
+					/* scope was not in a transaction, (Suppress) */
+					return;
+
+				transaction.Scope = null;
+
+				if (!IsComplete)
+				{
+					transaction.Rollback();
+					return;
+				}
+
+				if (!isRoot)
+					/* Non-root scope has completed+ended */
+					return;
+
+				transaction.CommitInternal();
+
+			}
 		}
 
 
diff --git a/mcs/class/System.Transactions/System.Transactions/TransactionScopeAsyncFlowOption.cs b/mcs/class/System.Transactions/System.Transactions/TransactionScopeAsyncFlowOption.cs
new file mode 100644
index 00000000000..5285fe5a0fd
--- /dev/null
+++ b/mcs/class/System.Transactions/System.Transactions/TransactionScopeAsyncFlowOption.cs
@@ -0,0 +1,9 @@
+
+namespace System.Transactions
+{
+	public enum TransactionScopeAsyncFlowOption
+	{
+		Suppress,
+		Enabled
+	}
+}
diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_x.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_x.csproj
index 23bb93a3e94..b7bfc3e76b5 100644
--- a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_x.csproj
+++ b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -55,15 +58,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj
index c66e6452e31..461643c497b 100644
--- a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj
+++ b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -46,22 +49,23 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Configuration\MembershipPasswordCompatibilityMode.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Security\IMembershipAdapter.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Security\MembershipCreateStatus.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Security\MembershipCreateUserException.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Security\MembershipPasswordException.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Security\MembershipPasswordFormat.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Security\MembershipProviderCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Security\MembershipUserCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Security\MembershipValidatePasswordEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web.ApplicationServices\Security\ValidatePasswordEventArgs.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="System.Web.Configuration\MembershipPasswordCompatibilityMode.cs" />
+    <Compile Include="ReferenceSources\SR.missing.cs" />
     <Compile Include="System.Web.Security\IMembershipHelper.cs" />
-    <Compile Include="System.Web.Security\MembershipCreateStatus.cs" />
-    <Compile Include="System.Web.Security\MembershipCreateUserException.cs" />
-    <Compile Include="System.Web.Security\MembershipPasswordException.cs" />
-    <Compile Include="System.Web.Security\MembershipPasswordFormat.cs" />
     <Compile Include="System.Web.Security\MembershipProvider.cs" />
-    <Compile Include="System.Web.Security\MembershipProviderCollection.cs" />
     <Compile Include="System.Web.Security\MembershipUser.cs" />
-    <Compile Include="System.Web.Security\MembershipUserCollection.cs" />
-    <Compile Include="System.Web.Security\MembershipValidatePasswordEventHandler.cs" />
     <Compile Include="System.Web.Security\RoleProvider.cs" />
-    <Compile Include="System.Web.Security\ValidatePasswordEventArgs.cs" />
     <Compile Include="System.Web.UI\KeyedList.cs" />
     <Compile Include="System.Web.UI\KeyedListEnumerator.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -72,15 +76,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_x.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_x.csproj
index 1b7f7caa483..84781bfe0b9 100644
--- a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_x.csproj
+++ b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -93,15 +96,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_x.csproj b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_x.csproj
index e24821235ec..a812da16665 100644
--- a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_x.csproj
+++ b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -69,15 +72,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_x.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_x.csproj
index c9ef1c19ca7..d008409de93 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_x.csproj
+++ b/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -197,15 +200,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -216,10 +218,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
-      <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
-      <Name>System.Web.ApplicationServices-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -264,6 +262,10 @@
       <Project>{FE596C31-BDA2-4850-8F79-F8F4DF70F44A}</Project>
       <Name>System.ServiceModel-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
+      <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
+      <Name>System.Web.ApplicationServices-net_4_x</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/System.Web.Http.SelfHost/Makefile b/mcs/class/System.Web.Http.SelfHost/Makefile
index f13d3b55f88..f4ff7d46645 100644
--- a/mcs/class/System.Web.Http.SelfHost/Makefile
+++ b/mcs/class/System.Web.Http.SelfHost/Makefile
@@ -4,17 +4,12 @@ include ../../build/rules.make
 
 LIBRARY = System.Web.Http.SelfHost.dll
 
-System.Web.Http.SelfHost.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx
-	$(RESGEN) "$<" "$@"
-
-System.Web.Http.SelfHost.Properties.SRResources.resources: ../../../external/aspnetwebstack/src/System.Web.Http.SelfHost/Properties/SRResources.resx
-	$(RESGEN) "$<" "$@"
-
+RESOURCE_DEFS = \
+	System.Web.Http.SelfHost.Properties.CommonWebApiResources,../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx \
+	System.Web.Http.SelfHost.Properties.SRResources,../../../external/aspnetwebstack/src/System.Web.Http.SelfHost/Properties/SRResources.resx
 
 LIB_REFS = System.Core System System.Xml System.Configuration System.Net.Http System.Runtime.Serialization System.ServiceModel System.IdentityModel System.Web.Http System.Net.Http.Formatting
 LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign
 
 include ../../build/library.make
 
-$(the_lib): System.Web.Http.SelfHost.Properties.CommonWebApiResources.resources \
-	System.Web.Http.SelfHost.Properties.SRResources.resources
diff --git a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj
index 3f3face9e10..70ba4af74c2 100644
--- a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj
+++ b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -100,15 +103,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -163,5 +165,13 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx">
+      <LogicalName>System.Web.Http.SelfHost.Properties.CommonWebApiResources.resources</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.Http.SelfHost/Properties/SRResources.resx">
+      <LogicalName>System.Web.Http.SelfHost.Properties.SRResources.resources</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
 
diff --git a/mcs/class/System.Web.Http.WebHost/Makefile b/mcs/class/System.Web.Http.WebHost/Makefile
index e0606bdbafb..b022ea314cf 100644
--- a/mcs/class/System.Web.Http.WebHost/Makefile
+++ b/mcs/class/System.Web.Http.WebHost/Makefile
@@ -4,17 +4,13 @@ include ../../build/rules.make
 
 LIBRARY = System.Web.Http.WebHost.dll
 
-System.Web.Http.WebHost.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx
-	$(RESGEN) "$<" "$@"
-
-System.Web.Http.WebHost.Properties.SRResources.resources: ../../../external/aspnetwebstack/src/System.Web.Http.WebHost/Properties/SRResources.resx
-	$(RESGEN) "$<" "$@"
-
+RESOURCE_DEFS = \
+	System.Web.Http.WebHost.Properties.CommonWebApiResources,../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx \
+	System.Web.Http.WebHost.Properties.SRResources,../../../external/aspnetwebstack/src/System.Web.Http.WebHost/Properties/SRResources.resx
 
 LIB_REFS = System.Core System System.Xml System.Configuration System.Net.Http System.Runtime.Serialization System.ServiceModel System.IdentityModel System.Web.Http System.Net.Http.Formatting System.Web.Routing System.Web Microsoft.Web.Infrastructure
 LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign
 
 include ../../build/library.make
 
-$(the_lib): System.Web.Http.WebHost.Properties.CommonWebApiResources.resources \
-	System.Web.Http.WebHost.Properties.SRResources.resources
+$(the_lib): 
diff --git a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj
index 3faffa8b1b5..0d1b62859ab 100644
--- a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj
+++ b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -88,15 +91,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -155,14 +157,21 @@
       <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>
       <Name>System.Web-net_4_x</Name>
     </ProjectReference>
-    <Reference Include="Microsoft.Web.Infrastructure">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Web.Infrastructure</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">
+      <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>
+      <Name>Microsoft.Web.Infrastructure-net_4_x</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx">
+      <LogicalName>System.Web.Http.WebHost.Properties.CommonWebApiResources.resources</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.Http.WebHost/Properties/SRResources.resx">
+      <LogicalName>System.Web.Http.WebHost.Properties.SRResources.resources</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
 
diff --git a/mcs/class/System.Web.Http/Makefile b/mcs/class/System.Web.Http/Makefile
index fb50d52d2e9..72afa046d2a 100644
--- a/mcs/class/System.Web.Http/Makefile
+++ b/mcs/class/System.Web.Http/Makefile
@@ -4,20 +4,13 @@ include ../../build/rules.make
 
 LIBRARY = System.Web.Http.dll
 
-System.Web.Http.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx
-	$(RESGEN) "$<" "$@"
-	
-System.Web.Http.Properties.SRResources.resources: ../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.resx
-	$(RESGEN) "$<" "$@"
+RESOURCE_DEFS = \
+	System.Web.Http.Properties.CommonWebApiResources,../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx \
+	System.Web.Http.Properties.SRResources,../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.resx
+
 
 
 LIB_REFS = System.Core System System.Xml System.Net.Http System.ComponentModel.DataAnnotations System.Net.Http.Formatting System.Runtime.Caching System.Runtime.Serialization System.Data.Linq
-LIB_MCS_FLAGS = \
-		-d:ASPNETMVC -keyfile:../winfx.pub -delaysign \
-		-resource:System.Web.Http.Properties.CommonWebApiResources.resources \
-		-resource:System.Web.Http.Properties.SRResources.resources
+LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign 
 
 include ../../build/library.make
-
-$(the_lib): System.Web.Http.Properties.CommonWebApiResources.resources \
-	System.Web.Http.Properties.SRResources.resources
diff --git a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj
index 7753c8ff046..bb5c8db8c3f 100644
--- a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj
+++ b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -323,15 +326,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -383,10 +385,10 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="System.Web.Http.Properties.CommonWebApiResources.resources">
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx">
       <LogicalName>System.Web.Http.Properties.CommonWebApiResources.resources</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="System.Web.Http.Properties.SRResources.resources">
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.resx">
       <LogicalName>System.Web.Http.Properties.SRResources.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Web.Mobile/System.Web.Mobile-net_4_x.csproj b/mcs/class/System.Web.Mobile/System.Web.Mobile-net_4_x.csproj
new file mode 100644
index 00000000000..bc1337a2a49
--- /dev/null
+++ b/mcs/class/System.Web.Mobile/System.Web.Mobile-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{E676BC22-5B81-4518-8243-3946BB57D665}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699</NoWarn>
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Web.Mobile</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="Assembly\AssemblyInfo.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/System.Web.Mvc3/Makefile b/mcs/class/System.Web.Mvc3/Makefile
index 024e52e89ea..e5418545d96 100644
--- a/mcs/class/System.Web.Mvc3/Makefile
+++ b/mcs/class/System.Web.Mvc3/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
 LIBRARY = System.Web.Mvc3.dll
 LIBRARY_NAME = System.Web.Mvc.dll
 
+RESOURCE_DEFS = System.Web.Mvc.Resources.MvcResources,Mvc/Resources/MvcResources.resx
 RESX_DIST =  Mvc/Resources/MvcResources.resx
 
 LIB_REFS = Microsoft.Web.Infrastructure System System.Core System.Configuration System.Data System.Xml System.Web System.Web.Abstractions System.Web.Routing System.Web.Extensions System.ComponentModel.DataAnnotations System.Data.Linq System.Runtime.Caching System.Web.Razor System.Web.WebPages.Razor System.Web.WebPages
@@ -12,14 +13,9 @@ LIB_MCS_FLAGS = \
 		/warn:1 \
 		/keyfile:../winfx.pub \
 		/d:MONO \
-		/delaysign \
-		$(foreach r, $(RESOURCES), /resource:$(r),System.Web.Mvc.Resources.$(notdir $(r)))
+		/delaysign
 
 EXTRA_DISTFILES = $(RESX_DIST)
-RESOURCES = $(RESX_DIST:.resx=.resources)
-include ../../build/library.make
 
-$(build_lib): $(RESOURCES)
+include ../../build/library.make
 
-$(RESOURCES): %.resources: %.resx
-	$(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj
index 6c1c1265d3c..3b76937bb62 100644
--- a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj
+++ b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -400,15 +403,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -419,11 +421,10 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <Reference Include="Microsoft.Web.Infrastructure">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Web.Infrastructure</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">
+      <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>
+      <Name>Microsoft.Web.Infrastructure-net_4_x</Name>
+    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -489,7 +490,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Mvc/Resources/MvcResources.resources">
+    <EmbeddedResource Include="Mvc/Resources/MvcResources.resx">
       <LogicalName>System.Web.Mvc.Resources.MvcResources.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Web.Razor/Makefile b/mcs/class/System.Web.Razor/Makefile
index 542360275c1..e4472a96a0c 100644
--- a/mcs/class/System.Web.Razor/Makefile
+++ b/mcs/class/System.Web.Razor/Makefile
@@ -5,21 +5,15 @@ include ../../build/rules.make
 LIBRARY = System.Web.Razor.dll
 LIBRARY_NAME = System.Web.Razor.dll
 
-System.Web.Razor.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx
-	$(RESGEN) "$<" "$@"
-	
-System.Web.Razor.Resources.RazorResources.resources: ../../../external/aspnetwebstack/src/System.Web.Razor/Resources/RazorResources.resx
-	$(RESGEN) "$<" "$@"
+RESOURCE_DEFS = \
+	System.Web.Razor.Common.CommonResources,../../../external/aspnetwebstack/src/CommonResources.resx \
+	System.Web.Razor.Resources.RazorResources,../../../external/aspnetwebstack/src/System.Web.Razor/Resources/RazorResources.resx
 
 LIB_REFS = System System.Core
 LIB_MCS_FLAGS = \
 		/warn:1 \
 		/keyfile:../winfx.pub -delaysign \
-	        /d:ASPNETWEBPAGES \
-		/resource:System.Web.Razor.Resources.RazorResources.resources \
-		/resource:System.Web.Razor.Common.CommonResources.resources
+	        /d:ASPNETWEBPAGES 
 
 include ../../build/library.make
 
-$(build_lib): System.Web.Razor.Resources.RazorResources.resources \
-		System.Web.Razor.Common.CommonResources.resources
diff --git a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj b/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj
index eaa191d794b..7b693416b89 100644
--- a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj
+++ b/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -209,15 +212,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -241,12 +243,12 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="System.Web.Razor.Resources.RazorResources.resources">
-      <LogicalName>System.Web.Razor.Resources.RazorResources.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="System.Web.Razor.Common.CommonResources.resources">
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/CommonResources.resx">
       <LogicalName>System.Web.Razor.Common.CommonResources.resources</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.Razor/Resources/RazorResources.resx">
+      <LogicalName>System.Web.Razor.Resources.RazorResources.resources</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
 
diff --git a/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions-net_4_x.csproj b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions-net_4_x.csproj
new file mode 100644
index 00000000000..be101eaa2a8
--- /dev/null
+++ b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{9B52B7BD-1E14-4300-BEC5-241513810554}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699</NoWarn>
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Web.RegularExpressions</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../msfinal.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="Assembly\AssemblyInfo.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/System.Web.Routing/System.Web.Routing-net_4_x.csproj b/mcs/class/System.Web.Routing/System.Web.Routing-net_4_x.csproj
index f398e0ea8e3..4f47b14286d 100644
--- a/mcs/class/System.Web.Routing/System.Web.Routing-net_4_x.csproj
+++ b/mcs/class/System.Web.Routing/System.Web.Routing-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -55,15 +58,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj b/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj
index 5deb0b5e954..0dfc8236d4b 100644
--- a/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj
+++ b/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,168,169,219,414,612,649</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,178 +48,178 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\inc\InvariantComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\inc\PrivilegedConfigurationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\ComponentModel\CompModSwitches.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\DiagnosticsElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\PriorityGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\Protocols.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapEnvelopeProcessingElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\WebServicesSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\WsdlHelpGeneratorElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPointAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPrefixAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpFormatExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeAnyImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormatExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameters.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeReturn.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeTextImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SchemaCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescription.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\Soap12FormatExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapFormatExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapHttpTransportImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapTransportImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebCodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebServicesInteroperability.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Diagnostics\TraceUtility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractSearchPattern.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientDocuments.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientReferences.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentLinksPattern.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSearchPattern.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryExceptionDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReferences.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryRequestHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoverySearchPattern.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoSearcher.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoveryDocument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicPhysicalDiscoSearcher.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicVirtualDiscoSearcher.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\ExcludePathInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidContentTypeException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidDocumentContentsException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\LinkGrep.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\SchemaReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\SoapBinding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\XmlSchemaSearchPattern.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\CallId.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\INotifyConnection2.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySink2.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySource2.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\NotifyFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\UserThread.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\NativeMethods.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\PartialTrustHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\AnyReturnReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\BufferedResponseStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ClientProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\DiscoveryServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\DocumentationServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpClientProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetClientProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostClientProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostLocalhostServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\LogicalMethodInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MatchAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeFormatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\NopReturnReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\PatternMatcher.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\RequestResponse.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\RuntimeUtils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\Scalars.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ScatterGatherStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap11ServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap12ServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientMessage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentServiceAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapFaultCodes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaders.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessageStage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapParameterStyle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapProtocolVersion.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapReflector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcServiceAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMessage.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerProtocol.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServiceRoutingStyle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapUnknownHeader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\TextReturnReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlEncodedParameterWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ValueCollectionParameterReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandlerFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Soap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebServiceAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebServiceBindingAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebServicesDescriptionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WsiProfiles.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\inc\InvariantComparer.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\inc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\ComponentModel\CompModSwitches.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\DiagnosticsElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\PriorityGroup.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\Protocols.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapEnvelopeProcessingElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WebServicesSection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WsdlHelpGeneratorElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPointAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPrefixAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpFormatExtensions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeAnyImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormatExtensions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameters.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeReturn.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeTextImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SchemaCompiler.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescription.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionSerializer.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\Soap12FormatExtensions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapFormatExtensions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapHttpTransportImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapTransportImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebCodeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceOptions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebServicesInteroperability.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Diagnostics\TraceUtility.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractSearchPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientDocuments.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientReferences.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocument.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentLinksPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSearchPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSerializer.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryExceptionDictionary.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReferences.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryRequestHandler.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoverySearchPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoSearcher.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoveryDocument.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicPhysicalDiscoSearcher.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicVirtualDiscoSearcher.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\ExcludePathInfo.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidContentTypeException.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidDocumentContentsException.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\LinkGrep.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\SchemaReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\SoapBinding.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\XmlSchemaSearchPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\CallId.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\INotifyConnection2.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySink2.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySource2.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\NotifyFilter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\UserThread.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\NativeMethods.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\PartialTrustHelpers.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\AnyReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\BufferedResponseStream.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\DiscoveryServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\DocumentationServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostLocalhostServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\LogicalMethodInfo.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MatchAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeFormatter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\NopReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\PatternMatcher.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\RequestResponse.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\RuntimeUtils.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\Scalars.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ScatterGatherStream.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerType.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap11ServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap12ServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientMessage.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentServiceAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapException.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtension.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionStream.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapFaultCodes.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderDirection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderException.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaders.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessage.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessageStage.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapParameterStyle.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapProtocolVersion.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcServiceAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMessage.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMethod.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServiceRoutingStyle.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapUnknownHeader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\TextReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlEncodedParameterWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ValueCollectionParameterReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandler.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandlerFactory.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Soap.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebService.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebServiceAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebServiceBindingAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebServicesDescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WsiProfiles.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\Res.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -227,15 +230,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -266,9 +268,9 @@
       <Project>{DE51B021-D51C-4F26-99EE-B0729D97631E}</Project>
       <Name>System.Web-plainweb-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Design/System.Design-net_4_x.csproj">
-      <Project>{EFEDC380-2CB0-4B40-9566-D2302867A4D9}</Project>
-      <Name>System.Design-net_4_x</Name>
+    <ProjectReference Include="../System.Design/System.Design-plaindesign-net_4_x.csproj">
+      <Project>{DCE556E9-EF89-45F3-A51F-83D3C3E0FEF5}</Project>
+      <Name>System.Design-plaindesign-net_4_x</Name>
     </ProjectReference>
     <ProjectReference Include="../System.DirectoryServices/System.DirectoryServices-net_4_x.csproj">
       <Project>{CC4F3F73-E0A6-49EE-8F7D-BD8B9F293A72}</Project>
diff --git a/mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.excludes b/mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.exclude.sources
index 645326dff9a..645326dff9a 100644
--- a/mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.excludes
+++ b/mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.exclude.sources
diff --git a/mcs/class/System.Web.WebPages.Deployment/Makefile b/mcs/class/System.Web.WebPages.Deployment/Makefile
index 33d506be70a..2e704de8734 100644
--- a/mcs/class/System.Web.WebPages.Deployment/Makefile
+++ b/mcs/class/System.Web.WebPages.Deployment/Makefile
@@ -5,21 +5,15 @@ include ../../build/rules.make
 LIBRARY = System.Web.WebPages.Deployment.dll
 LIBRARY_NAME = System.Web.WebPages.Deployment.dll
 
-System.Web.WebPages.Deployment.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx
-	$(RESGEN) "$<" "$@"
-	
-System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources: ../../../external/aspnetwebstack/src/System.Web.WebPages.Deployment/Resources/ConfigurationResources.resx
-	$(RESGEN) "$<" "$@"
+RESOURCE_DEFS = \
+	System.Web.WebPages.Deployment.Common.CommonResources,../../../external/aspnetwebstack/src/CommonResources.resx \
+	System.Web.WebPages.Deployment.Resources.ConfigurationResources,../../../external/aspnetwebstack/src/System.Web.WebPages.Deployment/Resources/ConfigurationResources.resx
+
 
 LIB_REFS = System System.Core System.Configuration System.Web Microsoft.Web.Infrastructure
 LIB_MCS_FLAGS = \
 		/warn:1 \
 		/keyfile:../winfx.pub -delaysign \
-	        /d:ASPNETWEBPAGES \
-		/resource:System.Web.WebPages.Deployment.Common.CommonResources.resources \
-		/resource:System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources
+	        /d:ASPNETWEBPAGES 
 
 include ../../build/library.make
-
-$(build_lib): System.Web.WebPages.Deployment.Common.CommonResources.resources \
-		System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources
diff --git a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj
index 4d9791f0dcd..6fd9784625d 100644
--- a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj
+++ b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -77,15 +80,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -112,20 +114,19 @@
       <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>
       <Name>System.Web-net_4_x</Name>
     </ProjectReference>
-    <Reference Include="Microsoft.Web.Infrastructure">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Web.Infrastructure</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">
+      <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>
+      <Name>Microsoft.Web.Infrastructure-net_4_x</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="System.Web.WebPages.Deployment.Common.CommonResources.resources">
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/CommonResources.resx">
       <LogicalName>System.Web.WebPages.Deployment.Common.CommonResources.resources</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources">
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.WebPages.Deployment/Resources/ConfigurationResources.resx">
       <LogicalName>System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Web.WebPages.Razor/Makefile b/mcs/class/System.Web.WebPages.Razor/Makefile
index cb0e52dc33b..28b0f3f45c1 100644
--- a/mcs/class/System.Web.WebPages.Razor/Makefile
+++ b/mcs/class/System.Web.WebPages.Razor/Makefile
@@ -5,24 +5,18 @@ include ../../build/rules.make
 LIBRARY = System.Web.WebPages.Razor.dll
 LIBRARY_NAME = System.Web.WebPages.Razor.dll
 
-System.Web.WebPages.Razor.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx
-	$(RESGEN) "$<" "$@"
-	
-System.Web.WebPages.Razor.Resources.RazorWebResources.resources: ../../../external/aspnetwebstack/src/System.Web.WebPages.Razor/Resources/RazorWebResources.resx
-	$(RESGEN) "$<" "$@"
+RESOURCE_DEFS = \
+	System.Web.WebPages.Razor.Common.CommonResources,../../../external/aspnetwebstack/src/CommonResources.resx \
+	System.Web.WebPages.Razor.Resources.RazorWebResources,../../../external/aspnetwebstack/src/System.Web.WebPages.Razor/Resources/RazorWebResources.resx
 
 LIB_REFS = System System.Core System.Configuration System.Web System.Web.WebPages System.Web.Razor
 LIB_MCS_FLAGS = \
 		/warn:1 \
 		/keyfile:../winfx.pub \
 		/delaysign \
-	        /d:ASPNETWEBPAGES \
-		/resource:System.Web.WebPages.Razor.Resources.RazorWebResources.resources \
-		/resource:System.Web.WebPages.Razor.Common.CommonResources.resources
+	        /d:ASPNETWEBPAGES
 
 include ../../build/library.make
 
-$(build_lib): System.Web.WebPages.Razor.Resources.RazorWebResources.resources \
-		System.Web.WebPages.Razor.Common.CommonResources.resources
 
 
diff --git a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj
index a9e9a43a79d..9e427e5ed1a 100644
--- a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj
+++ b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -80,15 +83,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -128,12 +130,12 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="System.Web.WebPages.Razor.Resources.RazorWebResources.resources">
-      <LogicalName>System.Web.WebPages.Razor.Resources.RazorWebResources.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="System.Web.WebPages.Razor.Common.CommonResources.resources">
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/CommonResources.resx">
       <LogicalName>System.Web.WebPages.Razor.Common.CommonResources.resources</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.WebPages.Razor/Resources/RazorWebResources.resx">
+      <LogicalName>System.Web.WebPages.Razor.Resources.RazorWebResources.resources</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
 
diff --git a/mcs/class/System.Web.WebPages/Makefile b/mcs/class/System.Web.WebPages/Makefile
index 394f2043a11..3e9641f079c 100644
--- a/mcs/class/System.Web.WebPages/Makefile
+++ b/mcs/class/System.Web.WebPages/Makefile
@@ -5,24 +5,18 @@ include ../../build/rules.make
 LIBRARY = System.Web.WebPages.dll
 LIBRARY_NAME = System.Web.WebPages.dll
 
-System.Web.WebPages.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx
-	$(RESGEN) "$<" "$@"
-	
-System.Web.WebPages.Resources.WebPageResources.resources: ../../../external/aspnetwebstack/src/System.Web.WebPages/Resources/WebPageResources.resx
-	$(RESGEN) "$<" "$@"
+RESOURCE_DEFS = \
+	System.Web.WebPages.Common.CommonResources,../../../external/aspnetwebstack/src/CommonResources.resx \
+	System.Web.WebPages.Resources.WebPageResources,../../../external/aspnetwebstack/src/System.Web.WebPages/Resources/WebPageResources.resx
 
 LIB_REFS = Microsoft.CSharp Microsoft.Web.Infrastructure System System.ComponentModel.DataAnnotations System.Configuration System.Core System.Data.Linq System.Web System.Web.WebPages.Deployment System.Web.Razor System.Xml System.Xml.Linq
+
 LIB_MCS_FLAGS = \
 		/warn:1 \
 		/keyfile:../winfx.pub \
 		/delaysign \
-	        /d:ASPNETWEBPAGES \
-		/resource:System.Web.WebPages.Resources.WebPageResources.resources \
-		/resource:System.Web.WebPages.Common.CommonResources.resources
+	        /d:ASPNETWEBPAGES 
 
 EXTRA_DISTFILES = $(RESX_DIST)
 
 include ../../build/library.make
-
-$(build_lib): System.Web.WebPages.Resources.WebPageResources.resources \
-		System.Web.WebPages.Common.CommonResources.resources
diff --git a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj
index de8e8f18a80..28ca085172c 100644
--- a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj
+++ b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -204,15 +207,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -227,11 +229,10 @@
       <Project>{DABF9F75-63AD-4991-9D2B-9234E7032B32}</Project>
       <Name>Microsoft.CSharp-net_4_x</Name>
     </ProjectReference>
-    <Reference Include="Microsoft.Web.Infrastructure">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Web.Infrastructure</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">
+      <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>
+      <Name>Microsoft.Web.Infrastructure-net_4_x</Name>
+    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -277,12 +278,12 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="System.Web.WebPages.Resources.WebPageResources.resources">
-      <LogicalName>System.Web.WebPages.Resources.WebPageResources.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="System.Web.WebPages.Common.CommonResources.resources">
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/CommonResources.resx">
       <LogicalName>System.Web.WebPages.Common.CommonResources.resources</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.WebPages/Resources/WebPageResources.resx">
+      <LogicalName>System.Web.WebPages.Resources.WebPageResources.resources</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
 
diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 6098d30328c..61ab3d54af6 100644
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -225,8 +225,8 @@ TEST_RESOURCE_FILES = \
 	Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx.cs \
 	Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx
 
-RESX_DIST =  resources/TranslationResources.resx
-RESX_RES = $(RESX_DIST:.resx=.resources)
+RESOURCE_DEFS = \
+	TranslationResources,resources/TranslationResources.resx
 
 NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
 NUNIT_APP_CODE_FILES = $(TEST_APP_CODE_FILES)
@@ -254,7 +254,7 @@ ifneq (plainweb/,$(intermediate))
 LIB_REFS += System.Web.Services plaindesign/System.Design
 LIB_MCS_FLAGS += -define:WEBSERVICES_DEP
 
-all-local: System.Web/UplevelHelper.cs resources/TranslationResources.resources 
+all-local: System.Web/UplevelHelper.cs 
 
 endif
 
@@ -272,7 +272,6 @@ EXTRA_DISTFILES = \
 	$(TEST_APP_CODE_FILES) \
 	$(TEST_APP_GLOBALRESOURCES_FILES) \
 	UplevelHelperDefinitions.xml \
-	$(RESX_DIST) \
 	SQLiteProviders_DatabaseSchema.sql \
 	$(shell find Test/standalone-runner-support/ -name "*.cs" -type f -printf "'%p' ") \
 	$(shell find Test/standalone-tests/ -name "*.cs" -type f -printf "'%p' " -o -name "*.cs.in" -type f -printf "'%p' ") \
diff --git a/mcs/class/System.Web/System.Web-net_4_x.csproj b/mcs/class/System.Web/System.Web-net_4_x.csproj
index f63b9ab2489..0b1699b80a4 100644
--- a/mcs/class/System.Web/System.Web-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,612,618,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,384 +48,482 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpApplicationStateBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpApplicationStateWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpCachePolicyBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpCachePolicyWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpFileCollectionBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpPostedFileBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpPostedFileWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpRequestBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpResponseBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpServerUtilityBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpSessionStateBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpSessionStateWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Cache\IOutputCacheEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Cache\ResponseElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\BuildProviderAppliesTo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\BuildProviderAppliesToAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\ExpressionEditorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\ExpressionPrefixAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesTo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\IAssemblyPostProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\IImplicitResourceProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AdapterDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AsyncPreloadModeFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AuthenticationMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AuthorizationRuleAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\BrowserCapsElementType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\BrowserTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomErrorsMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomErrorsRedirectMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomWebEventKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\DelayedRegex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\FormsAuthPasswordFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\FormsProtectionEnum.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IConfigMapPath.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IConfigMapPathFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IRemoteWebConfigurationHostServer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\MachineKeyCompatibilityMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\MachineKeyValidation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\PagesEnableSessionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelComAuthenticationLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelComImpersonationLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelLogLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProfileGuidedOptimizationsFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RegexMatchTimeoutValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RegexMatchTimeoutValidatorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcAuthent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcImpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\SerializationMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\SystemWebCachingSectionGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\TicketCompatibilityMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\TraceDisplayMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\WebApplicationLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\WebLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\XhtmlConformanceMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Hosting\IApplicationHost.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Hosting\IRegisteredObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHtmlString.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpAsyncHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpHandlerFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpModule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ISubscriptionToken.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ITlsTokenBindingInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindingBehavior.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindingBehaviorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindNeverAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindRequiredAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ExtensibleModelBinderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\IModelNameProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelBinderProviderOptionsAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelErrorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\PreApplicationStartMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\HttpProfileGroupBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\ProfileEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\ProfileEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ReadEntityBodyMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\RequestNotification.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\RequestNotificationStatus.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\IRouteConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\IRouteHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RequestContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteValueDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\VirtualPathData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\AntiXss\CodeCharts.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\FormsAuthenticationEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\FormsAuthenticationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\PassportAuthenticationEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\PassportAuthenticationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\RoleManagerEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\RoleManagerEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\WindowsAuthenticationEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\WindowsAuthenticationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\State\IReadOnlySessionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\State\IRequiresSessionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\State\SessionStateBehavior.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ClientIDMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ConflictOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ConstructorNeedsTagAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ControlBuilderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\CssClassPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataBindingHandlerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataKeyPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceCacheExpiry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceCapabilities.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceOperation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\FileLevelControlBuilderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\FilterableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterStyle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterTag.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IAttributeAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IAutoFieldGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IBindableControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IBindableTemplate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ICallbackEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IControlBuilderAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IControlDesignerAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataBindingsAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataItemContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataKeysControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataSourceViewSchemaAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDReferencePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IExpressionsAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IFilterResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchicalDataSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchicalEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchyData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ImageClickEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INamingContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INavigateUIData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INonBindingContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IParserAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IPostBackDataHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IPostBackEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IResourceUrlGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IScriptResourceDefinition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IScriptResourceMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStateFormatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStateManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStyleSheet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ITemplate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IThemeResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUrlResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUserControlDesignerAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUserControlTypeResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\NonVisualControlAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\PersistChildrenAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\PersistenceMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\SupportsEventValidationAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TemplateInstance.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TemplateInstanceAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ThemeableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TraceContextEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TraceContextEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\UnobtrusiveValidationMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ValidateRequestMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ViewStateEncryptionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ViewStateMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\Adapters\WmlPostFieldType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AdCreatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AuthenticateEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AuthenticateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AutoCompleteType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BorderStyle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BulletedListEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BulletedListEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ButtonColumnType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ButtonType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CalendarSelectionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ContentDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CreateUserErrorEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CreateUserErrorEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataBoundControlMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlCellType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlRowState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlRowType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridItemEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridItemEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListItemEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListItemEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DayNameFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DayRenderEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewDeletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewDeleteEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewInsertedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewInsertEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewModeEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewModeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewPageEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewPageEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewUpdatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewUpdateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FirstDayOfWeek.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FontSize.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewDeletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewDeleteEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewInsertedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewInsertEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewModeEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewModeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewPageEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewPageEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewUpdatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewUpdateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridLines.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewDeletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewDeleteEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewEditEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewEditEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewPageEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewPageEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewRowEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewRowEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSelectEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSelectEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSortEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSortEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewUpdatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewUpdateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\HorizontalAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\HotSpotMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IButtonControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ICallbackContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ICompositeControlDesignerAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundItemControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundListControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IFieldControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageMapEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IPersistedSelector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IRepeatInfoUser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ListItemType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ListSelectionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LiteralMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginCancelEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginCancelEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginFailureAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LogoutAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MailMessageEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MailMessageEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuRenderingMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MonthChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MonthChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\NextPrevFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\Orientation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerButtons.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerPosition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PathDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeatDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterItemEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterItemEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeatLayout.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SendMailErrorEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ServerValidateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SortDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableCaptionAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableHeaderScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableRowSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TextAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TextBoxMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TitleFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeSelectAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeViewImageSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\UnitType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationCompareOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationDataType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationSummaryDisplayMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidatorDisplay.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\VerticalAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\WebColorConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\FieldCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ITrackingPersonalizable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ITransformerConfigurationControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IVersioningPersonalizable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebActionable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebEditable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartField.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartHttpHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartParameters.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartRow.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ParametersCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PartChromeState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PartChromeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PersonalizationScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\RowCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\TableCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebBrowsableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebDescriptionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebDisplayNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartAuthorizationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartCancelEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartCancelEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartExportMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartHelpMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartVerbsEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartVerbsEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UnvalidatedRequestValuesBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UnvalidatedRequestValuesWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Util\IObjectFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Util\RequestValidationSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Util\StringUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\WebSockets\AspNetWebSocketOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\WebSockets\SubprotocolUtil.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpApplicationStateBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpApplicationStateWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpCachePolicyBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpCachePolicyWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpFileCollectionBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpPostedFileBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpPostedFileWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpRequestBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpResponseBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpServerUtilityBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpSessionStateBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpSessionStateWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Cache\IOutputCacheEntry.cs" />
+    <Compile Include="..\referencesource\System.Web\Cache\OutputCacheProviderCollection.cs" />
+    <Compile Include="..\referencesource\System.Web\Cache\ResponseElement.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\BuildProviderAppliesTo.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\BuildProviderAppliesToAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\ExpressionEditorAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\ExpressionPrefixAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesTo.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\IAssemblyPostProcessor.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\IImplicitResourceProvider.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\AdapterDictionary.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\AsyncPreloadModeFlags.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\AuthenticationMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\AuthorizationRuleAction.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\BrowserCapsElementType.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\BrowserTree.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\CustomErrorsMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\CustomErrorsRedirectMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\CustomWebEventKey.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\DelayedRegex.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\FormsAuthPasswordFormat.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\FormsProtectionEnum.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\IConfigMapPath.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\IConfigMapPathFactory.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\Internal\IInternalConfigWebHost.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\IRemoteWebConfigurationHostServer.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\IServerConfig2.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\MachineKeyCompatibilityMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\MachineKeyValidation.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\PagesEnableSessionState.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\ProcessModelComAuthenticationLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\ProcessModelComImpersonationLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\ProcessModelLogLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\ProfileGuidedOptimizationsFlags.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RegexMatchTimeoutValidator.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RegexMatchTimeoutValidatorAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RpcAuthent.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RpcImpers.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RpcLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\SerializationMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\SystemWebCachingSectionGroup.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\TicketCompatibilityMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\TraceDisplayMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\WebApplicationLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\WebLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\XhtmlConformanceMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\AppDomainProtocolHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\HostingEnvironmentException.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\HTTP_COOKED_URL.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IApplicationHost.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\ICustomLoader.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\ICustomRuntime.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\ICustomRuntimeManager.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IProcessHostPreloadClient.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IProcessHostSupportFunctions.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IProcessPingCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IProcessSuspendListener.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IQueueHost.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IRegisteredObject.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IStopListeningRegisteredObject.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\ISuspendibleRegisteredObject.cs" />
+    <Compile Include="..\referencesource\System.Web\HtmlString.cs" />
+    <Compile Include="..\referencesource\System.Web\HttpChannelBindingToken.cs" />
+    <Compile Include="..\referencesource\System.Web\HttpRawResponse.cs" />
+    <Compile Include="..\referencesource\System.Web\IHtmlString.cs" />
+    <Compile Include="..\referencesource\System.Web\IHttpAsyncHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\IHttpHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\IHttpHandlerFactory.cs" />
+    <Compile Include="..\referencesource\System.Web\IHttpModule.cs" />
+    <Compile Include="..\referencesource\System.Web\IntraPartitionAPIs\xsp\PerfCounterEnum.cs" />
+    <Compile Include="..\referencesource\System.Web\IPrincipalContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\IRequestCompletedNotifier.cs" />
+    <Compile Include="..\referencesource\System.Web\ISubscriptionToken.cs" />
+    <Compile Include="..\referencesource\System.Web\ITlsTokenBindingInfo.cs" />
+    <Compile Include="..\referencesource\System.Web\Management\IInternalWebEventProvider.cs" />
+    <Compile Include="..\referencesource\System.Web\misc\InvariantComparer.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindingBehavior.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindingBehaviorAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindNeverAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindRequiredAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\DictionaryHelpers.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ExtensibleModelBinderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\IModelNameProvider.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\IUnvalidatedValueProviderSource.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\IValueProvider.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\IValueProviderSource.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelBinderProviderOptionsAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelBindingExecutionContext.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelError.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelErrorCollection.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelState.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelStateDictionary.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ValueProviderResult.cs" />
+    <Compile Include="..\referencesource\System.Web\ModuleConfigurationInfo.cs" />
+    <Compile Include="..\referencesource\System.Web\PreApplicationStartMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\DefaultHttpProfile.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\HttpProfileGroupBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\ProfileAuthenticationOptions.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\ProfileEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\ProfileEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\ProfileInfo.cs" />
+    <Compile Include="..\referencesource\System.Web\ReadEntityBodyMode.cs" />
+    <Compile Include="..\referencesource\System.Web\RequestNotification.cs" />
+    <Compile Include="..\referencesource\System.Web\RequestNotificationStatus.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\BoundUrl.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\ContentPathSegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\HttpMethodConstraint.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\IRouteConstraint.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\IRouteHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\LiteralSubsegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\PageRouteHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\ParameterSubsegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\ParsedRoute.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\PathSegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\PathSubsegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RequestContext.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\Route.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteCollection.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteData.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteParser.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteTable.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteValueDictionary.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\SeparatorPathSegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\StopRoutingHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\UrlAuthFailureHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\UrlRoutingHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\UrlRoutingModule.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\VirtualPathData.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\AntiXss\CodeCharts.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\Cryptography\ICryptoService.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\FormsAuthenticationEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\FormsAuthenticationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\PassportAuthenticationEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\PassportAuthenticationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\RoleManagerEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\RoleManagerEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\WindowsAuthenticationEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\WindowsAuthenticationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\State\IReadOnlySessionState.cs" />
+    <Compile Include="..\referencesource\System.Web\State\IRequiresSessionState.cs" />
+    <Compile Include="..\referencesource\System.Web\State\SessionStateBehavior.cs" />
+    <Compile Include="..\referencesource\System.Web\TaskWrapperAsyncResult.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ClientIDMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ConflictOptions.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ConstructorNeedsTagAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ControlBuilderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\CssClassPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataBindingHandlerAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataKeyPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataSourceCacheExpiry.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataSourceCapabilities.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataSourceOperation.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\FileLevelControlBuilderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\FilterableAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\HtmlTextWriterAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\HtmlTextWriterStyle.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\HtmlTextWriterTag.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IAttributeAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IAutoFieldGenerator.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IBindableControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IBindableTemplate.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ICallbackEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IControlBuilderAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IControlDesignerAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataBindingsAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataItemContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataKeysControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataSource.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataSourceViewSchemaAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDReferencePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IExpressionsAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IFilterResolutionService.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IHierarchicalDataSource.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IHierarchicalEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IHierarchyData.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ImageClickEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\INamingContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\INavigateUIData.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\INonBindingContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IParserAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IPostBackDataHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IPostBackEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IResourceUrlGenerator.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IScriptResourceDefinition.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IScriptResourceMapping.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IStateFormatter.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IStateManager.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IStyleSheet.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ITemplate.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IThemeResolutionService.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IUpdatePanel.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IUrlResolutionService.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IUserControlDesignerAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IUserControlTypeResolutionService.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IValidator.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\NonVisualControlAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\PersistChildrenAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\PersistenceMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\SupportsEventValidationAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\TemplateInstance.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\TemplateInstanceAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ThemeableAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\TraceContextEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\TraceContextEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\UnobtrusiveValidationMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ValidateRequestMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ViewStateEncryptionMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ViewStateMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\Adapters\WmlPostFieldType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\AdCreatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\AuthenticateEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\AuthenticateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\AutoCompleteType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\BorderStyle.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\BulletedListEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\BulletedListEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ButtonColumnType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ButtonType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CalendarSelectionMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ContentDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CreateUserErrorEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CreateUserErrorEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataBoundControlMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataControlCellType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataControlRowState.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataControlRowType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridItemEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataListCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataListCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataListItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataListItemEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DayNameFormat.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DayRenderEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewDeletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewDeleteEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewInsertedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewInsertEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewModeEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewModeEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewPageEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewPageEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewUpdatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewUpdateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FirstDayOfWeek.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FontSize.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewDeletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewDeleteEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewInsertedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewInsertEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewModeEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewModeEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewPageEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewPageEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewUpdatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewUpdateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridLines.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewDeletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewDeleteEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewEditEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewEditEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewPageEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewPageEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewRowEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewRowEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSelectEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSelectEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSortEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSortEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewUpdatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewUpdateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\HorizontalAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\HotSpotMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IBorderPaddingControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IButtonControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ICallbackContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ICheckBoxControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ICompositeControlDesignerAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundItemControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundListControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IEditableTextControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IFieldControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IPersistedSelector.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IPostBackContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IRenderOuterTableControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IRepeatInfoUser.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ITextControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IWizardSideBarListControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ListItemType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ListSelectionMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LiteralMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LoginCancelEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LoginCancelEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LoginFailureAction.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LogoutAction.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MailMessageEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MailMessageEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MenuEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MenuEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MenuRenderingMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MonthChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MonthChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\NextPrevFormat.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\Orientation.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\PagerButtons.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\PagerMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\PagerPosition.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\PathDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeatDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterItemEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeatLayout.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SendMailErrorEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ServerValidateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SiteMapNodeItemType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SortDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TableCaptionAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TableHeaderScope.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TableRowSection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TextAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TextBoxMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TitleFormat.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TreeNodeEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TreeNodeEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TreeNodeSelectAction.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TreeViewImageSet.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\UnitType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ValidationCompareOperator.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ValidationDataType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ValidationSummaryDisplayMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ValidatorDisplay.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\VerticalAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\WebColorConverter.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\WizardSideBarListControlItem.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\WizardSideBarListControlItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\FieldCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\ITrackingPersonalizable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\ITransformerConfigurationControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IVersioningPersonalizable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebActionable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebEditable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPart.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartField.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartHttpHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartParameters.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartRow.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartTable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\ParametersCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\PartChromeState.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\PartChromeType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\PersonalizationScope.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\RowCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\TableCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebBrowsableAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebDescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebDisplayNameAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartAuthorizationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartCancelEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartCancelEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartExportMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartHelpMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartVerbsEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartVerbsEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UnvalidatedRequestValuesBase.cs" />
+    <Compile Include="..\referencesource\System.Web\UnvalidatedRequestValuesWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\AppVerifierErrorCode.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\AppVerifierException.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\AssemblyUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\BinaryCompatibility.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\DateTimeUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\DisposableAction.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\DoNotResetAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\EmptyCollection.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\EnumerationRangeValidationUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ExceptionUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\FastDelegateCreator.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\GCUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\hresults.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\IObjectFactory.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ISyncContext.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ISyncContextLock.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\Msec.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ObjectSet.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\OrderingMethodFinder.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ParseHttpDate.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\PathUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\QueryableUtility.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\RegexUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\RequestValidationSource.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\Sec.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\SimpleRecyclingCache.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\StringUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\SymbolEqualComparer.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\SynchronizationContextMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\VersionUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\ValidateStringCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSockets\AspNetWebSocketOptions.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSockets\SubprotocolUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSocketTransitionState.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSysDefaultValueAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSysDescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSysDisplayNameAttribute.cs" />
     <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />
     <Compile Include="..\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />
     <Compile Include="..\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />
@@ -470,7 +571,6 @@
     <Compile Include="System.Web.Caching\OutputCache.cs" />
     <Compile Include="System.Web.Caching\OutputCacheModule.cs" />
     <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />
-    <Compile Include="System.Web.Caching\OutputCacheProviderCollection.cs" />
     <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />
     <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />
     <Compile Include="System.Web.Caching\SubstitutionResponseElement.cs" />
@@ -548,7 +648,6 @@
     <Compile Include="System.Web.Compilation\WebServiceCompiler.cs" />
     <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />
     <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />
-    <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />
     <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />
     <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />
     <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />
@@ -728,13 +827,9 @@
     <Compile Include="System.Web.Management\WebEventCodes.cs" />
     <Compile Include="System.Web.Management\WebEventFormatter.cs" />
     <Compile Include="System.Web.Profile\CustomProviderDataAttribute.cs" />
-    <Compile Include="System.Web.Profile\DefaultProfile.cs" />
-    <Compile Include="System.Web.Profile\ProfileAuthenticationOption.cs" />
     <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />
     <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />
     <Compile Include="System.Web.Profile\ProfileBase.cs" />
-    <Compile Include="System.Web.Profile\ProfileInfo.cs" />
-    <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />
     <Compile Include="System.Web.Profile\ProfileManager.cs" />
     <Compile Include="System.Web.Profile\ProfileMigrateEventArgs.cs" />
     <Compile Include="System.Web.Profile\ProfileMigrateEventHandler.cs" />
@@ -747,18 +842,6 @@
     <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />
     <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />
     <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />
-    <Compile Include="System.Web.Routing\HttpMethodConstraint.cs" />
-    <Compile Include="System.Web.Routing\PageRouteHandler.cs" />
-    <Compile Include="System.Web.Routing\PatternParser.cs" />
-    <Compile Include="System.Web.Routing\PatternToken.cs" />
-    <Compile Include="System.Web.Routing\PatternTokenType.cs" />
-    <Compile Include="System.Web.Routing\Route.cs" />
-    <Compile Include="System.Web.Routing\RouteCollection.cs" />
-    <Compile Include="System.Web.Routing\RouteData.cs" />
-    <Compile Include="System.Web.Routing\RouteValueDictionaryExtensions.cs" />
-    <Compile Include="System.Web.Routing\StopRoutingHandler.cs" />
-    <Compile Include="System.Web.Routing\UrlRoutingHandler.cs" />
-    <Compile Include="System.Web.Routing\UrlRoutingModule.cs" />
     <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />
     <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />
     <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />
@@ -990,7 +1073,6 @@
     <Compile Include="System.Web.UI.WebControls\ImageField.cs" />
     <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />
     <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />
-    <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />
     <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />
     <Compile Include="System.Web.UI.WebControls\Label.cs" />
     <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />
@@ -1180,14 +1262,11 @@
     <Compile Include="System.Web.UI\Html32TextWriter.cs" />
     <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />
     <Compile Include="System.Web.UI\HtmlTextWriter.cs" />
-    <Compile Include="System.Web.UI\ICheckBoxControl.cs" />
-    <Compile Include="System.Web.UI\IEditableTextControl.cs" />
     <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />
     <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />
     <Compile Include="System.Web.UI\IndexedString.cs" />
     <Compile Include="System.Web.UI\IScriptManager.cs" />
     <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />
-    <Compile Include="System.Web.UI\ITextControl.cs" />
     <Compile Include="System.Web.UI\ListSourceHelper.cs" />
     <Compile Include="System.Web.UI\LiteralControl.cs" />
     <Compile Include="System.Web.UI\LosFormatter.cs" />
@@ -1253,6 +1332,7 @@
     <Compile Include="System.Web.UI\UserControl.cs" />
     <Compile Include="System.Web.UI\UserControlControlBuilder.cs" />
     <Compile Include="System.Web.UI\UserControlParser.cs" />
+    <Compile Include="System.Web.UI\Util.cs" />
     <Compile Include="System.Web.UI\ValidationPropertyAttribute.cs" />
     <Compile Include="System.Web.UI\ValidatorCollection.cs" />
     <Compile Include="System.Web.UI\VerificationAttribute.cs" />
@@ -1309,7 +1389,6 @@
     <Compile Include="System.Web\ExceptionPageTemplateValues.cs" />
     <Compile Include="System.Web\HeadersCollection.cs" />
     <Compile Include="System.Web\HtmlizedException.cs" />
-    <Compile Include="System.Web\HtmlString.cs" />
     <Compile Include="System.Web\HttpApplication.cs" />
     <Compile Include="System.Web\HttpApplicationFactory.cs" />
     <Compile Include="System.Web\HttpApplicationState.cs" />
@@ -1398,7 +1477,6 @@
     <Compile Include="System.Web\WebCategoryAttribute.cs" />
     <Compile Include="System.Web\WebPageTraceListener.cs" />
     <Compile Include="System.Web\WebROCollection.cs" />
-    <Compile Include="System.Web\WebSysDescriptionAttribute.cs" />
     <Compile Include="System.Web\XmlSiteMapProvider.cs" />
     <Compile Include="System.Web\UplevelHelper.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -1409,15 +1487,16 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -1428,18 +1507,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
-      <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
-      <Name>System.Configuration-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj">
-      <Project>{371560EA-7BD3-4025-90CB-F1B112403CF2}</Project>
-      <Name>Mono.Data.Sqlite-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
-      <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
-      <Name>System.Web.ApplicationServices-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -1472,22 +1539,31 @@
       <Project>{8F86C287-38A5-49F8-BE6D-1E0E3D74AF39}</Project>
       <Name>System.ComponentModel.DataAnnotations-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
+      <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
+      <Name>System.Web.ApplicationServices-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
+      <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
+      <Name>System.Configuration-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj">
+      <Project>{371560EA-7BD3-4025-90CB-F1B112403CF2}</Project>
+      <Name>Mono.Data.Sqlite-net_4_x</Name>
+    </ProjectReference>
     <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_x.csproj">
       <Project>{E43ADBA7-5DB9-466B-90C6-FFFDA520848D}</Project>
       <Name>System.Web.Services-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Design/System.Design-net_4_x.csproj">
-      <Project>{EFEDC380-2CB0-4B40-9566-D2302867A4D9}</Project>
-      <Name>System.Design-net_4_x</Name>
+    <ProjectReference Include="../System.Design/System.Design-plaindesign-net_4_x.csproj">
+      <Project>{DCE556E9-EF89-45F3-A51F-83D3C3E0FEF5}</Project>
+      <Name>System.Design-plaindesign-net_4_x</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="resources/TranslationResources.resources">
-      <LogicalName>TranslationResources.resources</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="resources/WebUIValidation.js">
       <LogicalName>WebUIValidation.js</LogicalName>
     </EmbeddedResource>
@@ -1650,6 +1726,9 @@
     <EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">
       <LogicalName>MenuModern.js</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="resources/TranslationResources.resx">
+      <LogicalName>TranslationResources.resources</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
 
diff --git a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
index df7651cee19..9d2976f9148 100644
--- a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,612,618,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x/plainweb</OutputPath>
+    <IntermediateOutputPath>obj-plainweb</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,384 +48,482 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpApplicationStateBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpApplicationStateWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpCachePolicyBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpCachePolicyWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpFileCollectionBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpPostedFileBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpPostedFileWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpRequestBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpResponseBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpServerUtilityBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpSessionStateBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpSessionStateWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Cache\IOutputCacheEntry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Cache\ResponseElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\BuildProviderAppliesTo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\BuildProviderAppliesToAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\ExpressionEditorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\ExpressionPrefixAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesTo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\IAssemblyPostProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\IImplicitResourceProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AdapterDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AsyncPreloadModeFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AuthenticationMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AuthorizationRuleAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\BrowserCapsElementType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\BrowserTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomErrorsMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomErrorsRedirectMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomWebEventKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\DelayedRegex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\FormsAuthPasswordFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\FormsProtectionEnum.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IConfigMapPath.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IConfigMapPathFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IRemoteWebConfigurationHostServer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\MachineKeyCompatibilityMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\MachineKeyValidation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\PagesEnableSessionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelComAuthenticationLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelComImpersonationLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelLogLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProfileGuidedOptimizationsFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RegexMatchTimeoutValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RegexMatchTimeoutValidatorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcAuthent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcImpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\SerializationMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\SystemWebCachingSectionGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\TicketCompatibilityMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\TraceDisplayMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\WebApplicationLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\WebLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\XhtmlConformanceMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Hosting\IApplicationHost.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Hosting\IRegisteredObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHtmlString.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpAsyncHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpHandlerFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpModule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ISubscriptionToken.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ITlsTokenBindingInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindingBehavior.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindingBehaviorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindNeverAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindRequiredAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ExtensibleModelBinderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\IModelNameProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelBinderProviderOptionsAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelErrorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\PreApplicationStartMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\HttpProfileGroupBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\ProfileEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\ProfileEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\ReadEntityBodyMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\RequestNotification.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\RequestNotificationStatus.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\IRouteConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\IRouteHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RequestContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteValueDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\VirtualPathData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\AntiXss\CodeCharts.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\FormsAuthenticationEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\FormsAuthenticationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\PassportAuthenticationEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\PassportAuthenticationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\RoleManagerEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\RoleManagerEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\WindowsAuthenticationEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Security\WindowsAuthenticationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\State\IReadOnlySessionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\State\IRequiresSessionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\State\SessionStateBehavior.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ClientIDMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ConflictOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ConstructorNeedsTagAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ControlBuilderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\CssClassPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataBindingHandlerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataKeyPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceCacheExpiry.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceCapabilities.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceOperation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\FileLevelControlBuilderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\FilterableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterStyle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterTag.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IAttributeAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IAutoFieldGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IBindableControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IBindableTemplate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ICallbackEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IControlBuilderAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IControlDesignerAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataBindingsAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataItemContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataKeysControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataSourceViewSchemaAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDReferencePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IExpressionsAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IFilterResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchicalDataSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchicalEnumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchyData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ImageClickEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INamingContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INavigateUIData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INonBindingContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IParserAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IPostBackDataHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IPostBackEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IResourceUrlGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IScriptResourceDefinition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IScriptResourceMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStateFormatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStateManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStyleSheet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ITemplate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IThemeResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUrlResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUserControlDesignerAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUserControlTypeResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\NonVisualControlAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\PersistChildrenAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\PersistenceMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\SupportsEventValidationAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TemplateInstance.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TemplateInstanceAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ThemeableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TraceContextEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TraceContextEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\UnobtrusiveValidationMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ValidateRequestMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ViewStateEncryptionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ViewStateMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\Adapters\WmlPostFieldType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AdCreatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AuthenticateEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AuthenticateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AutoCompleteType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BorderStyle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BulletedListEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BulletedListEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ButtonColumnType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ButtonType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CalendarSelectionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ContentDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CreateUserErrorEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CreateUserErrorEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataBoundControlMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlCellType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlRowState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlRowType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridItemEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridItemEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListItemEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListItemEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DayNameFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DayRenderEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewDeletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewDeleteEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewInsertedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewInsertEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewModeEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewModeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewPageEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewPageEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewUpdatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewUpdateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FirstDayOfWeek.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FontSize.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewDeletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewDeleteEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewInsertedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewInsertEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewModeEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewModeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewPageEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewPageEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewUpdatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewUpdateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridLines.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewDeletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewDeleteEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewEditEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewEditEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewPageEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewPageEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewRowEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewRowEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSelectEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSelectEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSortEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSortEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewUpdatedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewUpdateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\HorizontalAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\HotSpotMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IButtonControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ICallbackContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ICompositeControlDesignerAccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundItemControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundListControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IFieldControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageMapEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IPersistedSelector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IRepeatInfoUser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ListItemType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ListSelectionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LiteralMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginCancelEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginCancelEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginFailureAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LogoutAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MailMessageEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MailMessageEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuRenderingMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MonthChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MonthChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\NextPrevFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\Orientation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerButtons.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerPosition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PathDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeatDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterItemEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterItemEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeatLayout.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SendMailErrorEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ServerValidateEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SortDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableCaptionAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableHeaderScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableRowSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TextAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TextBoxMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TitleFormat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeSelectAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeViewImageSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\UnitType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationCompareOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationDataType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationSummaryDisplayMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidatorDisplay.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\VerticalAlign.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\WebColorConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\FieldCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ITrackingPersonalizable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ITransformerConfigurationControl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IVersioningPersonalizable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebActionable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebEditable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartField.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartHttpHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartParameters.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartRow.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ParametersCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PartChromeState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PartChromeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PersonalizationScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\RowCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\TableCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebBrowsableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebDescriptionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebDisplayNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartAuthorizationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartCancelEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartCancelEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartExportMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartHelpMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartVerbsEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartVerbsEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UnvalidatedRequestValuesBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\UnvalidatedRequestValuesWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Util\IObjectFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Util\RequestValidationSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\Util\StringUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\WebSockets\AspNetWebSocketOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Web\WebSockets\SubprotocolUtil.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpApplicationStateBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpApplicationStateWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpCachePolicyBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpCachePolicyWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpFileCollectionBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpPostedFileBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpPostedFileWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpRequestBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpResponseBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpServerUtilityBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpSessionStateBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpSessionStateWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Cache\IOutputCacheEntry.cs" />
+    <Compile Include="..\referencesource\System.Web\Cache\OutputCacheProviderCollection.cs" />
+    <Compile Include="..\referencesource\System.Web\Cache\ResponseElement.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\BuildProviderAppliesTo.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\BuildProviderAppliesToAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\ExpressionEditorAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\ExpressionPrefixAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesTo.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\IAssemblyPostProcessor.cs" />
+    <Compile Include="..\referencesource\System.Web\Compilation\IImplicitResourceProvider.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\AdapterDictionary.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\AsyncPreloadModeFlags.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\AuthenticationMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\AuthorizationRuleAction.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\BrowserCapsElementType.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\BrowserTree.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\CustomErrorsMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\CustomErrorsRedirectMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\CustomWebEventKey.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\DelayedRegex.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\FormsAuthPasswordFormat.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\FormsProtectionEnum.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\IConfigMapPath.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\IConfigMapPathFactory.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\Internal\IInternalConfigWebHost.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\IRemoteWebConfigurationHostServer.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\IServerConfig2.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\MachineKeyCompatibilityMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\MachineKeyValidation.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\PagesEnableSessionState.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\ProcessModelComAuthenticationLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\ProcessModelComImpersonationLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\ProcessModelLogLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\ProfileGuidedOptimizationsFlags.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RegexMatchTimeoutValidator.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RegexMatchTimeoutValidatorAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RpcAuthent.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RpcImpers.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\RpcLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\SerializationMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\SystemWebCachingSectionGroup.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\TicketCompatibilityMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\TraceDisplayMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\WebApplicationLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\WebLevel.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\XhtmlConformanceMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\AppDomainProtocolHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\HostingEnvironmentException.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\HTTP_COOKED_URL.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IApplicationHost.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\ICustomLoader.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\ICustomRuntime.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\ICustomRuntimeManager.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IProcessHostPreloadClient.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IProcessHostSupportFunctions.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IProcessPingCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IProcessSuspendListener.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IQueueHost.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IRegisteredObject.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\IStopListeningRegisteredObject.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\ISuspendibleRegisteredObject.cs" />
+    <Compile Include="..\referencesource\System.Web\HtmlString.cs" />
+    <Compile Include="..\referencesource\System.Web\HttpChannelBindingToken.cs" />
+    <Compile Include="..\referencesource\System.Web\HttpRawResponse.cs" />
+    <Compile Include="..\referencesource\System.Web\IHtmlString.cs" />
+    <Compile Include="..\referencesource\System.Web\IHttpAsyncHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\IHttpHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\IHttpHandlerFactory.cs" />
+    <Compile Include="..\referencesource\System.Web\IHttpModule.cs" />
+    <Compile Include="..\referencesource\System.Web\IntraPartitionAPIs\xsp\PerfCounterEnum.cs" />
+    <Compile Include="..\referencesource\System.Web\IPrincipalContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\IRequestCompletedNotifier.cs" />
+    <Compile Include="..\referencesource\System.Web\ISubscriptionToken.cs" />
+    <Compile Include="..\referencesource\System.Web\ITlsTokenBindingInfo.cs" />
+    <Compile Include="..\referencesource\System.Web\Management\IInternalWebEventProvider.cs" />
+    <Compile Include="..\referencesource\System.Web\misc\InvariantComparer.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindingBehavior.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindingBehaviorAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindNeverAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindRequiredAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\DictionaryHelpers.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ExtensibleModelBinderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\IModelNameProvider.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\IUnvalidatedValueProviderSource.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\IValueProvider.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\IValueProviderSource.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelBinderProviderOptionsAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelBindingExecutionContext.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelError.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelErrorCollection.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelState.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ModelStateDictionary.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\ValueProviderResult.cs" />
+    <Compile Include="..\referencesource\System.Web\ModuleConfigurationInfo.cs" />
+    <Compile Include="..\referencesource\System.Web\PreApplicationStartMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\DefaultHttpProfile.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\HttpProfileGroupBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\ProfileAuthenticationOptions.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\ProfileEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\ProfileEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Profile\ProfileInfo.cs" />
+    <Compile Include="..\referencesource\System.Web\ReadEntityBodyMode.cs" />
+    <Compile Include="..\referencesource\System.Web\RequestNotification.cs" />
+    <Compile Include="..\referencesource\System.Web\RequestNotificationStatus.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\BoundUrl.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\ContentPathSegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\HttpMethodConstraint.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\IRouteConstraint.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\IRouteHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\LiteralSubsegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\PageRouteHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\ParameterSubsegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\ParsedRoute.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\PathSegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\PathSubsegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RequestContext.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\Route.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteBase.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteCollection.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteData.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteParser.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteTable.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\RouteValueDictionary.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\SeparatorPathSegment.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\StopRoutingHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\UrlAuthFailureHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\UrlRoutingHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\UrlRoutingModule.cs" />
+    <Compile Include="..\referencesource\System.Web\Routing\VirtualPathData.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\AntiXss\CodeCharts.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\Cryptography\ICryptoService.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\FormsAuthenticationEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\FormsAuthenticationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\PassportAuthenticationEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\PassportAuthenticationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\RoleManagerEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\RoleManagerEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\WindowsAuthenticationEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\Security\WindowsAuthenticationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\State\IReadOnlySessionState.cs" />
+    <Compile Include="..\referencesource\System.Web\State\IRequiresSessionState.cs" />
+    <Compile Include="..\referencesource\System.Web\State\SessionStateBehavior.cs" />
+    <Compile Include="..\referencesource\System.Web\TaskWrapperAsyncResult.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ClientIDMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ConflictOptions.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ConstructorNeedsTagAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ControlBuilderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\CssClassPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataBindingHandlerAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataKeyPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataSourceCacheExpiry.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataSourceCapabilities.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\DataSourceOperation.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\FileLevelControlBuilderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\FilterableAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\HtmlTextWriterAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\HtmlTextWriterStyle.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\HtmlTextWriterTag.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IAttributeAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IAutoFieldGenerator.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IBindableControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IBindableTemplate.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ICallbackEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IControlBuilderAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IControlDesignerAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataBindingsAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataItemContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataKeysControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataSource.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDataSourceViewSchemaAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDReferencePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IExpressionsAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IFilterResolutionService.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IHierarchicalDataSource.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IHierarchicalEnumerable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IHierarchyData.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ImageClickEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\INamingContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\INavigateUIData.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\INonBindingContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IParserAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IPostBackDataHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IPostBackEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IResourceUrlGenerator.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IScriptResourceDefinition.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IScriptResourceMapping.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IStateFormatter.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IStateManager.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IStyleSheet.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ITemplate.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IThemeResolutionService.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IUpdatePanel.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IUrlResolutionService.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IUserControlDesignerAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IUserControlTypeResolutionService.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IValidator.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\NonVisualControlAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\PersistChildrenAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\PersistenceMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\SupportsEventValidationAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\TemplateInstance.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\TemplateInstanceAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ThemeableAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\TraceContextEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\TraceContextEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\UnobtrusiveValidationMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ValidateRequestMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ViewStateEncryptionMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ViewStateMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\Adapters\WmlPostFieldType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\AdCreatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\AuthenticateEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\AuthenticateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\AutoCompleteType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\BorderStyle.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\BulletedListEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\BulletedListEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ButtonColumnType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ButtonType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CalendarSelectionMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ContentDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CreateUserErrorEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\CreateUserErrorEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataBoundControlMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataControlCellType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataControlRowState.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataControlRowType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridItemEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataListCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataListCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataListItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DataListItemEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DayNameFormat.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DayRenderEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewDeletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewDeleteEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewInsertedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewInsertEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewModeEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewModeEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewPageEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewPageEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewUpdatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewUpdateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FirstDayOfWeek.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FontSize.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewDeletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewDeleteEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewInsertedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewInsertEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewModeEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewModeEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewPageEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewPageEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewUpdatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewUpdateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridLines.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewDeletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewDeleteEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewEditEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewEditEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewPageEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewPageEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewRowEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewRowEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSelectEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSelectEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSortEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSortEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewUpdatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewUpdateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\HorizontalAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\HotSpotMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IBorderPaddingControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IButtonControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ICallbackContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ICheckBoxControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ICompositeControlDesignerAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundItemControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundListControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IEditableTextControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IFieldControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IPersistedSelector.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IPostBackContainer.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IRenderOuterTableControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IRepeatInfoUser.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ITextControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\IWizardSideBarListControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ListItemType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ListSelectionMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LiteralMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LoginCancelEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LoginCancelEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LoginFailureAction.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\LogoutAction.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MailMessageEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MailMessageEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MenuEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MenuEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MenuRenderingMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MonthChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\MonthChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\NextPrevFormat.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\Orientation.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\PagerButtons.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\PagerMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\PagerPosition.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\PathDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeatDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterItemEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeatLayout.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SendMailErrorEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ServerValidateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SiteMapNodeItemType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SortDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TableCaptionAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TableHeaderScope.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TableRowSection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TextAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TextBoxMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TitleFormat.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TreeNodeEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TreeNodeEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TreeNodeSelectAction.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TreeViewImageSet.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\UnitType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ValidationCompareOperator.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ValidationDataType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ValidationSummaryDisplayMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ValidatorDisplay.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\VerticalAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\WebColorConverter.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\WizardSideBarListControlItem.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\WizardSideBarListControlItemEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\FieldCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\ITrackingPersonalizable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\ITransformerConfigurationControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IVersioningPersonalizable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebActionable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebEditable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPart.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartField.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartHttpHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartParameters.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartRow.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\IWebPartTable.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\ParametersCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\PartChromeState.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\PartChromeType.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\PersonalizationScope.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\RowCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\TableCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebBrowsableAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebDescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebDisplayNameAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartAuthorizationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartCancelEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartCancelEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartExportMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartHelpMode.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartVerbsEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebParts\WebPartVerbsEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UnvalidatedRequestValuesBase.cs" />
+    <Compile Include="..\referencesource\System.Web\UnvalidatedRequestValuesWrapper.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\AppVerifierErrorCode.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\AppVerifierException.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\AssemblyUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\BinaryCompatibility.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\DateTimeUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\DisposableAction.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\DoNotResetAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\EmptyCollection.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\EnumerationRangeValidationUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ExceptionUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\FastDelegateCreator.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\GCUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\hresults.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\IObjectFactory.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ISyncContext.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ISyncContextLock.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\Msec.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ObjectSet.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\OrderingMethodFinder.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\ParseHttpDate.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\PathUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\QueryableUtility.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\RegexUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\RequestValidationSource.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\Sec.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\SimpleRecyclingCache.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\StringUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\SymbolEqualComparer.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\SynchronizationContextMode.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\VersionUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\ValidateStringCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSockets\AspNetWebSocketOptions.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSockets\SubprotocolUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSocketTransitionState.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSysDefaultValueAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSysDescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSysDisplayNameAttribute.cs" />
     <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />
     <Compile Include="..\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />
     <Compile Include="..\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />
@@ -470,7 +571,6 @@
     <Compile Include="System.Web.Caching\OutputCache.cs" />
     <Compile Include="System.Web.Caching\OutputCacheModule.cs" />
     <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />
-    <Compile Include="System.Web.Caching\OutputCacheProviderCollection.cs" />
     <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />
     <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />
     <Compile Include="System.Web.Caching\SubstitutionResponseElement.cs" />
@@ -548,7 +648,6 @@
     <Compile Include="System.Web.Compilation\WebServiceCompiler.cs" />
     <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />
     <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />
-    <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />
     <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />
     <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />
     <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />
@@ -728,13 +827,9 @@
     <Compile Include="System.Web.Management\WebEventCodes.cs" />
     <Compile Include="System.Web.Management\WebEventFormatter.cs" />
     <Compile Include="System.Web.Profile\CustomProviderDataAttribute.cs" />
-    <Compile Include="System.Web.Profile\DefaultProfile.cs" />
-    <Compile Include="System.Web.Profile\ProfileAuthenticationOption.cs" />
     <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />
     <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />
     <Compile Include="System.Web.Profile\ProfileBase.cs" />
-    <Compile Include="System.Web.Profile\ProfileInfo.cs" />
-    <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />
     <Compile Include="System.Web.Profile\ProfileManager.cs" />
     <Compile Include="System.Web.Profile\ProfileMigrateEventArgs.cs" />
     <Compile Include="System.Web.Profile\ProfileMigrateEventHandler.cs" />
@@ -747,18 +842,6 @@
     <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />
     <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />
     <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />
-    <Compile Include="System.Web.Routing\HttpMethodConstraint.cs" />
-    <Compile Include="System.Web.Routing\PageRouteHandler.cs" />
-    <Compile Include="System.Web.Routing\PatternParser.cs" />
-    <Compile Include="System.Web.Routing\PatternToken.cs" />
-    <Compile Include="System.Web.Routing\PatternTokenType.cs" />
-    <Compile Include="System.Web.Routing\Route.cs" />
-    <Compile Include="System.Web.Routing\RouteCollection.cs" />
-    <Compile Include="System.Web.Routing\RouteData.cs" />
-    <Compile Include="System.Web.Routing\RouteValueDictionaryExtensions.cs" />
-    <Compile Include="System.Web.Routing\StopRoutingHandler.cs" />
-    <Compile Include="System.Web.Routing\UrlRoutingHandler.cs" />
-    <Compile Include="System.Web.Routing\UrlRoutingModule.cs" />
     <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />
     <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />
     <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />
@@ -990,7 +1073,6 @@
     <Compile Include="System.Web.UI.WebControls\ImageField.cs" />
     <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />
     <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />
-    <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />
     <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />
     <Compile Include="System.Web.UI.WebControls\Label.cs" />
     <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />
@@ -1180,14 +1262,11 @@
     <Compile Include="System.Web.UI\Html32TextWriter.cs" />
     <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />
     <Compile Include="System.Web.UI\HtmlTextWriter.cs" />
-    <Compile Include="System.Web.UI\ICheckBoxControl.cs" />
-    <Compile Include="System.Web.UI\IEditableTextControl.cs" />
     <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />
     <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />
     <Compile Include="System.Web.UI\IndexedString.cs" />
     <Compile Include="System.Web.UI\IScriptManager.cs" />
     <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />
-    <Compile Include="System.Web.UI\ITextControl.cs" />
     <Compile Include="System.Web.UI\ListSourceHelper.cs" />
     <Compile Include="System.Web.UI\LiteralControl.cs" />
     <Compile Include="System.Web.UI\LosFormatter.cs" />
@@ -1253,6 +1332,7 @@
     <Compile Include="System.Web.UI\UserControl.cs" />
     <Compile Include="System.Web.UI\UserControlControlBuilder.cs" />
     <Compile Include="System.Web.UI\UserControlParser.cs" />
+    <Compile Include="System.Web.UI\Util.cs" />
     <Compile Include="System.Web.UI\ValidationPropertyAttribute.cs" />
     <Compile Include="System.Web.UI\ValidatorCollection.cs" />
     <Compile Include="System.Web.UI\VerificationAttribute.cs" />
@@ -1309,7 +1389,6 @@
     <Compile Include="System.Web\ExceptionPageTemplateValues.cs" />
     <Compile Include="System.Web\HeadersCollection.cs" />
     <Compile Include="System.Web\HtmlizedException.cs" />
-    <Compile Include="System.Web\HtmlString.cs" />
     <Compile Include="System.Web\HttpApplication.cs" />
     <Compile Include="System.Web\HttpApplicationFactory.cs" />
     <Compile Include="System.Web\HttpApplicationState.cs" />
@@ -1398,7 +1477,6 @@
     <Compile Include="System.Web\WebCategoryAttribute.cs" />
     <Compile Include="System.Web\WebPageTraceListener.cs" />
     <Compile Include="System.Web\WebROCollection.cs" />
-    <Compile Include="System.Web\WebSysDescriptionAttribute.cs" />
     <Compile Include="System.Web\XmlSiteMapProvider.cs" />
     <Compile Include="System.Web\UplevelHelper.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -1409,15 +1487,16 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -1428,18 +1507,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
-      <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
-      <Name>System.Configuration-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj">
-      <Project>{371560EA-7BD3-4025-90CB-F1B112403CF2}</Project>
-      <Name>Mono.Data.Sqlite-net_4_x</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
-      <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
-      <Name>System.Web.ApplicationServices-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -1472,14 +1539,23 @@
       <Project>{8F86C287-38A5-49F8-BE6D-1E0E3D74AF39}</Project>
       <Name>System.ComponentModel.DataAnnotations-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
+      <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
+      <Name>System.Web.ApplicationServices-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
+      <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
+      <Name>System.Configuration-net_4_x</Name>
+    </ProjectReference>
+    <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj">
+      <Project>{371560EA-7BD3-4025-90CB-F1B112403CF2}</Project>
+      <Name>Mono.Data.Sqlite-net_4_x</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="resources/TranslationResources.resources">
-      <LogicalName>TranslationResources.resources</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="resources/WebUIValidation.js">
       <LogicalName>WebUIValidation.js</LogicalName>
     </EmbeddedResource>
@@ -1642,6 +1718,9 @@
     <EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">
       <LogicalName>MenuModern.js</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="resources/TranslationResources.resx">
+      <LogicalName>TranslationResources.resources</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
 
diff --git a/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs b/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
index 491d74f6c4d..651d8bf4c85 100644
--- a/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
+++ b/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
@@ -212,21 +212,18 @@ namespace System.Web.Security
 				strCookiePath = cookiePath;
 
 			DateTime now = DateTime.Now;
-			DateTime then;
-	            	if (createPersistentCookie)
-	                	then = now.AddMinutes(timeout);
-	            	else
-	                	then = DateTime.MinValue;
+			DateTime ticketExpiry = now.AddMinutes(timeout);
+	            	DateTime cookieExpiry = createPersistentCookie ? ticketExpiry : DateTime.MinValue;
 
 			FormsAuthenticationTicket ticket = new FormsAuthenticationTicket (1,
 											  userName,
 											  now,
-                                              createPersistentCookie?then:now.AddYears (50),
+											  ticketExpiry,
 											  createPersistentCookie,
 											  String.Empty,
 											  cookiePath);
 
-			HttpCookie cookie = new HttpCookie (cookieName, Encrypt (ticket), strCookiePath, then);
+			HttpCookie cookie = new HttpCookie (cookieName, Encrypt (ticket), strCookiePath, cookieExpiry);
 			if (requireSSL)
 				cookie.Secure = true;
 			if (!String.IsNullOrEmpty (cookie_domain))
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
index 4536dedf18a..c0e9516a945 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
@@ -284,7 +284,7 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[Browsable (true)]
-		public virtual new string SkinID
+		public override string SkinID
 		{
 			get { return base.SkinID; }
 			set { base.SkinID = value; }
diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
index 5d47c27349a..5f47d1326e0 100644
--- a/mcs/class/System.Web/System.Web.dll.sources
+++ b/mcs/class/System.Web/System.Web.dll.sources
@@ -24,7 +24,6 @@ Mono.Web.Util/SettingsMapping.cs
 Mono.Web.Util/SettingsMappingManager.cs
 Mono.Web.Util/SettingsMappingWhat.cs
 
-ReferenceSources/SR.cs
 System.Web/ApplicationShutdownReason.cs
 System.Web/BeginEventHandler.cs
 System.Web.Caching/AggregateCacheDependency.cs
@@ -629,7 +628,6 @@ System.Web.UI/HtmlTextWriter.cs
 ../referencesource/System.Web/UI/IDataSource.cs
 ../referencesource/System.Web/UI/IDataSourceViewSchemaAccessor.cs
 ../referencesource/System.Web/UI/IDReferencePropertyAttribute.cs
-../referencesource/System.Web/UI/WebControls/IEditableTextControl.cs
 ../referencesource/System.Web/UI/IExpressionsAccessor.cs
 ../referencesource/System.Web/UI/IFilterResolutionService.cs
 System.Web.UI/IgnoreUnknownContentAttribute.cs
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_x.csproj b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_x.csproj
index 50d6266a284..9064929de01 100644
--- a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_x.csproj
+++ b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -192,15 +195,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
index 7d98c83d486..c1e931e0a9b 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618,612,809</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -963,15 +966,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -1047,7 +1049,7 @@
     <EmbeddedResource Include="resources/DnDMove.cur">
       <LogicalName>System.Windows.Forms.DnDMove.cur</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="resources/keyboards.resources">
+    <EmbeddedResource Include="resources/keyboards.resources.prebuilt">
       <LogicalName>keyboards.resources</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="resources/16_computer.png">
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Application.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Application.cs
index 2c2d5bf931d..e4f980e60df 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/Application.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Application.cs
@@ -969,8 +969,8 @@ namespace System.Windows.Forms
 
 				EnableFormsForModalLoop (toplevels, context);
 				
-				if (context.MainForm != null && context.MainForm.IsHandleCreated) {
-					XplatUI.SetModal (context.MainForm.Handle, false);
+				if (old != null && old.IsHandleCreated) {
+					XplatUI.SetModal (old.Handle, false);
 				}
 				#if DebugRunLoop
 					Console.WriteLine ("   Done with the SetModal");
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
index 913fb8a57fb..a8f92d12389 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
@@ -2842,7 +2842,7 @@ namespace System.Windows.Forms {
 					try {
 						var clipboardAtom = gdk_atom_intern ("CLIPBOARD", true);
 						var clipboard = gtk_clipboard_get (clipboardAtom);
-						if (clipboard != null) {
+						if (clipboard != IntPtr.Zero) {
 							// for now we only store text
 							var text = Clipboard.GetRtfText ();
 							if (string.IsNullOrEmpty (text))
diff --git a/mcs/class/System.Windows/System.Windows-net_4_x.csproj b/mcs/class/System.Windows/System.Windows-net_4_x.csproj
index 7f472f0ea8a..59ba68253f7 100644
--- a/mcs/class/System.Windows/System.Windows-net_4_x.csproj
+++ b/mcs/class/System.Windows/System.Windows-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -56,15 +59,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Workflow.Activities/System.Workflow.Activities-net_4_x.csproj b/mcs/class/System.Workflow.Activities/System.Workflow.Activities-net_4_x.csproj
new file mode 100644
index 00000000000..c4285270bae
--- /dev/null
+++ b/mcs/class/System.Workflow.Activities/System.Workflow.Activities-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{29FCE500-BC83-4BF0-AED0-4E96932182F7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699</NoWarn>
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Workflow.Activities</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="Assembly\AssemblyInfo.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel-net_4_x.csproj b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel-net_4_x.csproj
new file mode 100644
index 00000000000..32d268ac86e
--- /dev/null
+++ b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{3424BA74-B0AE-4C5E-A2C6-6FF86369D510}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699</NoWarn>
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Workflow.ComponentModel</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="Assembly\AssemblyInfo.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime-net_4_x.csproj b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime-net_4_x.csproj
new file mode 100644
index 00000000000..ecceeff1d25
--- /dev/null
+++ b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime-net_4_x.csproj
@@ -0,0 +1,90 @@
+<?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>{E4180397-83B3-4F7B-9878-6891698F7C52}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699</NoWarn>
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>True</NoStdLib>
+    
+    <NoConfig>True</NoConfig>
+    
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>System.Workflow.Runtime</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <NoWarn>1699</NoWarn>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</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="Assembly\AssemblyInfo.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 Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
+      <Name>corlib-net_4_x</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>
+
diff --git a/mcs/class/System.XML/System.Xml-bare-build.csproj b/mcs/class/System.XML/System.Xml-bare-build.csproj
deleted file mode 100644
index 7f37348fc50..00000000000
--- a/mcs/class/System.XML/System.Xml-bare-build.csproj
+++ /dev/null
@@ -1,486 +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>{8C65BF8D-256A-44B0-BF9A-8052C075DC31}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,618,612,642</NoWarn>
-    <OutputPath>./../../class/lib/build/bare</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System.Xml</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,618,612,642</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,618,612,642</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Mono.Xml.Schema\XmlSchemaValidatingReader.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdIdentityPath.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdIdentityState.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdKeyTable.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdParticleValidationState.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdValidatingReader.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdWildcard.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />
-    <Compile Include="Mono.Xml.XPath\IdPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\KeyPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\LocationPathPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\Pattern.cs" />
-    <Compile Include="Mono.Xml.XPath\UnionPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\XPathEditableDocument.cs" />
-    <Compile Include="Mono.Xml.XPath\XPathNavigatorReader.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyImports.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyTemplates.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAttribute.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAvt.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCallTemplate.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslChoose.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslComment.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCompiledElement.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopy.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopyOf.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslElement.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslFallback.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslForEach.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslIf.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslLiteralElement.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslMessage.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNotSupportedOperation.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNumber.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslOperation.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslProcessingInstruction.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslTemplateContent.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslText.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslValueOf.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslVariable.cs" />
-    <Compile Include="Mono.Xml.Xsl\Attribute.cs" />
-    <Compile Include="Mono.Xml.Xsl\Compiler.cs" />
-    <Compile Include="Mono.Xml.Xsl\Debug.cs" />
-    <Compile Include="Mono.Xml.Xsl\Emitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\GenericOutputter.cs" />
-    <Compile Include="Mono.Xml.Xsl\HtmlEmitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\MSXslScriptManager.cs" />
-    <Compile Include="Mono.Xml.Xsl\Outputter.cs" />
-    <Compile Include="Mono.Xml.Xsl\ScriptCompilerInfo.cs" />
-    <Compile Include="Mono.Xml.Xsl\TextEmitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\TextOutputter.cs" />
-    <Compile Include="Mono.Xml.Xsl\XmlWriterEmitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslAttributeSet.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslDecimalFormat.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslFunctions.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslKey.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslOutput.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslSortEvaluator.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslStylesheet.cs" />
-    <Compile Include="Mono.Xml.Xsl\XsltCompiledContext.cs" />
-    <Compile Include="Mono.Xml.Xsl\XsltDebuggerWrapper.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslTemplate.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslTransformProcessor.cs" />
-    <Compile Include="Mono.Xml\IHasXmlParserContext.cs" />
-    <Compile Include="Mono.Xml\IHasXmlSchemaInfo.cs" />
-    <Compile Include="Mono.Xml\SubtreeXmlReader.cs" />
-    <Compile Include="Mono.Xml\XmlFilterReader.cs" />
-    <Compile Include="Mono.Xml\XmlNodeWriter.cs" />
-    <Compile Include="System.Xml.Schema\BuiltInDatatype.cs" />
-    <Compile Include="System.Xml.Schema\IXmlSchemaInfo.cs" />
-    <Compile Include="System.Xml.Schema\SchemaDataValueType.cs" />
-    <Compile Include="System.Xml.Schema\ValidationEventArgs.cs" />
-    <Compile Include="System.Xml.Schema\ValidationHandler.cs" />
-    <Compile Include="System.Xml.Schema\XmlAtomicValue.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchema.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAll.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotated.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotation.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAny.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAnyAttribute.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAppInfo.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAttribute.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroup.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroupRef.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaChoice.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaCollection.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaCollectionEnumerator.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaCompilationSettings.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentExtension.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentRestriction.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContentModel.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContentProcessing.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContentType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatype.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatypeVariety.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDerivationMethod.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDocumentation.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaElement.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaEnumerationFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaException.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaExternal.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaForm.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaFractionDigitsFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaGroup.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupBase.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupRef.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaIdentityConstraint.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaImport.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInclude.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInference.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInferenceException.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInfo.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaKey.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaKeyref.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaLengthFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxExclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxInclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxLengthFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMinExclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMinInclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMinLengthFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaNotation.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaNumericFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObject.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectCollection.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectEnumerator.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectTable.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaParticle.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaPatternFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaReader.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaRedefine.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSequence.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSerializer.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentExtension.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentRestriction.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeList.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeRestriction.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeUnion.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaTotalDigitsFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaUnique.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaUse.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaUtil.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationException.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationFlags.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidator.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidity.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaWhiteSpaceFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaXPath.cs" />
-    <Compile Include="System.Xml.Schema\XmlSeverityType.cs" />
-    <Compile Include="System.Xml.Schema\XmlTypeCode.cs" />
-    <Compile Include="System.Xml.Schema\XmlValueConverter.cs" />
-    <Compile Include="System.Xml.Schema\XmlValueGetter.cs" />
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtension.cs" />
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtensionCollection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\DateTimeSerializationSection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElement.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElementCollection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionsSection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SerializationSectionGroup.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\XmlSerializerSection.cs" />
-    <Compile Include="System.Xml.Serialization\CodeExporter.cs" />
-    <Compile Include="System.Xml.Serialization\CodeGenerationOptions.cs" />
-    <Compile Include="System.Xml.Serialization\CodeIdentifier.cs" />
-    <Compile Include="System.Xml.Serialization\CodeIdentifiers.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\MapCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapCodeExporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCodeExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNodeEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNodeEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaEnumerator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemas.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.XPath\DefaultContext.cs" />
-    <Compile Include="System.Xml.XPath\Expression.cs" />
-    <Compile Include="System.Xml.XPath\Iterator.cs" />
-    <Compile Include="System.Xml.XPath\IXPathNavigable.cs" />
-    <Compile Include="System.Xml.XPath\Tokenizer.cs" />
-    <Compile Include="System.Xml.XPath\XmlCaseOrder.cs" />
-    <Compile Include="System.Xml.XPath\XmlDataType.cs" />
-    <Compile Include="System.Xml.XPath\XmlSortOrder.cs" />
-    <Compile Include="System.Xml.XPath\XPathComparer.cs" />
-    <Compile Include="System.Xml.XPath\XPathDocument.cs" />
-    <Compile Include="System.Xml.XPath\XPathException.cs" />
-    <Compile Include="System.Xml.XPath\XPathExpression.cs" />
-    <Compile Include="System.Xml.XPath\XPathItem.cs" />
-    <Compile Include="System.Xml.XPath\XPathNamespaceScope.cs" />
-    <Compile Include="System.Xml.XPath\XPathNavigator.cs" />
-    <Compile Include="System.Xml.XPath\XPathNodeIterator.cs" />
-    <Compile Include="System.Xml.XPath\XPathNodeType.cs" />
-    <Compile Include="System.Xml.XPath\XPathResultType.cs" />
-    <Compile Include="System.Xml.Xsl\IXsltContextFunction.cs" />
-    <Compile Include="System.Xml.Xsl\IXsltContextVariable.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform.cs" />
-    <Compile Include="System.Xml.Xsl\XsltArgumentList.cs" />
-    <Compile Include="System.Xml.Xsl\XsltCompileException.cs" />
-    <Compile Include="System.Xml.Xsl\XsltContext.cs" />
-    <Compile Include="System.Xml.Xsl\XsltException.cs" />
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventArgs.cs" />
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventHandler.cs" />
-    <Compile Include="System.Xml.Xsl\XslTransform.cs" />
-    <Compile Include="System.Xml.Xsl\XsltSettings.cs" />
-    <Compile Include="System.Xml\ConformanceLevel.cs" />
-    <Compile Include="System.Xml\DefaultXmlWriter.cs" />
-    <Compile Include="System.Xml\DTDAutomata.cs" />
-    <Compile Include="System.Xml\DTDObjectModel.cs" />
-    <Compile Include="System.Xml\DtdProcessing.cs" />
-    <Compile Include="System.Xml\DTDReader.cs" />
-    <Compile Include="System.Xml\DTDValidatingReader2.cs" />
-    <Compile Include="System.Xml\EntityHandling.cs" />
-    <Compile Include="System.Xml\EntityResolvingXmlReader.cs" />
-    <Compile Include="System.Xml\Formatting.cs" />
-    <Compile Include="System.Xml\IHasXmlChildNode.cs" />
-    <Compile Include="System.Xml\IHasXmlNode.cs" />
-    <Compile Include="System.Xml\IXmlLineInfo.cs" />
-    <Compile Include="System.Xml\IXmlNamespaceResolver.cs" />
-    <Compile Include="System.Xml\MonoFIXAttribute.cs" />
-    <Compile Include="System.Xml\NamespaceHandling.cs" />
-    <Compile Include="System.Xml\NameTable.cs" />
-    <Compile Include="System.Xml\NewLineHandling.cs" />
-    <Compile Include="System.Xml\ReadState.cs" />
-    <Compile Include="System.Xml\ValidationType.cs" />
-    <Compile Include="System.Xml\WhitespaceHandling.cs" />
-    <Compile Include="System.Xml\WriteState.cs" />
-    <Compile Include="System.Xml\XmlAttribute.cs" />
-    <Compile Include="System.Xml\XmlAttributeCollection.cs" />
-    <Compile Include="System.Xml\XmlCDataSection.cs" />
-    <Compile Include="System.Xml\XmlChar.cs" />
-    <Compile Include="System.Xml\XmlCharacterData.cs" />
-    <Compile Include="System.Xml\XmlComment.cs" />
-    <Compile Include="System.Xml\XmlConstructs.cs" />
-    <Compile Include="System.Xml\XmlConvert.cs" />
-    <Compile Include="System.Xml\XmlDateTimeSerializationMode.cs" />
-    <Compile Include="System.Xml\XmlDeclaration.cs" />
-    <Compile Include="System.Xml\XmlDocument.cs" />
-    <Compile Include="System.Xml\XmlDocumentFragment.cs" />
-    <Compile Include="System.Xml\XmlDocumentNavigator.cs" />
-    <Compile Include="System.Xml\XmlDocumentType.cs" />
-    <Compile Include="System.Xml\XmlElement.cs" />
-    <Compile Include="System.Xml\XmlEntity.cs" />
-    <Compile Include="System.Xml\XmlEntityReference.cs" />
-    <Compile Include="System.Xml\XmlException.cs" />
-    <Compile Include="System.Xml\XmlImplementation.cs" />
-    <Compile Include="System.Xml\XmlInputStream.cs" />
-    <Compile Include="System.Xml\XmlIteratorNodeList.cs" />
-    <Compile Include="System.Xml\XmlLinkedNode.cs" />
-    <Compile Include="System.Xml\XmlNamedNodeMap.cs" />
-    <Compile Include="System.Xml\XmlNameEntry.cs" />
-    <Compile Include="System.Xml\XmlNameEntryCache.cs" />
-    <Compile Include="System.Xml\XmlNamespaceManager.cs" />
-    <Compile Include="System.Xml\XmlNamespaceScope.cs" />
-    <Compile Include="System.Xml\XmlNameTable.cs" />
-    <Compile Include="System.Xml\XmlNode.cs" />
-    <Compile Include="System.Xml\XmlNodeArrayList.cs" />
-    <Compile Include="System.Xml\XmlNodeChangedAction.cs" />
-    <Compile Include="System.Xml\XmlNodeChangedEventArgs.cs" />
-    <Compile Include="System.Xml\XmlNodeChangedEventHandler.cs" />
-    <Compile Include="System.Xml\XmlNodeList.cs" />
-    <Compile Include="System.Xml\XmlNodeListChildren.cs" />
-    <Compile Include="System.Xml\XmlNodeOrder.cs" />
-    <Compile Include="System.Xml\XmlNodeReader2.cs" />
-    <Compile Include="System.Xml\XmlNodeReaderImpl.cs" />
-    <Compile Include="System.Xml\XmlNodeType.cs" />
-    <Compile Include="System.Xml\XmlNotation.cs" />
-    <Compile Include="System.Xml\XmlOutputMethod.cs" />
-    <Compile Include="System.Xml\XmlParserContext.cs" />
-    <Compile Include="System.Xml\XmlParserInput.cs" />
-    <Compile Include="System.Xml\XmlProcessingInstruction.cs" />
-    <Compile Include="System.Xml\XmlQualifiedName.cs" />
-    <Compile Include="System.Xml\XmlReader.cs" />
-    <Compile Include="System.Xml\XmlReaderBinarySupport.cs" />
-    <Compile Include="System.Xml\XmlReaderSettings.cs" />
-    <Compile Include="System.Xml\XmlResolver.cs" />
-    <Compile Include="System.Xml\XmlSecureResolver.cs" />
-    <Compile Include="System.Xml\XmlSignificantWhitespace.cs" />
-    <Compile Include="System.Xml\XmlSpace.cs" />
-    <Compile Include="System.Xml\XmlText.cs" />
-    <Compile Include="System.Xml\XmlTextReader.cs" />
-    <Compile Include="System.Xml\XmlTextReader2.cs" />
-    <Compile Include="System.Xml\XmlTextWriter2.cs" />
-    <Compile Include="System.Xml\XmlTokenizedType.cs" />
-    <Compile Include="System.Xml\XmlUrlResolver.cs" />
-    <Compile Include="System.Xml\XmlValidatingReader.cs" />
-    <Compile Include="System.Xml\XmlWhitespace.cs" />
-    <Compile Include="System.Xml\XmlWriter.cs" />
-    <Compile Include="System.Xml\XmlWriterSettings.cs" />
-    <Compile Include="System.Xml\XQueryConvert.cs" />
-    <Compile Include="Mono.Xml.Xsl\build_PatternParser.cs" />
-    <Compile Include="Mono.Xml.Xsl\build_PatternTokenizer.cs" />
-    <Compile Include="System.Xml.XPath\Parser.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 Condition=" '$(OS)' != 'Windows_NT' ">
-mono $(ProjectDir)\..\..\..\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
-cat $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
- $(ProjectDir)\..\..\..\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
-$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
-echo "#define XSLT_PATTERN" > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
-
-    </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="../corlib/corlib-build.csproj">
-      <Project>{0CAF787F-F70B-4556-987A-67E036CD71C1}</Project>
-      <Name>corlib\corlib-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System/System-bare-build.csproj">
-      <Project>{6E4F4BFB-2900-4663-B922-F176B2358C12}</Project>
-      <Name>System\System-bare-build</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj b/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj
index 07e626b0933..7eacb3ddd76 100644
--- a/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj
+++ b/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,219,414,649,1717</NoWarn>
     <OutputPath>./../../class/lib/net_4_x/bare</OutputPath>
+    <IntermediateOutputPath>obj-bare</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,669 +48,670 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\GenerateHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\IteratorDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\OptimizerPatterns.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\StaticDataManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\TailCallAnalyzer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILAnnotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILConstructAnalyzer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILModule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimization.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimizerVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTrace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTypeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\ISourceLineInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\ListBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Pair.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilBinary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilChoice.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilCloneVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilDataSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFunction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvoke.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeEarlyBound.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeLateBound.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLiteral.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLoop.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNodeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReplaceVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilScopedVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilSortKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilStrConcat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTargetType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTernary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTypeChecker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilUnary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilValidationVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SerializationHints.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SubstitutionList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\WhitespaceRule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QueryReaderSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\ContentIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DecimalFormatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DocumentOrderComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DodSequenceMerge.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\EarlyBoundInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\NumberFormatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\RtfNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SetIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SiblingIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\StringConcat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\TreeIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleLookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAggregates.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAttributeCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlCollation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlExtensionFunction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILIndex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILStorageConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryRuntime.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQuerySequence.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryStaticData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlRawWriterWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSequenceWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKeyAccumulator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XslNumber.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltConvert.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltLibrary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\SourceLineInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlILCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlIlGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlNodeKindFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQualifiedNameTest.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryCardinality.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryTypeFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXpathBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXPathEnvironment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathAxis.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathCompileException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathQilFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathScanner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPathConvert.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XslException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Compiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\CompilerScopeManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Focus.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\IErrorHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\InvokeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\KeyMatchBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Keywords.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\MatcherBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\OutputScopeManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGeneratorEnv.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilStrConcatenator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Scripts.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Stylesheet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAst.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAstAnalyzer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltInput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltQilFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Action.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ActionFrame.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyImportsAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyTemplatesAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeSetAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Avt.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AvtEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BeginEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BuilderInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CallTemplateAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ChooseAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CommentAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CompiledAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Compiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ContainerAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAttributesAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyCodeAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNamespacesAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNodesetAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyOfAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DbgCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DocumentScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ElementAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\EndEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Event.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ForeachAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\HtmlProps.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\IfAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScopeManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\MessageAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceDecl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorInput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NewInstructionAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NumberAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutKeywords.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScopeManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\PrefixQname.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ProcessingInstructionAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Processor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ReaderOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RootAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SequentialOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SortAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StateMachine.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StringOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Stylesheet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateBaseAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateLookupAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Templatemanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOnlyOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TheQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\UseAttributesetsAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ValueOfAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\VariableAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WithParamAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WriterOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltCompileContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltDebugger.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\InternalApis\NDP_Common\inc\Win8Helpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\HResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\InvariantComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\PrivilegedConfigurationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Assembly\System.Xml.Assembly.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\AsyncHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64Decoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64Encoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64EncoderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\BinXmltoken.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\SqlUtils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexDecoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexEncoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexEncoderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Bits.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BitStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\ByteStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\Shape.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\ShapeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeInfoAtom.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeViewPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\BinaryCompatibility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\CharEntityEncoderFallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ConformanceLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\DtdProcessing.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\EntityHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlEncodedRawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlTernaryTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlUtf8RawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IncrementalReadDecoders.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IRemovableWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IValidationEventHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\NamespaceHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\NewLineHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\QueryOutputWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\QueryOutputWriterV1.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelperAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadOnlyTernaryTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\SecureStringHasher.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\TextEncodedRawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\TextUtf8RawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ValidatingReaderNodeData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ValidationType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\WhitespaceHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAutoDetectWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlConfiguration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEventCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlParserContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlRawWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlRawWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReaderSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSpace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextEncoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImpl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpersAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImpl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImplAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpersAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriterSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdCachingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdCachingReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdValidatingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdValidatingReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\DiagnosticsSwitches.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentSchemaValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentXmlWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentXPathNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DomNameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlAttributeCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlCDataSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlCharacterData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlChildEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlChildNodes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlComment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDeclaration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocumentFragment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocumentType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDomTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlElementList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEntity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEntityReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEventChangedAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlImplementation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlLinkedNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodemap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodeMap.SmallXmlNodeList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlProcessingInstruction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlSignificantWhiteSpace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlText.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlUnspecifiedAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlWhitespace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XPathNodeList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\EmptyEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\HWStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IApplicationResourceStreamResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IHasXmlNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IXmlLineInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IXmlNamespaceResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\LineInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\MTNameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\NameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Ref.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlKnownDtds.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolverAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Asttree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\AutoValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BaseProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BaseValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BitSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Chameleonkey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\CompiledidEntityConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ConstraintStruct.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ContentValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DataTypeImplementation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdParserAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\FacetChecker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Inference\Infer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Inference\XmlSchemaInferenceException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\IXmlSchemaInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\NamespaceList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Parser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ParserAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Preprocessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaAttDef.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionpreProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaDeclBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaElementDecl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaEntity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNamespacemanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaSetCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XdrBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XdrValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlAtomicValue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchema.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAll.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotated.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAny.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAppInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroupref.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaChoice.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCompilationSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentExtension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentRestriction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentModel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentProcessing.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDataType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDerivationMethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDocumentation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaExternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaFacet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaForm.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupRef.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaIdEntityConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaImport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInclude.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaNotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaParticle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaRedefine.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSequence.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentExtension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentRestriction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeContent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeRestriction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeUnion.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSubstitutionGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaUse.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidationException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSeverityType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlTokenizedType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlTypeCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlValueConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdDateTime.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdDuration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\_Events.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Advanced\SchemaImporterExtension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\AppSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeGenerationoptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifiers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Compilation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Compiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\ConfigurationStrings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\DateTimeSerializationSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionsSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SerializationSectionGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\XmlSerializerSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\ImportContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\indentedWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\IXmlSerializable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\IXmlTextParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Mappings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Models.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\NameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\PrimitiveXmlSerializers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SchemaImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SchemaObjectWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapCodeExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapElementAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemamember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SourceInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\TypeExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Types.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlCodeExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlCountingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Xmlcustomformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMemberMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMembersMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlRootAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemas.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationILGen.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReaderILGen.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriterILGen.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerNamespaces.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTextAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTypeMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\ValidateNames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlCharType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlComplianceUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlConvert.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlDownloadManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlDownloadManagerAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlEncoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNamespacemanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNamespaceScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNodeOrder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNodeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNullResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlQualifiedName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlReservedNs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlResolverAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlSecureResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlSecureResolverAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlUrlResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlUrlResolverAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlXapResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AbsoluteQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AstNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AttributeQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Axis.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BaseAxisQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheAxisQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheChildrenQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheOutputQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ChildrenQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ClonableStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CompiledXPathExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ContextQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantBaseQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantoverDescendantQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DocumentorderQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\EmptyQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ExtensionQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Filter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FilterQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingSibling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ForwardPositionQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Function.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FunctionQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Group.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\GroupQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\IdQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\IteratorFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\LogicalExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\MergeFilterQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NamespaceQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NodeFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NumberFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NumericExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Operand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\OperandQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Operator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ParentQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingSibling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Query.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\QueryBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ResetableIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ReversePositionQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Root.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\SortQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\StringFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\UnionExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ValueQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Variable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\VariableQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathArrayIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAxisIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathChildIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathDescendantIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathEmptyIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathMultyIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathScanner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelectionIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelfQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSingletonIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\IXPathNavigable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathDocument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathItem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNamespaceScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorKeyComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNodeIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNodeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XslCompiledTransform.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltArgumentList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XslTransform.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltSettings.cs" />
+    <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\GenerateHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\IteratorDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\OptimizerPatterns.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\StaticDataManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\TailCallAnalyzer.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILAnnotation.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILConstructAnalyzer.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILModule.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimization.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimizerVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTrace.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTypeHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\ISourceLineInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\ListBase.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Pair.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilBinary.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilChoice.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilCloneVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilDataSource.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilExpression.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFunction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvoke.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeEarlyBound.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeLateBound.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilIterator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilList.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLiteral.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLoop.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilName.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNode.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNodeType.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilParameter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReference.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReplaceVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilScopedVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilSortKey.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilStrConcat.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTargetType.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTernary.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTypeChecker.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilUnary.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilValidationVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlReader.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlWriter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SerializationHints.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SubstitutionList.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\WhitespaceRule.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QueryReaderSettings.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\ContentIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DecimalFormatter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DocumentOrderComparer.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DodSequenceMerge.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\EarlyBoundInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\NumberFormatter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\RtfNavigator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SetIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SiblingIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\StringConcat.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\TreeIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleLookup.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleReader.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAggregates.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAttributeCache.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlCollation.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlExtensionFunction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILIndex.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILStorageConverter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorFilter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorStack.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryContext.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryRuntime.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQuerySequence.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryStaticData.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlRawWriterWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSequenceWriter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKey.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKeyAccumulator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XslNumber.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltConvert.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltFunctions.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltLibrary.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\SourceLineInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlILCommand.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlIlGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlNodeKindFlags.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQualifiedNameTest.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryCardinality.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryType.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryTypeFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXpathBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXPathEnvironment.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathAxis.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathCompileException.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathContext.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathOperator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathParser.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathQilFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathScanner.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPathConvert.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XslException.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Compiler.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\CompilerScopeManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Focus.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\IErrorHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\InvokeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\KeyMatchBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Keywords.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\MatcherBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\OutputScopeManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGeneratorEnv.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilStrConcatenator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Scripts.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Stylesheet.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternParser.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAst.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAstAnalyzer.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslFlags.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltInput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltQilFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Action.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ActionFrame.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyImportsAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyTemplatesAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeSetAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Avt.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AvtEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BeginEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BuilderInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CallTemplateAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ChooseAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CommentAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CompiledAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Compiler.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ContainerAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAttributesAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyCodeAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNamespacesAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNodesetAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyOfAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DbgCompiler.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DocumentScope.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ElementAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\EndEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Event.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ForeachAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\HtmlProps.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\IfAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScope.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScopeManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\MessageAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceDecl.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorInput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NewInstructionAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NumberAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutKeywords.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScope.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScopeManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\PrefixQname.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ProcessingInstructionAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Processor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ReaderOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RootAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SequentialOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SortAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StateMachine.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StringOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Stylesheet.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateBaseAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateLookupAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Templatemanager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOnlyOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TheQuery.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\UseAttributesetsAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ValueOfAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\VariableAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WithParamAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WriterOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltCompileContext.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltDebugger.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltOutput.cs" />
+    <Compile Include="..\referencesource\System.Xml\InternalApis\NDP_Common\inc\Win8Helpers.cs" />
+    <Compile Include="..\referencesource\System.Xml\misc\HResults.cs" />
+    <Compile Include="..\referencesource\System.Xml\misc\InvariantComparer.cs" />
+    <Compile Include="..\referencesource\System.Xml\misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Assembly\System.Xml.Assembly.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\AsyncHelper.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Base64Decoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Base64Encoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Base64EncoderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\BinXmltoken.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\SqlUtils.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexDecoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexEncoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexEncoderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Bits.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BitStack.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\ByteStack.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\Shape.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\ShapeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathDocumentBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathDocumentIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathDocumentNavigator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathDocumentView.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNodeHelper.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNodeInfoAtom.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNodeView.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNodeViewPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\BinaryCompatibility.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\CharEntityEncoderFallback.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ConformanceLevel.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\DtdProcessing.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\EntityHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\HtmlEncodedRawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\HtmlTernaryTree.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\HtmlUtf8RawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParserAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IncrementalReadDecoders.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IRemovableWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IValidationEventHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\NamespaceHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\NewLineHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\QueryOutputWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\QueryOutputWriterV1.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelper.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelperAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ReadOnlyTernaryTree.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ReadState.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\SecureStringHasher.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\TextEncodedRawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\TextUtf8RawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ValidatingReaderNodeData.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ValidationType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\WhitespaceHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlAutoDetectWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlConfiguration.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlEventCache.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlParserContext.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlRawWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlRawWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlReaderSettings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlSpace.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextEncoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImpl.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpers.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpersAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlValidatingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImpl.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImplAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpers.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpersAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWrappingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWrappingReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWriterSettings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XsdCachingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XsdCachingReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XsdValidatingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XsdValidatingReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\DiagnosticsSwitches.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentSchemaValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentXmlWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentXPathNavigator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DomNameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlAttributeCollection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlCDataSection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlCharacterData.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlChildEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlChildNodes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlComment.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDeclaration.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDocument.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDocumentFragment.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDocumentType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDomTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlElement.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlElementList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlEntity.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlEntityReference.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlEventChangedAction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlImplementation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlLinkedNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlLoader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlName.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodemap.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodeMap.SmallXmlNodeList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNotation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlProcessingInstruction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlSignificantWhiteSpace.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlText.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlUnspecifiedAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlWhitespace.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XPathNodeList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\EmptyEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\HWStack.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\IApplicationResourceStreamResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\IHasXmlNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\IXmlLineInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\IXmlNamespaceResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\LineInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\MTNameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\NameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Ref.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Resolvers\XmlKnownDtds.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Asttree.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\AutoValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\BaseProcessor.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\BaseValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\BitSet.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Chameleonkey.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\CompiledidEntityConstraint.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ConstraintStruct.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ContentValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DataTypeImplementation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DtdParser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DtdParserAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DtdValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\FacetChecker.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Inference\Infer.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Inference\XmlSchemaInferenceException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\IXmlSchemaInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\NamespaceList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Parser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ParserAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Preprocessor.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaAttDef.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionCompiler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionpreProcessor.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaDeclBase.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaElementDecl.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaEntity.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaNames.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaNamespacemanager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaNotation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaSetCompiler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ValidationEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ValidationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ValidationState.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XdrBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XdrValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlAtomicValue.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchema.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAll.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotated.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAny.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAppInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroup.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroupref.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaChoice.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCollection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCompilationSettings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContent.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentExtension.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentRestriction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContent.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentModel.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentProcessing.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDataType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDerivationMethod.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDocumentation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaElement.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaExternal.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaFacet.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaForm.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroup.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupBase.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupRef.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaIdEntityConstraint.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaImport.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInclude.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaNotation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObject.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectCollection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaParticle.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaRedefine.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSequence.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSet.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContent.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentExtension.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentRestriction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeContent.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeRestriction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeUnion.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSubstitutionGroup.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaUse.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidationException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidity.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSeverityType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlTokenizedType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlTypeCode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlValueConverter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdDateTime.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdDuration.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\_Events.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Advanced\SchemaImporterExtension.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\AppSettings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeGenerationoptions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifier.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifiers.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Compilation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Compiler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\ConfigurationStrings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\DateTimeSerializationSection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElement.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionsSection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SerializationSectionGroup.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\XmlSerializerSection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\ImportContext.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\indentedWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\IXmlSerializable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\IXmlTextParser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Mappings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Models.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\NameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\PrimitiveXmlSerializers.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SchemaImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SchemaObjectWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeOverrides.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapCodeExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapElementAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapEnumAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapIgnoreAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapIncludeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapReflectionImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapSchemamember.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SourceInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\TypeExtensions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Types.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAnyAttributeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlArrayAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeOverrides.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlChoiceIdentifierAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlCodeExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlCountingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Xmlcustomformatter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlEnumAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlIgnoreAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlIncludeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlMapping.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlMemberMapping.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlMembersMapping.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlNamespaceDeclarationsAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionMember.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlRootAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemas.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationGeneratedCode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationILGen.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReaderILGen.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriterILGen.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializer.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerAssemblyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerFactory.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerNamespaces.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerVersionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTextAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTypeMapping.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\ValidateNames.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlCharType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlComplianceUtil.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlConvert.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlDownloadManager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlDownloadManagerAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlEncoding.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNamespacemanager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNamespaceScope.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNodeOrder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNodeType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNullResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlQualifiedName.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlReservedNs.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlSecureResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlSecureResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlUrlResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlUrlResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlXapResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\AbsoluteQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\AstNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\AttributeQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Axis.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\BaseAxisQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanFunctions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\CacheAxisQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\CacheChildrenQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\CacheOutputQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ChildrenQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ClonableStack.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\CompiledXPathExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ContextQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantBaseQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantoverDescendantQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DocumentorderQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\EmptyQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ExtensionQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Filter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\FilterQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingSibling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ForwardPositionQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Function.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\FunctionQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Group.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\GroupQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\IdQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\IteratorFilter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\LogicalExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\MergeFilterQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\NamespaceQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\NodeFunctions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\NumberFunctions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\NumericExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Operand.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\OperandQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Operator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ParentQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingSibling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Query.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\QueryBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ResetableIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ReversePositionQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Root.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\SortQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\StringFunctions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\UnionExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ValueQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Variable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\VariableQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathArrayIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAxisIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathChildIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathDescendantIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathEmptyIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathMultyIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathParser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathScanner.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelectionIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelfQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSingletonIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\IXPathNavigable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathDocument.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathItem.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNamespaceScope.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNavigator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorKeyComparer.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNodeIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNodeType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XslCompiledTransform.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltArgumentList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltContext.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XslTransform.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltSettings.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\LocalAppContextSwitches.cs" />
     <Compile Include="ReferenceSources\Res.cs" />
@@ -720,15 +724,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.XML/System.Xml-basic.csproj b/mcs/class/System.XML/System.Xml-basic.csproj
deleted file mode 100644
index 1d8e23f8e4c..00000000000
--- a/mcs/class/System.XML/System.Xml-basic.csproj
+++ /dev/null
@@ -1,476 +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>{06F3B5C3-F72F-4F26-8479-AA29015E0CCA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,618,612,642</NoWarn>
-    <OutputPath>./../../class/lib/basic</OutputPath>
-    <NoStdLib>False</NoStdLib>
-    <NoConfig>True</NoConfig>
-    
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System.Xml</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,618,612,642</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;BOOTSTRAP_BASIC</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,618,612,642</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;BOOTSTRAP_BASIC</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Mono.Xml.Schema\XmlSchemaValidatingReader.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdIdentityPath.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdIdentityState.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdKeyTable.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdParticleValidationState.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdValidatingReader.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdWildcard.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />
-    <Compile Include="Mono.Xml.XPath\IdPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\KeyPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\LocationPathPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\Pattern.cs" />
-    <Compile Include="Mono.Xml.XPath\UnionPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\XPathEditableDocument.cs" />
-    <Compile Include="Mono.Xml.XPath\XPathNavigatorReader.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyImports.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyTemplates.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAttribute.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAvt.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCallTemplate.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslChoose.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslComment.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCompiledElement.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopy.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopyOf.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslElement.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslFallback.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslForEach.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslIf.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslLiteralElement.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslMessage.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNotSupportedOperation.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNumber.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslOperation.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslProcessingInstruction.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslTemplateContent.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslText.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslValueOf.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslVariable.cs" />
-    <Compile Include="Mono.Xml.Xsl\Attribute.cs" />
-    <Compile Include="Mono.Xml.Xsl\Compiler.cs" />
-    <Compile Include="Mono.Xml.Xsl\Debug.cs" />
-    <Compile Include="Mono.Xml.Xsl\Emitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\GenericOutputter.cs" />
-    <Compile Include="Mono.Xml.Xsl\HtmlEmitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\MSXslScriptManager.cs" />
-    <Compile Include="Mono.Xml.Xsl\Outputter.cs" />
-    <Compile Include="Mono.Xml.Xsl\ScriptCompilerInfo.cs" />
-    <Compile Include="Mono.Xml.Xsl\TextEmitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\TextOutputter.cs" />
-    <Compile Include="Mono.Xml.Xsl\XmlWriterEmitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslAttributeSet.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslDecimalFormat.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslFunctions.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslKey.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslOutput.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslSortEvaluator.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslStylesheet.cs" />
-    <Compile Include="Mono.Xml.Xsl\XsltCompiledContext.cs" />
-    <Compile Include="Mono.Xml.Xsl\XsltDebuggerWrapper.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslTemplate.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslTransformProcessor.cs" />
-    <Compile Include="Mono.Xml\IHasXmlParserContext.cs" />
-    <Compile Include="Mono.Xml\IHasXmlSchemaInfo.cs" />
-    <Compile Include="Mono.Xml\SubtreeXmlReader.cs" />
-    <Compile Include="Mono.Xml\XmlFilterReader.cs" />
-    <Compile Include="Mono.Xml\XmlNodeWriter.cs" />
-    <Compile Include="System.Xml.Schema\BuiltInDatatype.cs" />
-    <Compile Include="System.Xml.Schema\IXmlSchemaInfo.cs" />
-    <Compile Include="System.Xml.Schema\SchemaDataValueType.cs" />
-    <Compile Include="System.Xml.Schema\ValidationEventArgs.cs" />
-    <Compile Include="System.Xml.Schema\ValidationHandler.cs" />
-    <Compile Include="System.Xml.Schema\XmlAtomicValue.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchema.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAll.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotated.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotation.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAny.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAnyAttribute.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAppInfo.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAttribute.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroup.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroupRef.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaChoice.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaCollection.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaCollectionEnumerator.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaCompilationSettings.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentExtension.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentRestriction.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContentModel.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContentProcessing.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContentType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatype.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatypeVariety.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDerivationMethod.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDocumentation.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaElement.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaEnumerationFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaException.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaExternal.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaForm.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaFractionDigitsFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaGroup.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupBase.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupRef.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaIdentityConstraint.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaImport.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInclude.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInference.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInferenceException.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInfo.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaKey.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaKeyref.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaLengthFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxExclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxInclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxLengthFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMinExclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMinInclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMinLengthFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaNotation.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaNumericFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObject.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectCollection.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectEnumerator.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectTable.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaParticle.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaPatternFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaReader.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaRedefine.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSequence.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSerializer.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentExtension.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentRestriction.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeList.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeRestriction.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeUnion.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaTotalDigitsFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaUnique.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaUse.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaUtil.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationException.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationFlags.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidator.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidity.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaWhiteSpaceFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaXPath.cs" />
-    <Compile Include="System.Xml.Schema\XmlSeverityType.cs" />
-    <Compile Include="System.Xml.Schema\XmlTypeCode.cs" />
-    <Compile Include="System.Xml.Schema\XmlValueConverter.cs" />
-    <Compile Include="System.Xml.Schema\XmlValueGetter.cs" />
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtension.cs" />
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtensionCollection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\DateTimeSerializationSection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElement.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElementCollection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionsSection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SerializationSectionGroup.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\XmlSerializerSection.cs" />
-    <Compile Include="System.Xml.Serialization\CodeExporter.cs" />
-    <Compile Include="System.Xml.Serialization\CodeGenerationOptions.cs" />
-    <Compile Include="System.Xml.Serialization\CodeIdentifier.cs" />
-    <Compile Include="System.Xml.Serialization\CodeIdentifiers.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\MapCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapCodeExporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCodeExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNodeEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNodeEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaEnumerator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemas.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.XPath\DefaultContext.cs" />
-    <Compile Include="System.Xml.XPath\Expression.cs" />
-    <Compile Include="System.Xml.XPath\Iterator.cs" />
-    <Compile Include="System.Xml.XPath\IXPathNavigable.cs" />
-    <Compile Include="System.Xml.XPath\Tokenizer.cs" />
-    <Compile Include="System.Xml.XPath\XmlCaseOrder.cs" />
-    <Compile Include="System.Xml.XPath\XmlDataType.cs" />
-    <Compile Include="System.Xml.XPath\XmlSortOrder.cs" />
-    <Compile Include="System.Xml.XPath\XPathComparer.cs" />
-    <Compile Include="System.Xml.XPath\XPathDocument.cs" />
-    <Compile Include="System.Xml.XPath\XPathException.cs" />
-    <Compile Include="System.Xml.XPath\XPathExpression.cs" />
-    <Compile Include="System.Xml.XPath\XPathItem.cs" />
-    <Compile Include="System.Xml.XPath\XPathNamespaceScope.cs" />
-    <Compile Include="System.Xml.XPath\XPathNavigator.cs" />
-    <Compile Include="System.Xml.XPath\XPathNodeIterator.cs" />
-    <Compile Include="System.Xml.XPath\XPathNodeType.cs" />
-    <Compile Include="System.Xml.XPath\XPathResultType.cs" />
-    <Compile Include="System.Xml.Xsl\IXsltContextFunction.cs" />
-    <Compile Include="System.Xml.Xsl\IXsltContextVariable.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform.cs" />
-    <Compile Include="System.Xml.Xsl\XsltArgumentList.cs" />
-    <Compile Include="System.Xml.Xsl\XsltCompileException.cs" />
-    <Compile Include="System.Xml.Xsl\XsltContext.cs" />
-    <Compile Include="System.Xml.Xsl\XsltException.cs" />
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventArgs.cs" />
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventHandler.cs" />
-    <Compile Include="System.Xml.Xsl\XslTransform.cs" />
-    <Compile Include="System.Xml.Xsl\XsltSettings.cs" />
-    <Compile Include="System.Xml\ConformanceLevel.cs" />
-    <Compile Include="System.Xml\DefaultXmlWriter.cs" />
-    <Compile Include="System.Xml\DTDAutomata.cs" />
-    <Compile Include="System.Xml\DTDObjectModel.cs" />
-    <Compile Include="System.Xml\DtdProcessing.cs" />
-    <Compile Include="System.Xml\DTDReader.cs" />
-    <Compile Include="System.Xml\DTDValidatingReader2.cs" />
-    <Compile Include="System.Xml\EntityHandling.cs" />
-    <Compile Include="System.Xml\EntityResolvingXmlReader.cs" />
-    <Compile Include="System.Xml\Formatting.cs" />
-    <Compile Include="System.Xml\IHasXmlChildNode.cs" />
-    <Compile Include="System.Xml\IHasXmlNode.cs" />
-    <Compile Include="System.Xml\IXmlLineInfo.cs" />
-    <Compile Include="System.Xml\IXmlNamespaceResolver.cs" />
-    <Compile Include="System.Xml\MonoFIXAttribute.cs" />
-    <Compile Include="System.Xml\NamespaceHandling.cs" />
-    <Compile Include="System.Xml\NameTable.cs" />
-    <Compile Include="System.Xml\NewLineHandling.cs" />
-    <Compile Include="System.Xml\ReadState.cs" />
-    <Compile Include="System.Xml\ValidationType.cs" />
-    <Compile Include="System.Xml\WhitespaceHandling.cs" />
-    <Compile Include="System.Xml\WriteState.cs" />
-    <Compile Include="System.Xml\XmlAttribute.cs" />
-    <Compile Include="System.Xml\XmlAttributeCollection.cs" />
-    <Compile Include="System.Xml\XmlCDataSection.cs" />
-    <Compile Include="System.Xml\XmlChar.cs" />
-    <Compile Include="System.Xml\XmlCharacterData.cs" />
-    <Compile Include="System.Xml\XmlComment.cs" />
-    <Compile Include="System.Xml\XmlConstructs.cs" />
-    <Compile Include="System.Xml\XmlConvert.cs" />
-    <Compile Include="System.Xml\XmlDateTimeSerializationMode.cs" />
-    <Compile Include="System.Xml\XmlDeclaration.cs" />
-    <Compile Include="System.Xml\XmlDocument.cs" />
-    <Compile Include="System.Xml\XmlDocumentFragment.cs" />
-    <Compile Include="System.Xml\XmlDocumentNavigator.cs" />
-    <Compile Include="System.Xml\XmlDocumentType.cs" />
-    <Compile Include="System.Xml\XmlElement.cs" />
-    <Compile Include="System.Xml\XmlEntity.cs" />
-    <Compile Include="System.Xml\XmlEntityReference.cs" />
-    <Compile Include="System.Xml\XmlException.cs" />
-    <Compile Include="System.Xml\XmlImplementation.cs" />
-    <Compile Include="System.Xml\XmlInputStream.cs" />
-    <Compile Include="System.Xml\XmlIteratorNodeList.cs" />
-    <Compile Include="System.Xml\XmlLinkedNode.cs" />
-    <Compile Include="System.Xml\XmlNamedNodeMap.cs" />
-    <Compile Include="System.Xml\XmlNameEntry.cs" />
-    <Compile Include="System.Xml\XmlNameEntryCache.cs" />
-    <Compile Include="System.Xml\XmlNamespaceManager.cs" />
-    <Compile Include="System.Xml\XmlNamespaceScope.cs" />
-    <Compile Include="System.Xml\XmlNameTable.cs" />
-    <Compile Include="System.Xml\XmlNode.cs" />
-    <Compile Include="System.Xml\XmlNodeArrayList.cs" />
-    <Compile Include="System.Xml\XmlNodeChangedAction.cs" />
-    <Compile Include="System.Xml\XmlNodeChangedEventArgs.cs" />
-    <Compile Include="System.Xml\XmlNodeChangedEventHandler.cs" />
-    <Compile Include="System.Xml\XmlNodeList.cs" />
-    <Compile Include="System.Xml\XmlNodeListChildren.cs" />
-    <Compile Include="System.Xml\XmlNodeOrder.cs" />
-    <Compile Include="System.Xml\XmlNodeReader2.cs" />
-    <Compile Include="System.Xml\XmlNodeReaderImpl.cs" />
-    <Compile Include="System.Xml\XmlNodeType.cs" />
-    <Compile Include="System.Xml\XmlNotation.cs" />
-    <Compile Include="System.Xml\XmlOutputMethod.cs" />
-    <Compile Include="System.Xml\XmlParserContext.cs" />
-    <Compile Include="System.Xml\XmlParserInput.cs" />
-    <Compile Include="System.Xml\XmlProcessingInstruction.cs" />
-    <Compile Include="System.Xml\XmlQualifiedName.cs" />
-    <Compile Include="System.Xml\XmlReader.cs" />
-    <Compile Include="System.Xml\XmlReaderBinarySupport.cs" />
-    <Compile Include="System.Xml\XmlReaderSettings.cs" />
-    <Compile Include="System.Xml\XmlResolver.cs" />
-    <Compile Include="System.Xml\XmlSecureResolver.cs" />
-    <Compile Include="System.Xml\XmlSignificantWhitespace.cs" />
-    <Compile Include="System.Xml\XmlSpace.cs" />
-    <Compile Include="System.Xml\XmlText.cs" />
-    <Compile Include="System.Xml\XmlTextReader.cs" />
-    <Compile Include="System.Xml\XmlTextReader2.cs" />
-    <Compile Include="System.Xml\XmlTextWriter2.cs" />
-    <Compile Include="System.Xml\XmlTokenizedType.cs" />
-    <Compile Include="System.Xml\XmlUrlResolver.cs" />
-    <Compile Include="System.Xml\XmlValidatingReader.cs" />
-    <Compile Include="System.Xml\XmlWhitespace.cs" />
-    <Compile Include="System.Xml\XmlWriter.cs" />
-    <Compile Include="System.Xml\XmlWriterSettings.cs" />
-    <Compile Include="System.Xml\XQueryConvert.cs" />
-    <Compile Include="Mono.Xml.Xsl\PatternParser.cs" />
-    <Compile Include="Mono.Xml.Xsl\PatternTokenizer.cs" />
-    <Compile Include="System.Xml.XPath\Parser.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>
-$(ProjectDir)\..\..\..\mono\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
-
-    </PreBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\corlib\corlib-basic.csproj">
-      <Project>{B8AA4FF3-2174-4C82-B75E-28C3CA28A380}</Project>
-      <Name>corlib\corlib-basic</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System\System-basic.csproj">
-      <Project>{808F7F56-308D-4978-8A44-A971BDADA3F6}</Project>
-      <Name>System\System-basic</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System.XML/System.Xml-build.csproj b/mcs/class/System.XML/System.Xml-build.csproj
deleted file mode 100644
index 01d154d96ac..00000000000
--- a/mcs/class/System.XML/System.Xml-build.csproj
+++ /dev/null
@@ -1,476 +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>{F8FFA803-9D2E-465A-A87D-3F871AD497B6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,618,612,642</NoWarn>
-    <OutputPath>./../../class/lib/build</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System.Xml</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,618,612,642</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,618,612,642</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Mono.Xml.Schema\XmlSchemaValidatingReader.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdIdentityPath.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdIdentityState.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdKeyTable.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdParticleValidationState.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdValidatingReader.cs" />
-    <Compile Include="Mono.Xml.Schema\XsdWildcard.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode.cs" />
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />
-    <Compile Include="Mono.Xml.XPath\IdPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\KeyPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\LocationPathPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\Pattern.cs" />
-    <Compile Include="Mono.Xml.XPath\UnionPattern.cs" />
-    <Compile Include="Mono.Xml.XPath\XPathEditableDocument.cs" />
-    <Compile Include="Mono.Xml.XPath\XPathNavigatorReader.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyImports.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslApplyTemplates.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAttribute.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslAvt.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCallTemplate.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslChoose.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslComment.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCompiledElement.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopy.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslCopyOf.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslElement.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslFallback.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslForEach.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslIf.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslLiteralElement.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslMessage.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNotSupportedOperation.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslNumber.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslOperation.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslProcessingInstruction.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslTemplateContent.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslText.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslValueOf.cs" />
-    <Compile Include="Mono.Xml.Xsl.Operations\XslVariable.cs" />
-    <Compile Include="Mono.Xml.Xsl\Attribute.cs" />
-    <Compile Include="Mono.Xml.Xsl\Compiler.cs" />
-    <Compile Include="Mono.Xml.Xsl\Debug.cs" />
-    <Compile Include="Mono.Xml.Xsl\Emitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\GenericOutputter.cs" />
-    <Compile Include="Mono.Xml.Xsl\HtmlEmitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\MSXslScriptManager.cs" />
-    <Compile Include="Mono.Xml.Xsl\Outputter.cs" />
-    <Compile Include="Mono.Xml.Xsl\ScriptCompilerInfo.cs" />
-    <Compile Include="Mono.Xml.Xsl\TextEmitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\TextOutputter.cs" />
-    <Compile Include="Mono.Xml.Xsl\XmlWriterEmitter.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslAttributeSet.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslDecimalFormat.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslFunctions.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslKey.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslOutput.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslSortEvaluator.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslStylesheet.cs" />
-    <Compile Include="Mono.Xml.Xsl\XsltCompiledContext.cs" />
-    <Compile Include="Mono.Xml.Xsl\XsltDebuggerWrapper.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslTemplate.cs" />
-    <Compile Include="Mono.Xml.Xsl\XslTransformProcessor.cs" />
-    <Compile Include="Mono.Xml\IHasXmlParserContext.cs" />
-    <Compile Include="Mono.Xml\IHasXmlSchemaInfo.cs" />
-    <Compile Include="Mono.Xml\SubtreeXmlReader.cs" />
-    <Compile Include="Mono.Xml\XmlFilterReader.cs" />
-    <Compile Include="Mono.Xml\XmlNodeWriter.cs" />
-    <Compile Include="System.Xml.Schema\BuiltInDatatype.cs" />
-    <Compile Include="System.Xml.Schema\IXmlSchemaInfo.cs" />
-    <Compile Include="System.Xml.Schema\SchemaDataValueType.cs" />
-    <Compile Include="System.Xml.Schema\ValidationEventArgs.cs" />
-    <Compile Include="System.Xml.Schema\ValidationHandler.cs" />
-    <Compile Include="System.Xml.Schema\XmlAtomicValue.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchema.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAll.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotated.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAnnotation.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAny.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAnyAttribute.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAppInfo.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAttribute.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroup.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaAttributeGroupRef.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaChoice.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaCollection.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaCollectionEnumerator.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaCompilationSettings.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentExtension.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexContentRestriction.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaComplexType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContentModel.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContentProcessing.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaContentType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatype.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDatatypeVariety.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDerivationMethod.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaDocumentation.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaElement.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaEnumerationFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaException.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaExternal.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaForm.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaFractionDigitsFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaGroup.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupBase.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaGroupRef.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaIdentityConstraint.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaImport.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInclude.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInference.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInferenceException.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaInfo.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaKey.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaKeyref.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaLengthFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxExclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxInclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMaxLengthFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMinExclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMinInclusiveFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaMinLengthFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaNotation.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaNumericFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObject.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectCollection.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectEnumerator.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaObjectTable.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaParticle.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaPatternFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaReader.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaRedefine.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSequence.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSerializer.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentExtension.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleContentRestriction.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeContent.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeList.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeRestriction.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaSimpleTypeUnion.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaTotalDigitsFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaType.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaUnique.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaUse.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaUtil.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationException.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidationFlags.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidator.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaValidity.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaWhiteSpaceFacet.cs" />
-    <Compile Include="System.Xml.Schema\XmlSchemaXPath.cs" />
-    <Compile Include="System.Xml.Schema\XmlSeverityType.cs" />
-    <Compile Include="System.Xml.Schema\XmlTypeCode.cs" />
-    <Compile Include="System.Xml.Schema\XmlValueConverter.cs" />
-    <Compile Include="System.Xml.Schema\XmlValueGetter.cs" />
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtension.cs" />
-    <Compile Include="System.Xml.Serialization.Advanced\SchemaImporterExtensionCollection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\DateTimeSerializationSection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElement.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionElementCollection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SchemaImporterExtensionsSection.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\SerializationSectionGroup.cs" />
-    <Compile Include="System.Xml.Serialization.Configuration\XmlSerializerSection.cs" />
-    <Compile Include="System.Xml.Serialization\CodeExporter.cs" />
-    <Compile Include="System.Xml.Serialization\CodeGenerationOptions.cs" />
-    <Compile Include="System.Xml.Serialization\CodeIdentifier.cs" />
-    <Compile Include="System.Xml.Serialization\CodeIdentifiers.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\MapCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapCodeExporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\UnreferencedObjectEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCodeExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNodeEventArgs.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNodeEventHandler.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaEnumerator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemas.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.XPath\DefaultContext.cs" />
-    <Compile Include="System.Xml.XPath\Expression.cs" />
-    <Compile Include="System.Xml.XPath\Iterator.cs" />
-    <Compile Include="System.Xml.XPath\IXPathNavigable.cs" />
-    <Compile Include="System.Xml.XPath\Tokenizer.cs" />
-    <Compile Include="System.Xml.XPath\XmlCaseOrder.cs" />
-    <Compile Include="System.Xml.XPath\XmlDataType.cs" />
-    <Compile Include="System.Xml.XPath\XmlSortOrder.cs" />
-    <Compile Include="System.Xml.XPath\XPathComparer.cs" />
-    <Compile Include="System.Xml.XPath\XPathDocument.cs" />
-    <Compile Include="System.Xml.XPath\XPathException.cs" />
-    <Compile Include="System.Xml.XPath\XPathExpression.cs" />
-    <Compile Include="System.Xml.XPath\XPathItem.cs" />
-    <Compile Include="System.Xml.XPath\XPathNamespaceScope.cs" />
-    <Compile Include="System.Xml.XPath\XPathNavigator.cs" />
-    <Compile Include="System.Xml.XPath\XPathNodeIterator.cs" />
-    <Compile Include="System.Xml.XPath\XPathNodeType.cs" />
-    <Compile Include="System.Xml.XPath\XPathResultType.cs" />
-    <Compile Include="System.Xml.Xsl\IXsltContextFunction.cs" />
-    <Compile Include="System.Xml.Xsl\IXsltContextVariable.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform.cs" />
-    <Compile Include="System.Xml.Xsl\XsltArgumentList.cs" />
-    <Compile Include="System.Xml.Xsl\XsltCompileException.cs" />
-    <Compile Include="System.Xml.Xsl\XsltContext.cs" />
-    <Compile Include="System.Xml.Xsl\XsltException.cs" />
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventArgs.cs" />
-    <Compile Include="System.Xml.Xsl\XsltMessageEncounteredEventHandler.cs" />
-    <Compile Include="System.Xml.Xsl\XslTransform.cs" />
-    <Compile Include="System.Xml.Xsl\XsltSettings.cs" />
-    <Compile Include="System.Xml\ConformanceLevel.cs" />
-    <Compile Include="System.Xml\DefaultXmlWriter.cs" />
-    <Compile Include="System.Xml\DTDAutomata.cs" />
-    <Compile Include="System.Xml\DTDObjectModel.cs" />
-    <Compile Include="System.Xml\DtdProcessing.cs" />
-    <Compile Include="System.Xml\DTDReader.cs" />
-    <Compile Include="System.Xml\DTDValidatingReader2.cs" />
-    <Compile Include="System.Xml\EntityHandling.cs" />
-    <Compile Include="System.Xml\EntityResolvingXmlReader.cs" />
-    <Compile Include="System.Xml\Formatting.cs" />
-    <Compile Include="System.Xml\IHasXmlChildNode.cs" />
-    <Compile Include="System.Xml\IHasXmlNode.cs" />
-    <Compile Include="System.Xml\IXmlLineInfo.cs" />
-    <Compile Include="System.Xml\IXmlNamespaceResolver.cs" />
-    <Compile Include="System.Xml\MonoFIXAttribute.cs" />
-    <Compile Include="System.Xml\NamespaceHandling.cs" />
-    <Compile Include="System.Xml\NameTable.cs" />
-    <Compile Include="System.Xml\NewLineHandling.cs" />
-    <Compile Include="System.Xml\ReadState.cs" />
-    <Compile Include="System.Xml\ValidationType.cs" />
-    <Compile Include="System.Xml\WhitespaceHandling.cs" />
-    <Compile Include="System.Xml\WriteState.cs" />
-    <Compile Include="System.Xml\XmlAttribute.cs" />
-    <Compile Include="System.Xml\XmlAttributeCollection.cs" />
-    <Compile Include="System.Xml\XmlCDataSection.cs" />
-    <Compile Include="System.Xml\XmlChar.cs" />
-    <Compile Include="System.Xml\XmlCharacterData.cs" />
-    <Compile Include="System.Xml\XmlComment.cs" />
-    <Compile Include="System.Xml\XmlConstructs.cs" />
-    <Compile Include="System.Xml\XmlConvert.cs" />
-    <Compile Include="System.Xml\XmlDateTimeSerializationMode.cs" />
-    <Compile Include="System.Xml\XmlDeclaration.cs" />
-    <Compile Include="System.Xml\XmlDocument.cs" />
-    <Compile Include="System.Xml\XmlDocumentFragment.cs" />
-    <Compile Include="System.Xml\XmlDocumentNavigator.cs" />
-    <Compile Include="System.Xml\XmlDocumentType.cs" />
-    <Compile Include="System.Xml\XmlElement.cs" />
-    <Compile Include="System.Xml\XmlEntity.cs" />
-    <Compile Include="System.Xml\XmlEntityReference.cs" />
-    <Compile Include="System.Xml\XmlException.cs" />
-    <Compile Include="System.Xml\XmlImplementation.cs" />
-    <Compile Include="System.Xml\XmlInputStream.cs" />
-    <Compile Include="System.Xml\XmlIteratorNodeList.cs" />
-    <Compile Include="System.Xml\XmlLinkedNode.cs" />
-    <Compile Include="System.Xml\XmlNamedNodeMap.cs" />
-    <Compile Include="System.Xml\XmlNameEntry.cs" />
-    <Compile Include="System.Xml\XmlNameEntryCache.cs" />
-    <Compile Include="System.Xml\XmlNamespaceManager.cs" />
-    <Compile Include="System.Xml\XmlNamespaceScope.cs" />
-    <Compile Include="System.Xml\XmlNameTable.cs" />
-    <Compile Include="System.Xml\XmlNode.cs" />
-    <Compile Include="System.Xml\XmlNodeArrayList.cs" />
-    <Compile Include="System.Xml\XmlNodeChangedAction.cs" />
-    <Compile Include="System.Xml\XmlNodeChangedEventArgs.cs" />
-    <Compile Include="System.Xml\XmlNodeChangedEventHandler.cs" />
-    <Compile Include="System.Xml\XmlNodeList.cs" />
-    <Compile Include="System.Xml\XmlNodeListChildren.cs" />
-    <Compile Include="System.Xml\XmlNodeOrder.cs" />
-    <Compile Include="System.Xml\XmlNodeReader2.cs" />
-    <Compile Include="System.Xml\XmlNodeReaderImpl.cs" />
-    <Compile Include="System.Xml\XmlNodeType.cs" />
-    <Compile Include="System.Xml\XmlNotation.cs" />
-    <Compile Include="System.Xml\XmlOutputMethod.cs" />
-    <Compile Include="System.Xml\XmlParserContext.cs" />
-    <Compile Include="System.Xml\XmlParserInput.cs" />
-    <Compile Include="System.Xml\XmlProcessingInstruction.cs" />
-    <Compile Include="System.Xml\XmlQualifiedName.cs" />
-    <Compile Include="System.Xml\XmlReader.cs" />
-    <Compile Include="System.Xml\XmlReaderBinarySupport.cs" />
-    <Compile Include="System.Xml\XmlReaderSettings.cs" />
-    <Compile Include="System.Xml\XmlResolver.cs" />
-    <Compile Include="System.Xml\XmlSecureResolver.cs" />
-    <Compile Include="System.Xml\XmlSignificantWhitespace.cs" />
-    <Compile Include="System.Xml\XmlSpace.cs" />
-    <Compile Include="System.Xml\XmlText.cs" />
-    <Compile Include="System.Xml\XmlTextReader.cs" />
-    <Compile Include="System.Xml\XmlTextReader2.cs" />
-    <Compile Include="System.Xml\XmlTextWriter2.cs" />
-    <Compile Include="System.Xml\XmlTokenizedType.cs" />
-    <Compile Include="System.Xml\XmlUrlResolver.cs" />
-    <Compile Include="System.Xml\XmlValidatingReader.cs" />
-    <Compile Include="System.Xml\XmlWhitespace.cs" />
-    <Compile Include="System.Xml\XmlWriter.cs" />
-    <Compile Include="System.Xml\XmlWriterSettings.cs" />
-    <Compile Include="System.Xml\XQueryConvert.cs" />
-    <Compile Include="Mono.Xml.Xsl\PatternParser.cs" />
-    <Compile Include="Mono.Xml.Xsl\PatternTokenizer.cs" />
-    <Compile Include="System.Xml.XPath\Parser.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>
-$(ProjectDir)\..\..\..\mono\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
-
-    </PreBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\corlib\corlib-build.csproj">
-      <Project>{2BDF80D1-6F06-4908-B351-835292B7A9B9}</Project>
-      <Name>corlib\corlib-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System\System-build.csproj">
-      <Project>{78CDD7C1-0524-4A2A-BAA6-2A05CCD7116C}</Project>
-      <Name>System\System-build</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System.XML/System.Xml-net_4_x.csproj b/mcs/class/System.XML/System.Xml-net_4_x.csproj
index cdfb3fdeff8..753fdd5bbb8 100644
--- a/mcs/class/System.XML/System.Xml-net_4_x.csproj
+++ b/mcs/class/System.XML/System.Xml-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,219,414,649,1717</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -45,669 +48,670 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\GenerateHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\IteratorDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\OptimizerPatterns.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\StaticDataManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\TailCallAnalyzer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILAnnotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILConstructAnalyzer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILModule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimization.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimizerVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTrace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTypeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\ISourceLineInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\ListBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Pair.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilBinary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilChoice.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilCloneVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilDataSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFunction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvoke.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeEarlyBound.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeLateBound.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLiteral.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLoop.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNodeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReplaceVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilScopedVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilSortKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilStrConcat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTargetType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTernary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTypeChecker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilUnary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilValidationVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SerializationHints.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SubstitutionList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\WhitespaceRule.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QueryReaderSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\ContentIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DecimalFormatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DocumentOrderComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DodSequenceMerge.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\EarlyBoundInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\NumberFormatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\RtfNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SetIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SiblingIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\StringConcat.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\TreeIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleLookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAggregates.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAttributeCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlCollation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlExtensionFunction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILIndex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILStorageConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlIterators.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryRuntime.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQuerySequence.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryStaticData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlRawWriterWrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSequenceWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKeyAccumulator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XslNumber.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltConvert.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltLibrary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\SourceLineInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlILCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlIlGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlNodeKindFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQualifiedNameTest.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryCardinality.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryTypeFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXpathBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXPathEnvironment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathAxis.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathCompileException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathOperator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathQilFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathScanner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPathConvert.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XslException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Compiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\CompilerScopeManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Focus.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\IErrorHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\InvokeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\KeyMatchBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Keywords.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\MatcherBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\OutputScopeManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGeneratorEnv.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilStrConcatenator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Scripts.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Stylesheet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAst.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAstAnalyzer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltInput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltQilFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslVisitor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Action.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ActionFrame.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyImportsAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyTemplatesAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeSetAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Avt.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AvtEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BeginEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BuilderInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CallTemplateAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ChooseAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CommentAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CompiledAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Compiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ContainerAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAttributesAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyCodeAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNamespacesAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNodesetAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyOfAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DbgCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DocumentScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ElementAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\EndEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Event.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ForeachAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\HtmlProps.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\IfAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScopeManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\MessageAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceDecl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorInput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NewInstructionAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NumberAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutKeywords.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScopeManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\PrefixQname.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ProcessingInstructionAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Processor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ReaderOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RootAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SequentialOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SortAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StateMachine.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StringOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Stylesheet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateBaseAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateLookupAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Templatemanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOnlyOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TheQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\UseAttributesetsAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ValueOfAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\VariableAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WithParamAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WriterOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltCompileContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltDebugger.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltOutput.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\InternalApis\NDP_Common\inc\Win8Helpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\HResults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\InvariantComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\PrivilegedConfigurationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Assembly\System.Xml.Assembly.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\AsyncHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64Decoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64Encoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64EncoderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\BinXmltoken.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\SqlUtils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexDecoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexEncoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexEncoderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Bits.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BitStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\ByteStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\Shape.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\ShapeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeInfoAtom.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeViewPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\BinaryCompatibility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\CharEntityEncoderFallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ConformanceLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\DtdProcessing.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\EntityHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlEncodedRawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlTernaryTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlUtf8RawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IncrementalReadDecoders.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IRemovableWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IValidationEventHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\NamespaceHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\NewLineHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\QueryOutputWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\QueryOutputWriterV1.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelperAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadOnlyTernaryTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\SecureStringHasher.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\TextEncodedRawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\TextUtf8RawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ValidatingReaderNodeData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ValidationType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\WhitespaceHandling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAutoDetectWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlConfiguration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEventCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlParserContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlRawWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlRawWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReaderSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSpace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextEncoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImpl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpersAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImpl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImplAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpersAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriterAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriterSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdCachingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdCachingReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdValidatingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdValidatingReaderAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\DiagnosticsSwitches.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentSchemaValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentXmlWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentXPathNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DomNameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlAttributeCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlCDataSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlCharacterData.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlChildEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlChildNodes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlComment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDeclaration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocumentFragment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocumentType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDomTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlElementList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEntity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEntityReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEventChangedAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlImplementation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlLinkedNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodemap.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodeMap.SmallXmlNodeList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlProcessingInstruction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlSignificantWhiteSpace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlText.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlUnspecifiedAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlWhitespace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XPathNodeList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\EmptyEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\HWStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IApplicationResourceStreamResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IHasXmlNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IXmlLineInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IXmlNamespaceResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\LineInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\MTNameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\NameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Ref.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlKnownDtds.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolverAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Asttree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\AutoValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BaseProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BaseValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BitSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Chameleonkey.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\CompiledidEntityConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ConstraintStruct.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ContentValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DataTypeImplementation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdParserAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\FacetChecker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Inference\Infer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Inference\XmlSchemaInferenceException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\IXmlSchemaInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\NamespaceList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Parser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ParserAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Preprocessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaAttDef.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionpreProcessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaDeclBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaElementDecl.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaEntity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNamespacemanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaSetCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XdrBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XdrValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlAtomicValue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchema.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAll.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotated.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAny.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAppInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroupref.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaChoice.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCompilationSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentExtension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentRestriction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentModel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentProcessing.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDataType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDerivationMethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDocumentation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaExternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaFacet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaForm.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupRef.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaIdEntityConstraint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaImport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInclude.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaNotation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaParticle.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaRedefine.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSequence.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSet.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentExtension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentRestriction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeContent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeRestriction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeUnion.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSubstitutionGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaUse.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidationException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSeverityType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlTokenizedType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlTypeCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlValueConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdDateTime.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdDuration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\_Events.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Advanced\SchemaImporterExtension.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\AppSettings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeGenerationoptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifiers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Compilation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Compiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\ConfigurationStrings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\DateTimeSerializationSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionsSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SerializationSectionGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\XmlSerializerSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\ImportContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\indentedWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\IXmlSerializable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\IXmlTextParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Mappings.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Models.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\NameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\PrimitiveXmlSerializers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SchemaImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SchemaObjectWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapCodeExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapElementAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemamember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SourceInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\TypeExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Types.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlCodeExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlCountingReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Xmlcustomformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMemberMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMembersMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlRootAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemas.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationILGen.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReaderILGen.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriterILGen.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerNamespaces.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTextAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTypeMapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\ValidateNames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlCharType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlComplianceUtil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlConvert.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlDownloadManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlDownloadManagerAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlEncoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNamespacemanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNamespaceScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNameTable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNodeOrder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNodeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNullResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlQualifiedName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlReservedNs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlResolverAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlSecureResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlSecureResolverAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlUrlResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlUrlResolverAsync.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlXapResolver.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AbsoluteQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AstNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AttributeQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Axis.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BaseAxisQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheAxisQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheChildrenQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheOutputQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ChildrenQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ClonableStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CompiledXPathExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ContextQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantBaseQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantoverDescendantQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DocumentorderQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\EmptyQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ExtensionQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Filter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FilterQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingSibling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ForwardPositionQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Function.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FunctionQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Group.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\GroupQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\IdQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\IteratorFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\LogicalExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\MergeFilterQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NamespaceQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NodeFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NumberFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NumericExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Operand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\OperandQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Operator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ParentQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingSibling.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Query.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\QueryBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ResetableIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ReversePositionQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Root.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\SortQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\StringFunctions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\UnionExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ValueQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Variable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\VariableQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathArrayIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAxisIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathChildIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathDescendantIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathEmptyIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathMultyIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathScanner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelectionIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelfQuery.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSingletonIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\IXPathNavigable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathDocument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathExpr.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathItem.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNamespaceScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorKeyComparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNodeIterator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNodeType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XslCompiledTransform.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltArgumentList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XslTransform.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltSettings.cs" />
+    <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\GenerateHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\IteratorDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\OptimizerPatterns.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\StaticDataManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\TailCallAnalyzer.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILAnnotation.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILConstructAnalyzer.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILModule.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimization.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimizerVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTrace.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTypeHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\ISourceLineInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\ListBase.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Pair.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilBinary.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilChoice.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilCloneVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilDataSource.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilExpression.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFunction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvoke.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeEarlyBound.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeLateBound.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilIterator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilList.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLiteral.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLoop.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilName.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNode.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNodeType.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilParameter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReference.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReplaceVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilScopedVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilSortKey.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilStrConcat.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTargetType.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTernary.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTypeChecker.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilUnary.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilValidationVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlReader.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlWriter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SerializationHints.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SubstitutionList.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\WhitespaceRule.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QueryReaderSettings.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\ContentIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DecimalFormatter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DocumentOrderComparer.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DodSequenceMerge.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\EarlyBoundInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\NumberFormatter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\RtfNavigator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SetIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SiblingIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\StringConcat.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\TreeIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleLookup.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleReader.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAggregates.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAttributeCache.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlCollation.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlExtensionFunction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILIndex.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILStorageConverter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlIterators.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorFilter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorStack.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryContext.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryRuntime.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQuerySequence.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryStaticData.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlRawWriterWrapper.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSequenceWriter.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKey.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKeyAccumulator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XslNumber.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltConvert.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltFunctions.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltLibrary.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\SourceLineInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlILCommand.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlIlGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlNodeKindFlags.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQualifiedNameTest.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryCardinality.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryType.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryTypeFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXpathBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXPathEnvironment.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathAxis.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathCompileException.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathContext.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathOperator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathParser.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathQilFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathScanner.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPathConvert.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XslException.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Compiler.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\CompilerScopeManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Focus.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\IErrorHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\InvokeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\KeyMatchBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Keywords.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\MatcherBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\OutputScopeManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGeneratorEnv.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilStrConcatenator.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Scripts.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Stylesheet.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternParser.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAst.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAstAnalyzer.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslFlags.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltInput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltLoader.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltQilFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Action.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ActionFrame.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyImportsAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyTemplatesAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeSetAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Avt.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AvtEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BeginEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BuilderInfo.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CallTemplateAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ChooseAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CommentAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CompiledAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Compiler.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ContainerAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAttributesAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyCodeAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNamespacesAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNodesetAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyOfAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DbgCompiler.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DocumentScope.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ElementAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\EndEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Event.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ForeachAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\HtmlProps.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\IfAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScope.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScopeManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\MessageAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceDecl.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorInput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NewInstructionAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NumberAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutKeywords.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScope.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScopeManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\PrefixQname.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ProcessingInstructionAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Processor.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ReaderOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RootAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SequentialOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SortAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StateMachine.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StringOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Stylesheet.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateBaseAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateLookupAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Templatemanager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextEvent.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOnlyOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TheQuery.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\UseAttributesetsAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ValueOfAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\VariableAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WithParamAction.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WriterOutput.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltCompileContext.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltDebugger.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltOutput.cs" />
+    <Compile Include="..\referencesource\System.Xml\InternalApis\NDP_Common\inc\Win8Helpers.cs" />
+    <Compile Include="..\referencesource\System.Xml\misc\HResults.cs" />
+    <Compile Include="..\referencesource\System.Xml\misc\InvariantComparer.cs" />
+    <Compile Include="..\referencesource\System.Xml\misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Assembly\System.Xml.Assembly.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\AsyncHelper.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Base64Decoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Base64Encoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Base64EncoderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\BinXmltoken.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\SqlUtils.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexDecoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexEncoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexEncoderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Bits.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BitStack.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\ByteStack.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\Shape.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\ShapeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathDocumentBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathDocumentIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathDocumentNavigator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathDocumentView.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNodeHelper.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNodeInfoAtom.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNodeView.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\XPathNodeViewPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\BinaryCompatibility.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\CharEntityEncoderFallback.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ConformanceLevel.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\DtdProcessing.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\EntityHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\HtmlEncodedRawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\HtmlTernaryTree.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\HtmlUtf8RawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParserAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IncrementalReadDecoders.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IRemovableWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IValidationEventHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\NamespaceHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\NewLineHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\QueryOutputWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\QueryOutputWriterV1.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelper.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelperAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ReadOnlyTernaryTree.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ReadState.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\SecureStringHasher.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\TextEncodedRawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\TextUtf8RawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ValidatingReaderNodeData.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\ValidationType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\WhitespaceHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlAutoDetectWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlConfiguration.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlEventCache.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlParserContext.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlRawWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlRawWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlReaderSettings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlSpace.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextEncoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImpl.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpers.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpersAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlValidatingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImpl.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImplAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpers.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpersAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWrappingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWrappingReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWriterAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XmlWriterSettings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XsdCachingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XsdCachingReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XsdValidatingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XsdValidatingReaderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\DiagnosticsSwitches.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentSchemaValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentXmlWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentXPathNavigator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DomNameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlAttributeCollection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlCDataSection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlCharacterData.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlChildEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlChildNodes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlComment.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDeclaration.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDocument.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDocumentFragment.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDocumentType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlDomTextWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlElement.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlElementList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlEntity.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlEntityReference.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlEventChangedAction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlImplementation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlLinkedNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlLoader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlName.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodemap.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodeMap.SmallXmlNodeList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNotation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlProcessingInstruction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlSignificantWhiteSpace.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlText.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlUnspecifiedAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlWhitespace.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XPathNodeList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\EmptyEnumerator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\HWStack.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\IApplicationResourceStreamResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\IHasXmlNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\IXmlLineInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\IXmlNamespaceResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\LineInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\MTNameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\NameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Ref.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Resolvers\XmlKnownDtds.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Asttree.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\AutoValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\BaseProcessor.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\BaseValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\BitSet.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Chameleonkey.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\CompiledidEntityConstraint.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ConstraintStruct.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ContentValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DataTypeImplementation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DtdParser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DtdParserAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DtdValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\FacetChecker.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Inference\Infer.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Inference\XmlSchemaInferenceException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\IXmlSchemaInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\NamespaceList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Parser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ParserAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Preprocessor.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaAttDef.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionCompiler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionpreProcessor.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaDeclBase.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaElementDecl.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaEntity.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaNames.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaNamespacemanager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaNotation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaSetCompiler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\SchemaType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ValidationEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ValidationEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ValidationState.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XdrBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XdrValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlAtomicValue.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchema.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAll.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotated.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAny.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAppInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroup.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroupref.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaChoice.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCollection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCompilationSettings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContent.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentExtension.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentRestriction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContent.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentModel.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentProcessing.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDataType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDerivationMethod.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDocumentation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaElement.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaExternal.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaFacet.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaForm.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroup.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupBase.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupRef.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaIdEntityConstraint.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaImport.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInclude.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaNotation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObject.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectCollection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaParticle.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaRedefine.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSequence.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSet.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContent.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentExtension.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentRestriction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeContent.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeRestriction.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeUnion.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSubstitutionGroup.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaUse.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidationException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidity.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlSeverityType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlTokenizedType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlTypeCode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XmlValueConverter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdDateTime.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdDuration.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdValidator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\_Events.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Advanced\SchemaImporterExtension.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\AppSettings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeGenerationoptions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifier.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifiers.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Compilation.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Compiler.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\ConfigurationStrings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\DateTimeSerializationSection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElement.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionsSection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SerializationSectionGroup.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\XmlSerializerSection.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\ImportContext.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\indentedWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\IXmlSerializable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\IXmlTextParser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Mappings.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Models.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\NameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\PrimitiveXmlSerializers.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SchemaImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SchemaObjectWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeOverrides.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapCodeExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapElementAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapEnumAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapIgnoreAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapIncludeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapReflectionImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapSchemamember.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SourceInfo.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\TypeExtensions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Types.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAnyAttributeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlArrayAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeOverrides.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlChoiceIdentifierAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlCodeExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlCountingReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Xmlcustomformatter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttributes.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlEnumAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlIgnoreAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlIncludeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlMapping.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlMemberMapping.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlMembersMapping.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlNamespaceDeclarationsAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionMember.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlRootAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaExporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaImporter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemas.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationGeneratedCode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationILGen.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReaderILGen.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriterILGen.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializer.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerAssemblyAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerFactory.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerNamespaces.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerVersionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTextAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTypeMapping.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\ValidateNames.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlCharType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlComplianceUtil.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlConvert.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlDownloadManager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlDownloadManagerAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlEncoding.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNamespacemanager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNamespaceScope.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNodeOrder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNodeType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNullResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlQualifiedName.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlReservedNs.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlSecureResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlSecureResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlUrlResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlUrlResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlXapResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\AbsoluteQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\AstNode.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\AttributeQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Axis.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\BaseAxisQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanFunctions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\CacheAxisQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\CacheChildrenQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\CacheOutputQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ChildrenQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ClonableStack.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\CompiledXPathExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ContextQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantBaseQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantoverDescendantQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DocumentorderQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\EmptyQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ExtensionQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Filter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\FilterQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingSibling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ForwardPositionQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Function.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\FunctionQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Group.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\GroupQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\IdQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\IteratorFilter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\LogicalExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\MergeFilterQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\NamespaceQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\NodeFunctions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\NumberFunctions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\NumericExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Operand.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\OperandQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Operator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ParentQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingSibling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Query.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\QueryBuilder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ResetableIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ReversePositionQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Root.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\SortQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\StringFunctions.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\UnionExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ValueQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\Variable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\VariableQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathArrayIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAxisIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathChildIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathDescendantIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathEmptyIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathMultyIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathParser.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathScanner.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelectionIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelfQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSingletonIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\IXPathNavigable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathDocument.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathExpr.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathItem.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNamespaceScope.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNavigator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorKeyComparer.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorReader.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNodeIterator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNodeType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XslCompiledTransform.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltArgumentList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltContext.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XslTransform.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltSettings.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\LocalAppContextSwitches.cs" />
     <Compile Include="ReferenceSources\Res.cs" />
@@ -720,15 +724,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -739,14 +742,14 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../System/System-secxml-net_4_x.csproj">
+      <Project>{19954F80-065E-4D46-8FEF-62BA4D6CFDAD}</Project>
+      <Name>System-secxml-net_4_x</Name>
+    </ProjectReference>
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
       <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
       <Name>System.Configuration-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System/System-bare-net_4_x.csproj">
-      <Project>{483DB7F6-9145-4AE2-B9B2-2B5EE6FDEFB4}</Project>
-      <Name>System-bare-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs
index 7969f402f8f..8f2de60a838 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs
@@ -51,17 +51,17 @@ namespace MonoTests.System.Xml
 		public void CreateEvidenceForUrl_Basic ()
 		{
 			Evidence e = XmlSecureResolver.CreateEvidenceForUrl (null);
-#if DISABLE_CAS_USE
-			Assert.IsNull (e);
-#else
+#if FEATURE_MONO_CAS
 			Assert.AreEqual (0, e.Count, "null");
+#else
+			Assert.IsNull (e);
 #endif
 
 			e = XmlSecureResolver.CreateEvidenceForUrl (String.Empty);
-#if DISABLE_CAS_USE
-			Assert.IsNull (e);
-#else
+#if FEATURE_MONO_CAS
 			Assert.AreEqual (0, e.Count, "String.Empty");
+#else
+			Assert.IsNull (e);
 #endif
 		}
 
diff --git a/mcs/class/System.Xaml/System.Xaml-net_4_x.csproj b/mcs/class/System.Xaml/System.Xaml-net_4_x.csproj
index 25d922d3760..a5d11aeffb1 100644
--- a/mcs/class/System.Xaml/System.Xaml-net_4_x.csproj
+++ b/mcs/class/System.Xaml/System.Xaml-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -176,15 +179,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_x.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_x.csproj
index a32e2b0b978..e3988ed811f 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_x.csproj
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -25,7 +28,7 @@
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_SERIALIZATION</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -33,7 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_SERIALIZATION</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -45,13 +48,13 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System.Xml.Linq\System\Xml\Linq\XComponentModel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml.Linq\System\Xml\Linq\XLinq.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml.Linq\System\Xml\Linq\XNodeNavigator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System.Xml.Linq\System\Xml\Linq\XNodeValidator.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\referencesource\System.Xml.Linq\System\Xml\Linq\XComponentModel.cs" />
+    <Compile Include="..\referencesource\System.Xml.Linq\System\Xml\Linq\XLinq.cs" />
+    <Compile Include="..\referencesource\System.Xml.Linq\System\Xml\Linq\XNodeNavigator.cs" />
+    <Compile Include="..\referencesource\System.Xml.Linq\System\Xml\Linq\XNodeValidator.cs" />
     <Compile Include="Assembly\AssemblyInfo.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.
@@ -61,15 +64,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_x.csproj b/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_x.csproj
index 852c92dd335..5168c310d86 100644
--- a/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_x.csproj
+++ b/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -56,15 +59,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index d4c83ee497c..b5fb6bb927c 100644
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -42,6 +42,11 @@ REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_THREAD_SUSPEND_RESUME
 TEST_MCS_FLAGS += -d:MONO_FEATURE_THREAD_SUSPEND_RESUME
 endif
 
+ifndef NO_MULTIPLE_APPDOMAINS
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_MULTIPLE_APPDOMAINS
+TEST_MCS_FLAGS += -d:MONO_FEATURE_MULTIPLE_APPDOMAINS
+endif
+
 TXT_RESOURCE_STRINGS = ../referencesource/System/System.txt
 
 #
diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
index a4de75e853a..00424bd70f3 100644
--- a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
+++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
@@ -215,6 +215,10 @@ namespace Mono.CSharp
 			mcs.StartInfo.RedirectStandardOutput=true;
 			mcs.StartInfo.RedirectStandardError=true;
 			mcs.ErrorDataReceived += new DataReceivedEventHandler (McsStderrDataReceived);
+
+			// Use same text decoder as mcs and not user set values in Console
+			mcs.StartInfo.StandardOutputEncoding =
+			mcs.StartInfo.StandardErrorEncoding = Encoding.UTF8;
 			
 			try {
 				mcs.Start();
diff --git a/mcs/class/System/Mono.Net.Security/MonoSslStreamImpl.cs b/mcs/class/System/Mono.Net.Security/MonoSslStreamImpl.cs
index 776751537bd..f8a83bb6f3b 100644
--- a/mcs/class/System/Mono.Net.Security/MonoSslStreamImpl.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoSslStreamImpl.cs
@@ -222,7 +222,7 @@ namespace Mono.Net.Security.Private
 		}
 
 		public int KeyExchangeStrength {
-			get { return KeyExchangeStrength; }
+			get { return Impl.KeyExchangeStrength; }
 		}
 
 		public bool CanRead {
diff --git a/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs b/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs
index 55969818a8b..14f7d1a586d 100644
--- a/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs
+++ b/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs
@@ -65,16 +65,12 @@ namespace Mono.Net.Security
 		public static X509Chain CreateX509Chain (XX509CertificateCollection certs)
 		{
 			var chain = new X509Chain ();
-			chain.ChainPolicy = new X509ChainPolicy ();
+			chain.ChainPolicy = new X509ChainPolicy ((X509CertificateCollection)(object)certs);
 
 #if !MOBILE
 			chain.ChainPolicy.RevocationMode = revocation_mode;
 #endif
 
-			for (int i = 1; i < certs.Count; i++) {
-				chain.ChainPolicy.ExtraStore.Add (certs [i]);
-			}
-
 			return chain;
 		}
 
diff --git a/mcs/class/System/ReferenceSources/AutoWebProxyScriptEngine.cs b/mcs/class/System/ReferenceSources/AutoWebProxyScriptEngine.cs
new file mode 100644
index 00000000000..4e4d2859b03
--- /dev/null
+++ b/mcs/class/System/ReferenceSources/AutoWebProxyScriptEngine.cs
@@ -0,0 +1,179 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using Mono.Net;
+
+namespace System.Net
+{
+	class AutoWebProxyScriptEngine
+	{
+		public AutoWebProxyScriptEngine (WebProxy proxy, bool useRegistry)
+		{
+		}
+
+		public Uri AutomaticConfigurationScript { get; set; }
+		public bool AutomaticallyDetectSettings { get; set; }
+
+		public bool GetProxies (Uri destination, out IList<string> proxyList)
+		{
+			int i = 0;
+			return GetProxies (destination, out proxyList, ref i);
+		}
+
+		public bool GetProxies(Uri destination, out IList<string> proxyList, ref int syncStatus)
+		{
+			proxyList = null;
+			return false;
+		}
+
+		public void Close ()
+		{
+		}
+
+		public void Abort (ref int syncStatus)
+		{
+		}
+
+		public void CheckForChanges ()
+		{
+		}
+
+#if !MOBILE
+		public WebProxyData GetWebProxyData ()
+		{
+			WebProxyData data;
+
+			// TODO: Could re-use some pieces from _AutoWebProxyScriptEngine.cs
+			if (IsWindows ()) {
+				data = InitializeRegistryGlobalProxy ();
+				if (data != null)
+					return data;
+			}
+
+			data = ReadEnvVariables ();
+			return data ?? new WebProxyData ();
+		}
+
+		WebProxyData ReadEnvVariables ()
+		{
+			string address = Environment.GetEnvironmentVariable ("http_proxy") ?? Environment.GetEnvironmentVariable ("HTTP_PROXY");
+
+			if (address != null) {
+				try {
+					if (!address.StartsWith ("http://"))
+						address = "http://" + address;
+
+					Uri uri = new Uri (address);
+					IPAddress ip;
+					
+					if (IPAddress.TryParse (uri.Host, out ip)) {
+						if (IPAddress.Any.Equals (ip)) {
+							UriBuilder builder = new UriBuilder (uri);
+							builder.Host = "127.0.0.1";
+							uri = builder.Uri;
+						} else if (IPAddress.IPv6Any.Equals (ip)) {
+							UriBuilder builder = new UriBuilder (uri);
+							builder.Host = "[::1]";
+							uri = builder.Uri;
+						}
+					}
+
+					bool bBypassOnLocal = false;
+					ArrayList al = new ArrayList ();
+					string bypass = Environment.GetEnvironmentVariable ("no_proxy") ?? Environment.GetEnvironmentVariable ("NO_PROXY");
+					
+					if (bypass != null) {
+						string[] bypassList = bypass.Split (new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					
+						foreach (string str in bypassList) {
+							if (str != "*.local")
+								al.Add (str);
+							else
+								bBypassOnLocal = true;
+						}
+					}
+
+					return new WebProxyData {
+						proxyAddress = uri,
+						bypassOnLocal = bBypassOnLocal,
+						bypassList = CreateBypassList (al)
+					};
+				} catch (UriFormatException) {
+				}
+			}
+
+			return null;
+		}
+
+		static bool IsWindows ()
+		{
+			return (int) Environment.OSVersion.Platform < 4;
+		}
+				
+		WebProxyData InitializeRegistryGlobalProxy ()
+		{
+			int iProxyEnable = (int)Microsoft.Win32.Registry.GetValue ("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", "ProxyEnable", 0);
+
+			if (iProxyEnable > 0) {
+				string strHttpProxy = "";
+				bool bBypassOnLocal = false;
+				ArrayList al = new ArrayList ();
+				
+				string strProxyServer = (string)Microsoft.Win32.Registry.GetValue ("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", "ProxyServer", null);
+				string strProxyOverrride = (string)Microsoft.Win32.Registry.GetValue ("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", "ProxyOverride", null);
+				
+				if (strProxyServer.Contains ("=")) {
+					foreach (string strEntry in strProxyServer.Split (new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+						if (strEntry.StartsWith ("http=")) {
+							strHttpProxy = strEntry.Substring (5);
+							break;
+						}
+				} else strHttpProxy = strProxyServer;
+				
+				if (strProxyOverrride != null) {
+					string[] bypassList = strProxyOverrride.Split (new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+				
+					foreach (string str in bypassList) {
+						if (str != "<local>")
+							al.Add (str);
+						else
+							bBypassOnLocal = true;
+					}
+				}
+
+				return new WebProxyData {
+					proxyAddress = ToUri (strHttpProxy),
+					bypassOnLocal = bBypassOnLocal,
+					bypassList = CreateBypassList (al)
+				};
+			}
+
+			return null;
+		}
+
+		static Uri ToUri (string address)
+		{
+			if (address == null)
+				return null;
+				
+			if (address.IndexOf ("://", StringComparison.Ordinal) == -1) 
+				address = "http://" + address;
+
+			return new Uri (address);
+		}
+
+		// Takes an ArrayList of fileglob-formatted strings and returns an array of Regex-formatted strings
+		static ArrayList CreateBypassList (ArrayList al)
+		{
+			string[] result = al.ToArray (typeof (string)) as string[];
+			for (int c = 0; c < result.Length; c++)
+			{
+				result [c] = "^" +
+					Regex.Escape (result [c]).Replace (@"\*", ".*").Replace (@"\?", ".") +
+					"$";
+			}
+			return new ArrayList (result);
+		}
+#endif
+	}
+}
+\ No newline at end of file
diff --git a/mcs/class/System/ReferenceSources/CAPI.cs b/mcs/class/System/ReferenceSources/CAPI.cs
new file mode 100644
index 00000000000..28e1c47e7d5
--- /dev/null
+++ b/mcs/class/System/ReferenceSources/CAPI.cs
@@ -0,0 +1,162 @@
+namespace System.Security.Cryptography {
+
+	static class CAPI {
+		// OID key type.
+		internal const uint CRYPT_OID_INFO_OID_KEY   = 1;
+		internal const uint CRYPT_OID_INFO_NAME_KEY  = 2;
+		internal const uint CRYPT_OID_INFO_ALGID_KEY = 3;
+		internal const uint CRYPT_OID_INFO_SIGN_KEY  = 4;
+
+		public static string CryptFindOIDInfoNameFromKey (string key, OidGroup oidGroup)
+		{
+			// TODO: incomplete
+			// TODO: oidGroup is ignored
+			switch (key) {
+			case "1.2.840.113549.1.1.5":
+			case "1.3.14.3.2.29":
+			case "1.3.14.3.2.15":
+				return "sha1RSA";
+			case "1.2.840.113549.1.1.4":
+			case "1.3.14.3.2.3":
+				return "md5RSA";
+			case "1.2.840.10040.4.3":
+			case "1.3.14.3.2.13":
+				return "sha1DSA";
+			case "1.2.840.113549.1.1.2":
+			case "1.3.14.7.2.3.1":
+				return "md2RSA";
+			case "1.2.840.113549.1.1.3":
+				return "md4RSA";
+				return "md4RSA";
+				return "md4RSA";
+			case "1.3.14.3.2.27":
+				return "dsaSHA1";
+			case "2.16.840.1.101.2.1.1.19":
+				return "mosaicUpdatedSig";
+			case "1.3.14.3.2.26":
+				return "sha1";
+			case "1.2.840.113549.2.5":
+				return "md5";
+			case "2.16.840.1.101.3.4.2.1":
+				return "sha256";
+			case "2.16.840.1.101.3.4.2.2":
+				return "sha384";
+			case "2.16.840.1.101.3.4.2.3":
+				return "sha512";
+			case "1.2.840.113549.1.1.11":
+				return "sha256RSA";
+			case "1.2.840.113549.1.1.12":
+				return "sha384RSA";
+			case "1.2.840.113549.1.1.13":
+				return "sha512RSA";
+			case "1.2.840.113549.1.1.10":
+				return "RSASSA-PSS";
+			case "1.2.840.10045.4.1":
+				return "sha1ECDSA";
+			case "1.2.840.10045.4.3.2":
+				return "sha256ECDSA";
+			case "1.2.840.10045.4.3.3":
+				return "sha384ECDSA";
+			case "1.2.840.10045.4.3.4":
+				return "sha512ECDSA";
+			case "1.2.840.10045.4.3":
+				return "specifiedECDSA";
+			case "1.2.840.113549.1.1.1":
+				return "RSA";
+			case "1.2.840.113549.1.7.1":
+				return "PKCS 7 Data";
+			case "1.2.840.113549.1.9.3":
+				return "Content Type";
+			case "1.2.840.113549.1.9.4":
+				return "Message Digest";
+			case "1.2.840.113549.1.9.5":
+				return "Signing Time";
+			case "1.2.840.113549.3.7":
+				return "3des";
+			case "2.5.29.17":
+				return "Subject Alternative Name";
+			case "2.16.840.1.101.3.4.1.2":
+				return "aes128";
+			case "2.16.840.1.101.3.4.1.42":
+				return "aes256";
+			case "2.16.840.1.113730.1.1":
+				return "Netscape Cert Type";
+			}
+
+			return null;
+		}
+
+		public static string CryptFindOIDInfoKeyFromName (string name, OidGroup oidGroup)
+		{
+			// TODO: incomplete
+			// TODO: oidGroup is ignored			
+			switch(name) {
+			case "sha1RSA":
+				return "1.2.840.113549.1.1.5";
+			case "md5RSA":
+				return "1.2.840.113549.1.1.4";
+			case "sha1DSA":
+				return "1.2.840.10040.4.3";
+			case "shaRSA":
+				return "1.3.14.3.2.29";
+			case "md2RSA":
+				return "1.2.840.113549.1.1.2";
+			case "md4RSA":
+				return "1.2.840.113549.1.1.3";
+			case "dsaSHA1":
+				return "1.3.14.3.2.27";
+			case "mosaicUpdatedSig":
+				return "2.16.840.1.101.2.1.1.19";
+			case "sha1":
+				return "1.3.14.3.2.26";
+			case "md5":
+				return "1.2.840.113549.2.5";
+			case "sha256":
+				return "2.16.840.1.101.3.4.2.1";
+			case "sha384":
+				return "2.16.840.1.101.3.4.2.2";
+			case "sha512":
+				return "2.16.840.1.101.3.4.2.3";
+			case "sha256RSA":
+				return "1.2.840.113549.1.1.11";
+			case "sha384RSA":
+				return "1.2.840.113549.1.1.12";
+			case "sha512RSA":
+				return "1.2.840.113549.1.1.13";
+			case "RSASSA-PSS":
+				return "1.2.840.113549.1.1.10";
+			case "sha1ECDSA":
+				return "1.2.840.10045.4.1";
+			case "sha256ECDSA":
+				return "1.2.840.10045.4.3.2";
+			case "sha384ECDSA":
+				return "1.2.840.10045.4.3.3";
+			case "sha512ECDSA":
+				return "1.2.840.10045.4.3.4";
+			case "specifiedECDSA":
+				return "1.2.840.10045.4.3";
+			case "RSA":
+				return "1.2.840.113549.1.1.1";
+			case "PKCS 7 Data":
+				return "1.2.840.113549.1.7.1";
+			case "Content Type":
+				return "1.2.840.113549.1.9.3";
+			case "Message Digest":
+				return "1.2.840.113549.1.9.4";
+			case "Signing Time":
+				return "1.2.840.113549.1.9.5";
+			case "3des":
+				return "1.2.840.113549.3.7";
+			case "Subject Alternative Name":
+				return "2.5.29.17";
+			case "aes128":
+				return "2.16.840.1.101.3.4.1.2";
+			case "aes256":
+				return "2.16.840.1.101.3.4.1.42";
+			case "Netscape Cert Type":
+				return "2.16.840.1.113730.1.1";
+			}
+			return null;
+		}
+	}
+}
+\ No newline at end of file
diff --git a/mcs/class/System/ReferenceSources/HttpApi.cs b/mcs/class/System/ReferenceSources/HttpApi.cs
new file mode 100644
index 00000000000..b7f3043a594
--- /dev/null
+++ b/mcs/class/System/ReferenceSources/HttpApi.cs
@@ -0,0 +1,164 @@
+using System.Collections;
+
+namespace System.Net
+{
+	static class UnsafeNclNativeMethods
+	{
+		internal static unsafe class HttpApi 
+		{
+			const int HttpHeaderRequestMaximum  = (int)HttpRequestHeader.UserAgent + 1;
+			const int HttpHeaderResponseMaximum = (int)HttpResponseHeader.WwwAuthenticate + 1;
+
+			internal static class HTTP_REQUEST_HEADER_ID {
+				internal static string ToString(int position) {
+					return m_Strings[position];
+				}
+
+				private static string[] m_Strings = {
+					"Cache-Control",
+					"Connection",
+					"Date",
+					"Keep-Alive",
+					"Pragma",
+					"Trailer",
+					"Transfer-Encoding",
+					"Upgrade",
+					"Via",
+					"Warning",
+
+					"Allow",
+					"Content-Length",
+					"Content-Type",
+					"Content-Encoding",
+					"Content-Language",
+					"Content-Location",
+					"Content-MD5",
+					"Content-Range",
+					"Expires",
+					"Last-Modified",
+
+					"Accept",
+					"Accept-Charset",
+					"Accept-Encoding",
+					"Accept-Language",
+					"Authorization",
+					"Cookie",
+					"Expect",
+					"From",
+					"Host",
+					"If-Match",
+
+					"If-Modified-Since",
+					"If-None-Match",
+					"If-Range",
+					"If-Unmodified-Since",
+					"Max-Forwards",
+					"Proxy-Authorization",
+					"Referer",
+					"Range",
+					"Te",
+					"Translate",
+					"User-Agent",
+				};
+			}
+
+			internal static class HTTP_RESPONSE_HEADER_ID {
+				private static Hashtable m_Hashtable;
+
+				static HTTP_RESPONSE_HEADER_ID() {
+					m_Hashtable = new Hashtable((int)Enum.HttpHeaderResponseMaximum);
+					for (int i = 0; i < (int)Enum.HttpHeaderResponseMaximum; i++) {
+						m_Hashtable.Add(m_Strings[i], i);
+					}
+				}
+
+				internal static int IndexOfKnownHeader(string HeaderName) {
+					object index = m_Hashtable[HeaderName];
+					return index==null ? -1 : (int)index;
+				 }
+
+				internal static string ToString(int position) {
+					return m_Strings[position];
+				}
+			}
+
+			internal enum Enum {
+				HttpHeaderCacheControl          = 0,    // general-header [section 4.5]
+				HttpHeaderConnection            = 1,    // general-header [section 4.5]
+				HttpHeaderDate                  = 2,    // general-header [section 4.5]
+				HttpHeaderKeepAlive             = 3,    // general-header [not in rfc]
+				HttpHeaderPragma                = 4,    // general-header [section 4.5]
+				HttpHeaderTrailer               = 5,    // general-header [section 4.5]
+				HttpHeaderTransferEncoding      = 6,    // general-header [section 4.5]
+				HttpHeaderUpgrade               = 7,    // general-header [section 4.5]
+				HttpHeaderVia                   = 8,    // general-header [section 4.5]
+				HttpHeaderWarning               = 9,    // general-header [section 4.5]
+
+				HttpHeaderAllow                 = 10,   // entity-header  [section 7.1]
+				HttpHeaderContentLength         = 11,   // entity-header  [section 7.1]
+				HttpHeaderContentType           = 12,   // entity-header  [section 7.1]
+				HttpHeaderContentEncoding       = 13,   // entity-header  [section 7.1]
+				HttpHeaderContentLanguage       = 14,   // entity-header  [section 7.1]
+				HttpHeaderContentLocation       = 15,   // entity-header  [section 7.1]
+				HttpHeaderContentMd5            = 16,   // entity-header  [section 7.1]
+				HttpHeaderContentRange          = 17,   // entity-header  [section 7.1]
+				HttpHeaderExpires               = 18,   // entity-header  [section 7.1]
+				HttpHeaderLastModified          = 19,   // entity-header  [section 7.1]
+
+
+				// Response Headers
+
+				HttpHeaderAcceptRanges          = 20,   // response-header [section 6.2]
+				HttpHeaderAge                   = 21,   // response-header [section 6.2]
+				HttpHeaderEtag                  = 22,   // response-header [section 6.2]
+				HttpHeaderLocation              = 23,   // response-header [section 6.2]
+				HttpHeaderProxyAuthenticate     = 24,   // response-header [section 6.2]
+				HttpHeaderRetryAfter            = 25,   // response-header [section 6.2]
+				HttpHeaderServer                = 26,   // response-header [section 6.2]
+				HttpHeaderSetCookie             = 27,   // response-header [not in rfc]
+				HttpHeaderVary                  = 28,   // response-header [section 6.2]
+				HttpHeaderWwwAuthenticate       = 29,   // response-header [section 6.2]
+
+				HttpHeaderResponseMaximum       = 30,
+
+
+				HttpHeaderMaximum               = 41
+			}
+
+			private static string[] m_Strings = {
+				"Cache-Control",
+				"Connection",
+				"Date",
+				"Keep-Alive",
+				"Pragma",
+				"Trailer",
+				"Transfer-Encoding",
+				"Upgrade",
+				"Via",
+				"Warning",
+
+				"Allow",
+				"Content-Length",
+				"Content-Type",
+				"Content-Encoding",
+				"Content-Language",
+				"Content-Location",
+				"Content-MD5",
+				"Content-Range",
+				"Expires",
+				"Last-Modified",
+
+				"Accept-Ranges",
+				"Age",
+				"ETag",
+				"Location",
+				"Proxy-Authenticate",
+				"Retry-After",
+				"Server",
+				"Set-Cookie",
+				"Vary",
+				"WWW-Authenticate",
+			};
+		}
+	}
+}
+\ No newline at end of file
diff --git a/mcs/class/System/ReferenceSources/Logging.cs b/mcs/class/System/ReferenceSources/Logging.cs
index fe8da2b3582..b5b773e28c4 100644
--- a/mcs/class/System/ReferenceSources/Logging.cs
+++ b/mcs/class/System/ReferenceSources/Logging.cs
@@ -22,18 +22,48 @@ namespace System.Net {
 		}
 
 		[Conditional ("TRACE")]
- 		internal static void Enter(TraceSource traceSource, object obj, string method, object paramObject) {
- 		}
+		internal static void Enter(TraceSource traceSource, object obj, string method, object paramObject) {
+		}
+
+		[Conditional ("TRACE")]
+		internal static void Enter(TraceSource traceSource, string msg) {
+		}
+
+		[Conditional ("TRACE")]
+		internal static void Exception(TraceSource traceSource, object obj, string method, Exception e) {
+		}
 
 		[Conditional ("TRACE")]
 		internal static void Exit(TraceSource traceSource, object obj, string method, object retObject) {
 		}
 
+		[Conditional ("TRACE")]
+		internal static void Exit(TraceSource traceSource, string msg) {
+		}
+
+		[Conditional ("TRACE")]
 		internal static void PrintInfo(TraceSource traceSource, object obj, string method, string msg) {
 		}
 
+		[Conditional ("TRACE")]
+		internal static void PrintInfo(TraceSource traceSource, object obj, string msg) {
+		}
+
+		[Conditional ("TRACE")]
+		internal static void PrintInfo(TraceSource traceSource, string msg) {
+		}
+
+		[Conditional ("TRACE")]
 		internal static void PrintWarning(TraceSource traceSource, object obj, string method, string msg) {
 		}
+
+		[Conditional ("TRACE")]
+		internal static void PrintWarning(TraceSource traceSource, string msg) {
+		}
+
+		[Conditional ("TRACE")]
+		internal static void PrintError(TraceSource traceSource, string msg) {
+		}
 	}
 
 #if MOBILE
diff --git a/mcs/class/System/ReferenceSources/NativeMethods.cs b/mcs/class/System/ReferenceSources/NativeMethods.cs
index ca41ea97acc..d2386472e08 100644
--- a/mcs/class/System/ReferenceSources/NativeMethods.cs
+++ b/mcs/class/System/ReferenceSources/NativeMethods.cs
@@ -38,6 +38,15 @@ namespace Microsoft.Win32
 		public const int WAIT_ABANDONED   = 0x00000080;
 		public const int WAIT_ABANDONED_0 = WAIT_ABANDONED;
 
+		public const int ERROR_FILE_NOT_FOUND = 2;
+		public const int ERROR_PATH_NOT_FOUND = 3;
+		public const int ERROR_ACCESS_DENIED = 5;
+		public const int ERROR_INVALID_HANDLE = 6;
+		public const int ERROR_SHARING_VIOLATION = 32;
+		public const int ERROR_INVALID_NAME = 0x7B;
+		public const int ERROR_ALREADY_EXISTS = 183;
+		public const int ERROR_FILENAME_EXCED_RANGE = 0xCE;
+
 		public static bool DuplicateHandle(HandleRef hSourceProcessHandle, SafeHandle hSourceHandle, HandleRef hTargetProcess,
 			out SafeWaitHandle targetHandle, int dwDesiredAccess, bool bInheritHandle, int dwOptions)
 		{
diff --git a/mcs/class/System/ReferenceSources/RequestCacheProtocol.cs b/mcs/class/System/ReferenceSources/RequestCacheProtocol.cs
new file mode 100644
index 00000000000..b9805f3d0c8
--- /dev/null
+++ b/mcs/class/System/ReferenceSources/RequestCacheProtocol.cs
@@ -0,0 +1,10 @@
+namespace System.Net.Cache
+{
+	class RequestCacheProtocol
+	{
+		public RequestCacheProtocol (object arg1, object arg2)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+\ No newline at end of file
diff --git a/mcs/class/System/ReferenceSources/SR2.cs b/mcs/class/System/ReferenceSources/SR2.cs
index 35d8f634c02..cfcd038e9b5 100644
--- a/mcs/class/System/ReferenceSources/SR2.cs
+++ b/mcs/class/System/ReferenceSources/SR2.cs
@@ -3,10 +3,14 @@
 //
 // Copyright 2014 Xamarin Inc
 //
-// Mono-specific additions, which are not in SR.cs.
+// Mono-specific additions, which are not in SR.cs or missing in referencesource
 //
 partial class SR
 {
 	public const string mono_net_io_shutdown = "mono_net_io_shutdown";
 	public const string mono_net_io_renegotiate = "mono_net_io_renegotiate";
+
+	public const string net_log_set_socketoption_reuseport_default_on = "net_log_set_socketoption_reuseport_default_on";
+	public const string net_log_set_socketoption_reuseport_not_supported = "net_log_set_socketoption_reuseport_not_supported";
+	public const string net_log_set_socketoption_reuseport = "net_log_set_socketoption_reuseport";
 }
diff --git a/mcs/class/System/ReferenceSources/SettingsSectionInternal.cs b/mcs/class/System/ReferenceSources/SettingsSectionInternal.cs
index 595c569e6c4..afe34459bbb 100644
--- a/mcs/class/System/ReferenceSources/SettingsSectionInternal.cs
+++ b/mcs/class/System/ReferenceSources/SettingsSectionInternal.cs
@@ -1,3 +1,5 @@
+using System.Net.Security;
+
 namespace System.Net.Configuration {
 	sealed class SettingsSectionInternal
 	{
@@ -15,5 +17,14 @@ namespace System.Net.Configuration {
 #endif
 
 		internal bool HttpListenerUnescapeRequestUrl = true;
+
+
+		internal bool UseNagleAlgorithm { get; set; }
+		internal bool Expect100Continue { get; set; }
+		internal bool CheckCertificateName { get; private set; }
+		internal int DnsRefreshTimeout { get; set; }
+		internal bool EnableDnsRoundRobin { get; set; }
+		internal bool CheckCertificateRevocationList { get; set; }
+		internal EncryptionPolicy EncryptionPolicy { get; private set; }
 	}
 }
diff --git a/mcs/class/System/ReferenceSources/SystemNetworkCredential.cs b/mcs/class/System/ReferenceSources/SystemNetworkCredential.cs
deleted file mode 100644
index 71f87c8899a..00000000000
--- a/mcs/class/System/ReferenceSources/SystemNetworkCredential.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace System.Net {
-    //
-    // Object representing default credentials
-    //
-    internal class SystemNetworkCredential : NetworkCredential {
-        internal static readonly SystemNetworkCredential defaultCredential = new SystemNetworkCredential();
-
-        // We want reference equality to work.  Making this private is a good way to guarantee that.
-        private SystemNetworkCredential() :
-            base(string.Empty, string.Empty, string.Empty) {
-        }
-    }
-}
-\ No newline at end of file
diff --git a/mcs/class/System/ReferenceSources/WebHeaderCollectionType.cs b/mcs/class/System/ReferenceSources/WebHeaderCollectionType.cs
deleted file mode 100644
index fdca1419130..00000000000
--- a/mcs/class/System/ReferenceSources/WebHeaderCollectionType.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace System.Net {
-    internal enum WebHeaderCollectionType : ushort {
-        Unknown,
-        WebRequest,
-        WebResponse,
-        HttpWebRequest,
-        HttpWebResponse,
-        HttpListenerRequest,
-        HttpListenerResponse,
-        FtpWebRequest,
-        FtpWebResponse,
-        FileWebRequest,
-        FileWebResponse,
-    }
-} 
-\ No newline at end of file
diff --git a/mcs/class/System/System-bare-build.csproj b/mcs/class/System/System-bare-build.csproj
deleted file mode 100644
index 58abff9d8cc..00000000000
--- a/mcs/class/System/System-bare-build.csproj
+++ /dev/null
@@ -1,1183 +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>{E474AE8F-9163-4A93-A5E7-D93B56468E32}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,618</NoWarn>
-    <OutputPath>./../../class/lib/build/bare</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,618</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,618</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />
-    <Compile Include="System.CodeDom\CodeComment.cs" />
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDirective.cs" />
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />
-    <Compile Include="System.CodeDom\CodeObject.cs" />
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />
-    <Compile Include="System.CodeDom\CodeStatement.cs" />
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\FieldDirection.cs" />
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />
-    <Compile Include="System.Collections.Generic\ISet.cs" />
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />
-    <Compile Include="System.Collections.Generic\Queue.cs" />
-    <Compile Include="System.Collections.Generic\RBTree.cs" />
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />
-    <Compile Include="System.Collections.Generic\SortedList.cs" />
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />
-    <Compile Include="System.Collections.Generic\Stack.cs" />
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />
-    <Compile Include="System.ComponentModel\BindingList.cs" />
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />
-    <Compile Include="System.ComponentModel\CharConverter.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\Component.cs" />
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />
-    <Compile Include="System.ComponentModel\Container.cs" />
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />
-    <Compile Include="System.ComponentModel\IBindingList.cs" />
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />
-    <Compile Include="System.ComponentModel\IComponent.cs" />
-    <Compile Include="System.ComponentModel\IContainer.cs" />
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />
-    <Compile Include="System.ComponentModel\IListSource.cs" />
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />
-    <Compile Include="System.ComponentModel\INestedSite.cs" />
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />
-    <Compile Include="System.ComponentModel\ISite.cs" />
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />
-    <Compile Include="System.ComponentModel\ITypedList.cs" />
-    <Compile Include="System.ComponentModel\License.cs" />
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />
-    <Compile Include="System.ComponentModel\LicenseException.cs" />
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />
-    <Compile Include="System.ComponentModel\StringConverter.cs" />
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />
-    <Compile Include="System.ComponentModel\WarningException.cs" />
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />
-    <Compile Include="System.Configuration\ConfigHelper.cs" />
-    <Compile Include="System.Configuration\ConfigurationException.cs" />
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
-    <Compile Include="System.Configuration\IdnElement.cs" />
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
-    <Compile Include="System.Configuration\IriParsingElement.cs" />
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />
-    <Compile Include="System.Configuration\SettingAttribute.cs" />
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingElement.cs" />
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />
-    <Compile Include="System.Configuration\SettingsBase.cs" />
-    <Compile Include="System.Configuration\SettingsContext.cs" />
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingsManageability.cs" />
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsProperty.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />
-    <Compile Include="System.Configuration\SettingsProvider.cs" />
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />
-    <Compile Include="System.Configuration\SettingValueElement.cs" />
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />
-    <Compile Include="System.Configuration\SpecialSetting.cs" />
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />
-    <Compile Include="System.Configuration\UriSection.cs" />
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />
-    <Compile Include="System.Diagnostics\CounterSample.cs" />
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />
-    <Compile Include="System.Diagnostics\Debug.cs" />
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />
-    <Compile Include="System.Diagnostics\EventInstance.cs" />
-    <Compile Include="System.Diagnostics\EventLog.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />
-    <Compile Include="System.Diagnostics\ICollectData.cs" />
-    <Compile Include="System.Diagnostics\InstanceData.cs" />
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />
-    <Compile Include="System.Diagnostics\Process.cs" />
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />
-    <Compile Include="System.Diagnostics\Switch.cs" />
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />
-    <Compile Include="System.Diagnostics\ThreadState.cs" />
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />
-    <Compile Include="System.Diagnostics\Trace.cs" />
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />
-    <Compile Include="System.Diagnostics\TraceListener.cs" />
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />
-    <Compile Include="System.Diagnostics\TraceSource.cs" />
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />
-    <Compile Include="System.IO.Compression\GZipStream.cs" />
-    <Compile Include="System.IO.Ports\Handshake.cs" />
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />
-    <Compile Include="System.IO.Ports\Parity.cs" />
-    <Compile Include="System.IO.Ports\SerialData.cs" />
-    <Compile Include="System.IO.Ports\SerialError.cs" />
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialPort.cs" />
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />
-    <Compile Include="System.IO.Ports\StopBits.cs" />
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />
-    <Compile Include="System.IO\DefaultWatcher.cs" />
-    <Compile Include="System.IO\ErrorEventArgs.cs" />
-    <Compile Include="System.IO\ErrorEventHandler.cs" />
-    <Compile Include="System.IO\FAMWatcher.cs" />
-    <Compile Include="System.IO\FileAction.cs" />
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />
-    <Compile Include="System.IO\FileSystemWatcher.cs" />
-    <Compile Include="System.IO\IFileWatcher.cs" />
-    <Compile Include="System.IO\InotifyWatcher.cs" />
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />
-    <Compile Include="System.IO\InvalidDataException.cs" />
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />
-    <Compile Include="System.IO\KeventWatcher.cs" />
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />
-    <Compile Include="System.IO\NotifyFilters.cs" />
-    <Compile Include="System.IO\NullFileWatcher.cs" />
-    <Compile Include="System.IO\RenamedEventArgs.cs" />
-    <Compile Include="System.IO\RenamedEventHandler.cs" />
-    <Compile Include="System.IO\SearchPattern.cs" />
-    <Compile Include="System.IO\WaitForChangedResult.cs" />
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />
-    <Compile Include="System.IO\WindowsWatcher.cs" />
-    <Compile Include="System.Media\AudioData.cs" />
-    <Compile Include="System.Media\AudioDevice.cs" />
-    <Compile Include="System.Media\SoundPlayer.cs" />
-    <Compile Include="System.Media\SystemSound.cs" />
-    <Compile Include="System.Media\SystemSounds.cs" />
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />
-    <Compile Include="System.Net.Mail\AlternateView.cs" />
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />
-    <Compile Include="System.Net.Mail\Attachment.cs" />
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />
-    <Compile Include="System.Net.Mail\MailAddress.cs" />
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />
-    <Compile Include="System.Net.Mail\MailMessage.cs" />
-    <Compile Include="System.Net.Mail\MailPriority.cs" />
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />
-    <Compile Include="System.Net.Mail\SmtpException.cs" />
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />
-    <Compile Include="System.Net.Mime\ContentType.cs" />
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />
-    <Compile Include="System.Net.Sockets\Socket.cs" />
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />
-    <Compile Include="System.Net.Sockets\SocketError.cs" />
-    <Compile Include="System.Net.Sockets\SocketException.cs" />
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />
-    <Compile Include="System.Net.Sockets\SocketType.cs" />
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="System.Net.WebSockets\StreamWebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />
-    <Compile Include="System.Net\Authorization.cs" />
-    <Compile Include="System.Net\BasicClient.cs" />
-    <Compile Include="System.Net\BindIPEndPoint.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ChunkStream.cs" />
-    <Compile Include="System.Net\ConnectionModes.cs" />
-    <Compile Include="System.Net\Cookie.cs" />
-    <Compile Include="System.Net\CookieCollection.cs" />
-    <Compile Include="System.Net\CookieContainer.cs" />
-    <Compile Include="System.Net\CookieException.cs" />
-    <Compile Include="System.Net\CookieParser.cs" />
-    <Compile Include="System.Net\CredentialCache.cs" />
-    <Compile Include="System.Net\DecompressionMethods.cs" />
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />
-    <Compile Include="System.Net\DigestClient.cs" />
-    <Compile Include="System.Net\Dns.cs" />
-    <Compile Include="System.Net\DnsAsyncResult.cs" />
-    <Compile Include="System.Net\DnsEndPoint.cs" />
-    <Compile Include="System.Net\DnsPermission.cs" />
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />
-    <Compile Include="System.Net\EndPoint.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\EndpointPermission.cs" />
-    <Compile Include="System.Net\FileWebRequest.cs" />
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />
-    <Compile Include="System.Net\FileWebResponse.cs" />
-    <Compile Include="System.Net\FtpAsyncResult.cs" />
-    <Compile Include="System.Net\FtpDataStream.cs" />
-    <Compile Include="System.Net\FtpRequestCreator.cs" />
-    <Compile Include="System.Net\FtpStatus.cs" />
-    <Compile Include="System.Net\FtpStatusCode.cs" />
-    <Compile Include="System.Net\FtpWebRequest.cs" />
-    <Compile Include="System.Net\FtpWebResponse.cs" />
-    <Compile Include="System.Net\GlobalProxySelection.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerException.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpRequestCreator.cs" />
-    <Compile Include="System.Net\HttpRequestHeader.cs" />
-    <Compile Include="System.Net\HttpResponseHeader.cs" />
-    <Compile Include="System.Net\HttpStatusCode.cs" />
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />
-    <Compile Include="System.Net\HttpUtility.cs" />
-    <Compile Include="System.Net\HttpVersion.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\IAuthenticationModule.cs" />
-    <Compile Include="System.Net\ICertificatePolicy.cs" />
-    <Compile Include="System.Net\ICredentialLookup.cs" />
-    <Compile Include="System.Net\ICredentialPolicy.cs" />
-    <Compile Include="System.Net\ICredentialsByHost.cs" />
-    <Compile Include="System.Net\IPAddress.cs" />
-    <Compile Include="System.Net\IPEndPoint.cs" />
-    <Compile Include="System.Net\IPHostEntry.cs" />
-    <Compile Include="System.Net\IPv6Address.cs" />
-    <Compile Include="System.Net\IWebConnectionState.cs" />
-    <Compile Include="System.Net\IWebProxy.cs" />
-    <Compile Include="System.Net\IWebProxyScript.cs" />
-    <Compile Include="System.Net\IWebRequestCreate.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\ListenerPrefix.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoHttpDate.cs" />
-    <Compile Include="System.Net\NetConfig.cs" />
-    <Compile Include="System.Net\NetworkAccess.cs" />
-    <Compile Include="System.Net\NetworkCredential.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />
-    <Compile Include="System.Net\ProtocolViolationException.cs" />
-    <Compile Include="System.Net\RequestStream.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\SecurityProtocolType.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\SimpleAsyncResult.cs" />
-    <Compile Include="System.Net\SocketAddress.cs" />
-    <Compile Include="System.Net\SocketPermission.cs" />
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />
-    <Compile Include="System.Net\TransportContext.cs" />
-    <Compile Include="System.Net\TransportType.cs" />
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />
-    <Compile Include="System.Net\WebAsyncResult.cs" />
-    <Compile Include="System.Net\WebClient.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionData.cs" />
-    <Compile Include="System.Net\WebConnectionGroup.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebException.cs" />
-    <Compile Include="System.Net\WebExceptionStatus.cs" />
-    <Compile Include="System.Net\WebHeaderCollection.cs" />
-    <Compile Include="System.Net\WebPermission.cs" />
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />
-    <Compile Include="System.Net\WebProxy.cs" />
-    <Compile Include="System.Net\WebRequest.cs" />
-    <Compile Include="System.Net\WebRequestMethods.cs" />
-    <Compile Include="System.Net\WebResponse.cs" />
-    <Compile Include="System.Net\WebUtility.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\Oid.cs" />
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\category.cs" />
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />
-    <Compile Include="System.Threading\Barrier.cs" />
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />
-    <Compile Include="System.Threading\Semaphore.cs" />
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />
-    <Compile Include="System.Timers\Timer.cs" />
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
-    <Compile Include="System.Windows.Input\ICommand.cs" />
-    <Compile Include="System\DefaultUriParser.cs" />
-    <Compile Include="System\FileStyleUriParser.cs" />
-    <Compile Include="System\FtpStyleUriParser.cs" />
-    <Compile Include="System\GenericUriParser.cs" />
-    <Compile Include="System\GenericUriParserOptions.cs" />
-    <Compile Include="System\GopherStyleUriParser.cs" />
-    <Compile Include="System\HttpStyleUriParser.cs" />
-    <Compile Include="System\IUriData.cs" />
-    <Compile Include="System\LdapStyleUriParser.cs" />
-    <Compile Include="System\NetPipeStyleUriParser.cs" />
-    <Compile Include="System\NetTcpStyleUriParser.cs" />
-    <Compile Include="System\NewsStyleUriParser.cs" />
-    <Compile Include="System\Platform.cs" />
-    <Compile Include="System\SRDescriptionAttribute.cs" />
-    <Compile Include="System\Uri.cs" />
-    <Compile Include="System\UriBuilder.cs" />
-    <Compile Include="System\UriComponents.cs" />
-    <Compile Include="System\UriData.cs" />
-    <Compile Include="System\UriElements.cs" />
-    <Compile Include="System\UriFormat.cs" />
-    <Compile Include="System\UriFormatException.cs" />
-    <Compile Include="System\UriHostNameType.cs" />
-    <Compile Include="System\UriIdnScope.cs" />
-    <Compile Include="System\UriKind.cs" />
-    <Compile Include="System\UriParseComponents.cs" />
-    <Compile Include="System\UriParser.cs" />
-    <Compile Include="System\UriPartial.cs" />
-    <Compile Include="System\UriTypeConverter.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 Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="../corlib/corlib-build.csproj">
-      <Project>{0CAF787F-F70B-4556-987A-67E036CD71C1}</Project>
-      <Name>corlib\corlib-build</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="resources/Asterisk.wav">
-      <LogicalName>Asterisk.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Beep.wav">
-      <LogicalName>Beep.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Exclamation.wav">
-      <LogicalName>Exclamation.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Hand.wav">
-      <LogicalName>Hand.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Question.wav">
-      <LogicalName>Question.wav</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System/System-bare-net_4_x.csproj b/mcs/class/System/System-bare-net_4_x.csproj
index 6151fc93565..e748039ef2b 100644
--- a/mcs/class/System/System-bare-net_4_x.csproj
+++ b/mcs/class/System/System-bare-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x/bare</OutputPath>
+    <IntermediateOutputPath>obj-bare</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -25,7 +28,7 @@
     <DebugType>full</DebugType>
     <NoWarn>1699,618</NoWarn>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -33,7 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699,618</NoWarn>
     <Optimize>true</Optimize>
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME</DefineConstants>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -45,555 +48,671 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayCreateExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayIndexerExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAssignStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttachEventStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgumentCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclaration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclarationCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBaseReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCastExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClause.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClauseCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeChecksumPragma.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeComment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCompileUnit.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConditionStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConstructor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDefaultValueExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateCreateExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateInvokeExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectionExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectiveCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEntryPointMethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEventReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeFieldReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeGotoStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIndexerExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIterationStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLabeledStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLinePragma.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberField.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberMethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberProperty.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodInvokeExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\codemethodreferenceexpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodReturnStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImportCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObjectCreateExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpressionCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePrimitiveExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertyReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertySetValueReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionDirective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRemoveEventStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetCompileUnit.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetTypeMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThisReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThrowExceptionStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTryCatchFinallyStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeConstructor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclaration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclarationCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDelegate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMemberCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeOfExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameterCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableDeclarationStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGeneratorOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerErrorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerParameters.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratedCodeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratorSupport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\IndentTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\LanguageOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\FieldDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\MemberAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\bithelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\debugview.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\iset.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\linkedlist.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\queue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sorteddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedlist.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedset.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedsetdebugview.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\stack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\throwhelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\observablecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\readonlyobservablecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\bitvector32.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\casesensitivestringdictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\collectionsutil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\fixedstringlookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\hybriddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\inotifycollectionchanged.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\iordereddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\listdictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\nameobjectcollectionbase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\namevaluecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\notifycollectionchangedeventargs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\ordereddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringcollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionarywithcomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AmbientValueAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArrayConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArraySubsetEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BackgroundWorker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BaseComponentEditor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\basenumberconverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableSupport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BooleanConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BrowsableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ByteConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CategoryAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CharConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComplexBindingPropertiesAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CompModSwitches.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Component.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentResourceManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Container.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ContainerFilterService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CultureInfoConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CustomTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataErrorsChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectFieldAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeOffsetConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugExtendedPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DecimalConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultBindingPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultEventAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultValueAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DelegatingTypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DescriptionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CheckoutException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CommandID.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransaction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerb.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerbCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContextSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpContextType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentChangeService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentDiscoveryService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentInitializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesigner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerEventService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHost.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHostTransactionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerOptionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDictionaryService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IEventPropertyService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderListService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderProviderService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IHelpService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IInheritanceService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IMenuCommandService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IReferenceService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IResourceService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IRootDesigner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ISelectionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IServiceObjectContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITreeDesigner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDescriptorFilterService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDiscoveryService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\MenuCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\SelectionTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ComponentSerializationService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ContextStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DefaultSerializationProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerSerializerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderHost.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\INameCreationService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\InstanceDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\MemberRelationshipService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\RootDesignerSerializerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\SerializationStore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceCreatorCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceObjectContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardCommands.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardToolWindows.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ToolboxItemAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ViewTechnology.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerCategoryAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibilityAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignOnlyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignTimeVisibleAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DisplayNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoubleConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorBrowsableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EnumConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventHandlerList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExpandableObjectConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtendedPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtenderProvidedPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\FxCopSuppression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\GuidConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingListView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICancelAddNew.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IChangeTracking.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComNativeDescriptorHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComponent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICustomTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IDataErrorInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IEditableObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IExtenderProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IIntellisenseBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IListSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ImmutableObjectAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedSite.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InitializationEventAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyDataErrorInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanged.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanging.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstallerTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstanceCreationEditor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int16Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int32Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int64Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IntSecurity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidAsynchronousStateException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidEnumArgumentException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRaiseItemChangedEvents.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRevertibleChangeTracking.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISite.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitialize.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitializeNotification.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISynchronizeInvoke.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypeDescriptorContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypedList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\License.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseUsageMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicFileLicenseProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListBindableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescription.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescriptionCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LocalizableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LookupBindingPropertiesAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MarshalByValueComponent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextResultHint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MemberDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MergablePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MultilineStringConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NestedContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NullableConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PasswordPropertyTextAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProvidePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReadOnlyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RecommendedAsConfigurableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReferenceConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectEventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectTypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunInstallerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SByteConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SettingsBindableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SingleConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\StringConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SyntaxCheck.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TimeSpanConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverterAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeListConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt16Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt32Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt64Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\WarningException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Debug.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DelimitedListTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DiagnosticsConfiguration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ListenerElementsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SeverityFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceLevels.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceSwitch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Switch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchLevelAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TextWriterTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Trace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceInternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListeners.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\traceutils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\hresults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\invariantcomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\PrivilegedConfigurationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\SecurityUtils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\WeakHashtable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LoggingObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Cache\RequestCachePolicy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookie.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecontainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookieexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\HttpListenerRequestUriBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Internal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\Base64Stream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\Base64WriteStateInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\BaseWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\BufferBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\ClosableStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\ContentDisposition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\ContentType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\DelegatedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\DispositionTypeNames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\EightBitStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\EncodedStreamFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\HeaderCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\IEncodableStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MailBnfHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MailHeaderInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\mediatypenames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeBasePart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeEmbeddedMessagePart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeMultiPart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeMultiPartType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimePart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MultiAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\QEncodedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\QuotedPrintableStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\SmtpDateTime.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\TrackingStringDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\TrackingValidationObjectDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\TransferEncoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\WriteStateInfoBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceStatistics.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\ScopeLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\AuthenticatedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\NegotiateEnumTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\ServicePointManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SocketException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\AddressFamily.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IOControlCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IPPacketInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IPProtectionLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\LingerOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\MulticastOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\NetworkStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\ProtocolFamily.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\ProtocolType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SelectMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketErrors.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketInformationOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketShutdown.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\TransmitFileFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\UdpReceiveResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\webclient.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WebPermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WebUtility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WriteStreamClosedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\UriEnumTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\URIFormatException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\UriHostNameType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\URIPartial.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchTimeoutException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\monitoring\system\diagnosticts\AsyncStreamReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\ElapsedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\Timer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\TimersDescriptionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\interopservices\DefaultParameterValueAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\interopservices\handlecollector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\versioning\FrameworkName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\threading\Barrier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System\compmod\microsoft\win32\safehandles\SafeProcessHandle.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArrayCreateExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArrayIndexerExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAssignStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttachEventStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeArgument.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeArgumentCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeDeclaration.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeDeclarationCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeBaseReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeBinaryOperatorExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeBinaryOperatorType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCastExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCatchClause.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCatchClauseCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeChecksumPragma.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeComment.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCommentStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCommentStatementCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCompileUnit.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeConditionStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeConstructor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDefaultValueExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDelegateCreateExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDelegateInvokeExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDirectionExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDirective.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDirectiveCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeEntryPointMethod.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeEventReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeExpressionCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeExpressionStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeFieldReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeGotoStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeIndexerExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeIterationStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeLabeledStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeLinePragma.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberField.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberMethod.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberProperty.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMethodInvokeExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\codemethodreferenceexpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMethodReturnStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespace.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespaceCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespaceImport.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespaceImportCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeObject.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeObjectCreateExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpressionCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodePrimitiveExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodePropertyReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodePropertySetValueReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeRegionDirective.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeRegionMode.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeRemoveEventStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetCompileUnit.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetTypeMember.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeStatementCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeThisReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeThrowExceptionStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTryCatchFinallyStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeConstructor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeDeclaration.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeDeclarationCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeDelegate.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeMember.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeMemberCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeOfExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeParameter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeParameterCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeReference.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeReferenceCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeVariableDeclarationStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeVariableReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CodeGenerator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CodeGeneratorOptions.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CodeValidator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CompilerError.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CompilerErrorCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CompilerParameters.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\GeneratedCodeAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\GeneratorSupport.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\ICodeCompiler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\ICodeGenerator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\ICodeParser.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\IndentTextWriter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\LanguageOptions.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\FieldDirection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\MemberAttributes.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\bithelper.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\debugview.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\iset.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\linkedlist.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\queue.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sorteddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sortedlist.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sortedset.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sortedsetdebugview.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\stack.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\throwhelper.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\objectmodel\observablecollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\objectmodel\readonlyobservablecollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\bitvector32.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\casesensitivestringdictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\collectionsutil.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\fixedstringlookup.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\hybriddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\inotifycollectionchanged.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\iordereddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\listdictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\nameobjectcollectionbase.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\namevaluecollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\notifycollectionchangedeventargs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\ordereddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\stringcollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\stringdictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\stringdictionarywithcomparer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AddingNewEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AddingNewEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AmbientValueAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ArrayConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ArraySubsetEnumerator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncOperation.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncOperationManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AttributeCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AttributeProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BackgroundWorker.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BaseComponentEditor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\basenumberconverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindableSupport.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindingDirection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindingList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BooleanConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BrowsableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ByteConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CancelEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CancelEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CategoryAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CharConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionChangeAction.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionChangeEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionChangeEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComplexBindingPropertiesAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CompModSwitches.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Component.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComponentCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComponentConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComponentResourceManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Container.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ContainerFilterService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CultureInfoConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CustomTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataErrorsChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectFieldAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectMethodType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DateTimeConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DateTimeOffsetConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugExtendedPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DecimalConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultBindingPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultEventAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultValueAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DelegatingTypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\CheckoutException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\CommandID.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerTransaction.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerVerb.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerVerbCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContext.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContextSerializer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DocumentCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DocumentEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DocumentEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\HelpContextType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\HelpKeywordAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\HelpKeywordType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IComponentChangeService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IComponentDiscoveryService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IComponentInitializer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesigner.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerEventService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerHost.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerHostTransactionState.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerOptionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDictionaryService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IEventPropertyService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IExtenderListService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IExtenderProviderService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IHelpService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IInheritanceService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IMenuCommandService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\InheritanceAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\InheritanceLevel.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IReferenceService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IResourceService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IRootDesigner.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ISelectionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IServiceObjectContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITreeDesigner.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITypeDescriptorFilterService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITypeDiscoveryService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITypeResolutionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\MenuCommand.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\PropertyTabAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\PropertyTabScope.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\SelectionTypes.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ComponentSerializationService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ContextStack.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\DefaultSerializationProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerLoader.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerSerializerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderHost.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\INameCreationService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\InstanceDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\MemberRelationshipService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\RootDesignerSerializerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\SerializationStore.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ServiceCreatorCallback.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ServiceObjectContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\StandardCommands.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\StandardToolWindows.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ToolboxItemAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ViewTechnology.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerCategoryAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibility.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibilityAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignOnlyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignTimeVisibleAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DisplayNameAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoubleConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EditorAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EditorBrowsableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EnumConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EventDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EventDescriptorCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EventHandlerList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ExpandableObjectConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ExtendedPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ExtenderProvidedPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\FxCopSuppression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\GuidConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\HandledEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\HandledEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IBindingList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IBindingListView.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ICancelAddNew.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IChangeTracking.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IComNativeDescriptorHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IComponent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ICustomTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IDataErrorInfo.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IEditableObject.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IExtenderProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IIntellisenseBuilder.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IListSource.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ImmutableObjectAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INestedContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INestedSite.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InitializationEventAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INotifyDataErrorInfo.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanged.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanging.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InstallerTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InstanceCreationEditor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Int16Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Int32Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Int64Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IntSecurity.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InvalidAsynchronousStateException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InvalidEnumArgumentException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IRaiseItemChangedEvents.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IRevertibleChangeTracking.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISite.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISupportInitialize.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISupportInitializeNotification.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISynchronizeInvoke.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ITypeDescriptorContext.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ITypedList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\License.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseContext.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseUsageMode.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicFileLicenseProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListBindableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListChangedType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListSortDescription.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListSortDescriptionCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListSortDirection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LocalizableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LookupBindingPropertiesAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MarshalByValueComponent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MaskedTextProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MaskedTextResultHint.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MemberDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MergablePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MultilineStringConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\NestedContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\NullableConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PasswordPropertyTextAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ProgressChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ProgressChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangingEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangingEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyDescriptorCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ProvidePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReadOnlyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RecommendedAsConfigurableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReferenceConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReflectEventDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReflectPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReflectTypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RefreshEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RefreshEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RunInstallerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SByteConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SettingsBindableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SingleConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\StringConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SyntaxCheck.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TimeSpanConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeConverterAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeListConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\UInt16Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\UInt32Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\UInt64Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\WarningException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\Debug.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\DelimitedListTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\DiagnosticsConfiguration.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\ListenerElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SeverityFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceLevels.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceSwitch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\Switch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchLevelAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TextWriterTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\Trace.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceEventCache.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceEventType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceInternal.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceLevel.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceListeners.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceOptions.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\traceutils.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />
+    <Compile Include="..\referencesource\System\misc\hresults.cs" />
+    <Compile Include="..\referencesource\System\misc\invariantcomparer.cs" />
+    <Compile Include="..\referencesource\System\misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System\misc\SecurityUtils.cs" />
+    <Compile Include="..\referencesource\System\misc\WeakHashtable.cs" />
+    <Compile Include="..\referencesource\System\net\System\_DomainName.cs" />
+    <Compile Include="..\referencesource\System\net\System\_IPv4Address.cs" />
+    <Compile Include="..\referencesource\System\net\System\_IPv6Address.cs" />
+    <Compile Include="..\referencesource\System\net\System\_UncName.cs" />
+    <Compile Include="..\referencesource\System\net\System\_UriSyntax.cs" />
+    <Compile Include="..\referencesource\System\net\System\GenericUriParser.cs" />
+    <Compile Include="..\referencesource\System\net\System\IriHelper.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_Connection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_emptywebproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfoTable.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HTTPDateParse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_IStreams.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LoggingObject.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_NetRes.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_PooledStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_ProxyChain.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_Semaphore.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_TimerThread.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_WebProxyDataBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\AuthenticationScheme.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\AuthenticationSchemeSelector.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Authorization.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCache.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCacheEntry.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCacheManager.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCachePolicy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Configuration\DefaultProxySection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\connectionpool.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookie.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookiecollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookiecontainer.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookieexception.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\CredentialCache.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\DnsEndPoint.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\EndPoint.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\filewebrequest.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\filewebresponse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\FtpStatusCode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\GlobalProxySelection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpListenerException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpListenerRequestUriBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpRequestHeader.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpResponseHeader.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpStatusCode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpVersion.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IAuthenticationModule.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ICertificatePolicy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ICredentials.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ICredentialsByHost.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Internal.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IPAddress.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IPEndPoint.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IPHostEntry.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\iwebproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IWebProxyFinder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IWebRequestCreate.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\Base64Stream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\Base64WriteStateInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\BaseWriter.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\BufferBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\ClosableStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\ContentDisposition.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\ContentType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\DelegatedStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\DispositionTypeNames.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\EightBitStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\EncodedStreamFactory.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\HeaderCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\IEncodableStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MailBnfHelper.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MailHeaderInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\mediatypenames.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeBasePart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeEmbeddedMessagePart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeMultiPart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeMultiPartType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimePart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeWriter.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MultiAsyncResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\QEncodedStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\QuotedPrintableStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\SmtpDateTime.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\TrackingStringDictionary.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\TrackingValidationObjectDictionary.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\TransferEncoding.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\WriteStateInfoBase.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkAccess.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\DuplicateAddressDetectionState.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\GatewayIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\GatewayIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV4Statistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV6Statistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\interfacetype.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPGlobalProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPGlobalStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPStatus.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPv4InterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPv6InterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\MulticastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\MulticastIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkAddressChange.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInformationException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInformationPermission.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInterface.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInterfaceComponent.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\nodetype.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\OperationalStatus.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PhysicalAddress.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\pingexception.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PingOptions.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PingReply.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PrefixOrigin.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\ScopeLevel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SuffixOrigin.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemGatewayIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemMulticastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemTcpConnection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemUnicastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\TcpConnection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\TcpState.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\TcpStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UdpStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ProtocolViolationException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\AuthenticatedStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\NegotiateEnumTypes.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ServicePointManager.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SocketAddress.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SocketException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\AddressFamily.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\IOControlCode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\IPPacketInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\IPProtectionLevel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\LingerOption.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\MulticastOption.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\NetworkStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\ProtocolFamily.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\ProtocolType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SelectMode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketErrors.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketFlags.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketInformationOptions.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketOptionLevel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketShutdown.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TransmitFileFlags.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UdpReceiveResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\TransportContext.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\TransportType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\webclient.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebExceptionStatus.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebHeaderCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebPermission.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\webproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebRequest.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebRequestMethods.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebResponse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebUtility.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WriteStreamClosedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\net\System\URI.cs" />
+    <Compile Include="..\referencesource\System\net\System\uribuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriEnumTypes.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriExt.cs" />
+    <Compile Include="..\referencesource\System\net\System\URIFormatException.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriHelper.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriHostNameType.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriParserTemplates.cs" />
+    <Compile Include="..\referencesource\System\net\System\URIPartial.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriScheme.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexMatchTimeoutException.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\Authentication\ExtendedProtection\TokenBinding.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\cryptography\oid.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\cryptography\x509\x509utils.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\AsyncStreamReader.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\Process.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\ProcessStartInfo.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\processwaithandle.cs" />
+    <Compile Include="..\referencesource\System\services\timers\system\timers\ElapsedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\services\timers\system\timers\Timer.cs" />
+    <Compile Include="..\referencesource\System\services\timers\system\timers\TimersDescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />
+    <Compile Include="..\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />
+    <Compile Include="..\referencesource\System\sys\system\IO\ports\InternalResources.cs" />
+    <Compile Include="..\referencesource\System\sys\system\runtime\interopservices\DefaultParameterValueAttribute.cs" />
+    <Compile Include="..\referencesource\System\sys\system\runtime\interopservices\handlecollector.cs" />
+    <Compile Include="..\referencesource\System\sys\system\runtime\versioning\FrameworkName.cs" />
+    <Compile Include="..\referencesource\System\sys\system\threading\Barrier.cs" />
+    <Compile Include="..\referencesource\System\sys\system\threading\semaphore.cs" />
+    <Compile Include="..\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
@@ -662,12 +781,17 @@
     <Compile Include="ReferenceSources\_SslState.cs" />
     <Compile Include="ReferenceSources\_SslStream.cs" />
     <Compile Include="ReferenceSources\AssertWrapper.cs" />
+    <Compile Include="ReferenceSources\AutoWebProxyScriptEngine.cs" />
     <Compile Include="ReferenceSources\BinaryCompatibility.cs" />
+    <Compile Include="ReferenceSources\CAPI.cs" />
     <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />
+    <Compile Include="ReferenceSources\EnvironmentHelpers.cs" />
+    <Compile Include="ReferenceSources\HttpApi.cs" />
     <Compile Include="ReferenceSources\HttpSysSettings.cs" />
     <Compile Include="ReferenceSources\Internal.cs" />
     <Compile Include="ReferenceSources\Logging.cs" />
     <Compile Include="ReferenceSources\NativeMethods.cs" />
+    <Compile Include="ReferenceSources\RequestCacheProtocol.cs" />
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />
     <Compile Include="ReferenceSources\Socket.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
@@ -677,8 +801,6 @@
     <Compile Include="ReferenceSources\SSPIConfiguration.cs" />
     <Compile Include="ReferenceSources\SSPISafeHandles.cs" />
     <Compile Include="ReferenceSources\SSPIWrapper.cs" />
-    <Compile Include="ReferenceSources\SystemNetworkCredential.cs" />
-    <Compile Include="ReferenceSources\WebHeaderCollectionType.cs" />
     <Compile Include="ReferenceSources\Win32Exception.cs" />
     <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />
     <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />
@@ -917,53 +1039,25 @@
     <Compile Include="System.Net.Mail\SmtpPermission.cs" />
     <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />
     <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />
     <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />
     <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />
     <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />
     <Compile Include="System.Net.NetworkInformation\Ping.cs" />
     <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />
     <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />
     <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />
     <Compile Include="System.Net.Security\EncryptionPolicy.cs" />
     <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />
@@ -993,101 +1087,62 @@
     <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />
     <Compile Include="System.Net.WebSockets\WebSocketState.cs" />
     <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />
-    <Compile Include="System.Net\Authorization.cs" />
     <Compile Include="System.Net\BasicClient.cs" />
     <Compile Include="System.Net\BindIPEndPoint.cs" />
     <Compile Include="System.Net\ChunkedInputStream.cs" />
     <Compile Include="System.Net\ChunkStream.cs" />
-    <Compile Include="System.Net\ConnectionModes.cs" />
-    <Compile Include="System.Net\CredentialCache.cs" />
     <Compile Include="System.Net\DecompressionMethods.cs" />
     <Compile Include="System.Net\DefaultCertificatePolicy.cs" />
     <Compile Include="System.Net\DigestClient.cs" />
     <Compile Include="System.Net\Dns.cs" />
     <Compile Include="System.Net\DnsAsyncResult.cs" />
-    <Compile Include="System.Net\DnsEndPoint.cs" />
     <Compile Include="System.Net\DnsPermission.cs" />
     <Compile Include="System.Net\DnsPermissionAttribute.cs" />
-    <Compile Include="System.Net\EndPoint.cs" />
     <Compile Include="System.Net\EndPointListener.cs" />
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\EndpointPermission.cs" />
-    <Compile Include="System.Net\FileWebRequest.cs" />
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />
-    <Compile Include="System.Net\FileWebResponse.cs" />
     <Compile Include="System.Net\FtpAsyncResult.cs" />
     <Compile Include="System.Net\FtpDataStream.cs" />
     <Compile Include="System.Net\FtpRequestCreator.cs" />
     <Compile Include="System.Net\FtpStatus.cs" />
-    <Compile Include="System.Net\FtpStatusCode.cs" />
     <Compile Include="System.Net\FtpWebRequest.cs" />
     <Compile Include="System.Net\FtpWebResponse.cs" />
-    <Compile Include="System.Net\GlobalProxySelection.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
     <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerException.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
     <Compile Include="System.Net\HttpListenerRequest.cs" />
     <Compile Include="System.Net\HttpListenerResponse.cs" />
     <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
     <Compile Include="System.Net\HttpRequestCreator.cs" />
-    <Compile Include="System.Net\HttpRequestHeader.cs" />
-    <Compile Include="System.Net\HttpResponseHeader.cs" />
-    <Compile Include="System.Net\HttpStatusCode.cs" />
     <Compile Include="System.Net\HttpStreamAsyncResult.cs" />
-    <Compile Include="System.Net\HttpVersion.cs" />
     <Compile Include="System.Net\HttpWebRequest.cs" />
     <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\IAuthenticationModule.cs" />
-    <Compile Include="System.Net\ICertificatePolicy.cs" />
-    <Compile Include="System.Net\ICredentialLookup.cs" />
     <Compile Include="System.Net\ICredentialPolicy.cs" />
-    <Compile Include="System.Net\ICredentialsByHost.cs" />
-    <Compile Include="System.Net\IPAddress.cs" />
-    <Compile Include="System.Net\IPEndPoint.cs" />
-    <Compile Include="System.Net\IPHostEntry.cs" />
     <Compile Include="System.Net\IPv6Address.cs" />
     <Compile Include="System.Net\IWebConnectionState.cs" />
-    <Compile Include="System.Net\IWebProxy.cs" />
     <Compile Include="System.Net\IWebProxyScript.cs" />
-    <Compile Include="System.Net\IWebRequestCreate.cs" />
     <Compile Include="System.Net\ListenerAsyncResult.cs" />
     <Compile Include="System.Net\ListenerPrefix.cs" />
     <Compile Include="System.Net\MacProxy.cs" />
     <Compile Include="System.Net\MonoHttpDate.cs" />
     <Compile Include="System.Net\NetConfig.cs" />
-    <Compile Include="System.Net\NetworkAccess.cs" />
     <Compile Include="System.Net\NetworkCredential.cs" />
     <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ProtocolViolationException.cs" />
     <Compile Include="System.Net\RequestStream.cs" />
     <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\SecurityProtocolType.cs" />
     <Compile Include="System.Net\ServicePoint.cs" />
     <Compile Include="System.Net\ServicePointManager.cs" />
     <Compile Include="System.Net\ServicePointManager.extra.cs" />
     <Compile Include="System.Net\SimpleAsyncResult.cs" />
-    <Compile Include="System.Net\SocketAddress.cs" />
     <Compile Include="System.Net\SocketPermission.cs" />
     <Compile Include="System.Net\SocketPermissionAttribute.cs" />
-    <Compile Include="System.Net\TransportContext.cs" />
-    <Compile Include="System.Net\TransportType.cs" />
     <Compile Include="System.Net\WebAsyncResult.cs" />
     <Compile Include="System.Net\WebConnection.cs" />
     <Compile Include="System.Net\WebConnectionData.cs" />
     <Compile Include="System.Net\WebConnectionGroup.cs" />
     <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebException.cs" />
-    <Compile Include="System.Net\WebExceptionStatus.cs" />
-    <Compile Include="System.Net\WebHeaderCollection.cs" />
-    <Compile Include="System.Net\WebProxy.cs" />
-    <Compile Include="System.Net\WebRequest.cs" />
-    <Compile Include="System.Net\WebRequestMethods.cs" />
-    <Compile Include="System.Net\WebResponse.cs" />
     <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />
     <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />
     <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />
@@ -1132,11 +1187,15 @@
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Impl.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2ImplMono.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainImpl.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainImplMono.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />
@@ -1145,6 +1204,7 @@
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509Helper2.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />
@@ -1158,17 +1218,12 @@
     <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />
     <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />
     <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\Oid.cs" />
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\OidGroup.cs" />
     <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
     <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />
     <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />
     <Compile Include="System.Security.Permissions\StorePermission.cs" />
     <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />
     <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />
-    <Compile Include="System.Threading\Semaphore.cs" />
     <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />
     <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />
     <Compile Include="System.Timers\ElapsedEventArgs.cs" />
@@ -1176,28 +1231,9 @@
     <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />
     <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
     <Compile Include="System.Windows.Input\ICommand.cs" />
-    <Compile Include="System\DefaultUriParser.cs" />
-    <Compile Include="System\FileStyleUriParser.cs" />
-    <Compile Include="System\FtpStyleUriParser.cs" />
-    <Compile Include="System\GenericUriParser.cs" />
-    <Compile Include="System\GenericUriParserOptions.cs" />
-    <Compile Include="System\GopherStyleUriParser.cs" />
-    <Compile Include="System\HttpStyleUriParser.cs" />
     <Compile Include="System\IOSelector.cs" />
-    <Compile Include="System\IUriData.cs" />
-    <Compile Include="System\LdapStyleUriParser.cs" />
-    <Compile Include="System\NetPipeStyleUriParser.cs" />
-    <Compile Include="System\NetTcpStyleUriParser.cs" />
-    <Compile Include="System\NewsStyleUriParser.cs" />
     <Compile Include="System\Platform.cs" />
     <Compile Include="System\SRDescriptionAttribute.cs" />
-    <Compile Include="System\Uri.cs" />
-    <Compile Include="System\UriBuilder.cs" />
-    <Compile Include="System\UriData.cs" />
-    <Compile Include="System\UriElements.cs" />
-    <Compile Include="System\UriHelper.cs" />
-    <Compile Include="System\UriParseComponents.cs" />
-    <Compile Include="System\UriParser.cs" />
     <Compile Include="System\UriTypeConverter.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.
@@ -1207,15 +1243,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/System/System-basic.csproj b/mcs/class/System/System-basic.csproj
deleted file mode 100644
index 0fbbcc67a65..00000000000
--- a/mcs/class/System/System-basic.csproj
+++ /dev/null
@@ -1,1192 +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>{808F7F56-308D-4978-8A44-A971BDADA3F6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,618</NoWarn>
-    <OutputPath>./../../class/lib/basic</OutputPath>
-    <NoStdLib>False</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,618</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;BOOTSTRAP_BASIC;CONFIGURATION_2_0;XML_DEP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,618</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;BOOTSTRAP_BASIC;CONFIGURATION_2_0;XML_DEP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="..\corlib\Mono\DataConverter.cs" />
-    <Compile Include="..\corlib\System.Collections.Generic\CollectionDebuggerView.cs" />
-    <Compile Include="..\corlib\System.Collections\CollectionDebuggerView.cs" />
-    <Compile Include="..\corlib\System.IO\MonoFileType.cs" />
-    <Compile Include="..\corlib\System.IO\MonoIO.cs" />
-    <Compile Include="..\corlib\System.IO\MonoIOError.cs" />
-    <Compile Include="..\corlib\System.IO\MonoIOStat.cs" />
-    <Compile Include="..\corlib\System.Threading.Tasks\CyclicDeque.cs" />
-    <Compile Include="..\corlib\System.Threading.Tasks\IConcurrentDeque.cs" />
-    <Compile Include="..\corlib\System.Threading.Tasks\PopResult.cs" />
-    <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />
-    <Compile Include="System.CodeDom\CodeComment.cs" />
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDirective.cs" />
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />
-    <Compile Include="System.CodeDom\CodeObject.cs" />
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />
-    <Compile Include="System.CodeDom\CodeStatement.cs" />
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\FieldDirection.cs" />
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />
-    <Compile Include="System.Collections.Generic\ISet.cs" />
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />
-    <Compile Include="System.Collections.Generic\Queue.cs" />
-    <Compile Include="System.Collections.Generic\RBTree.cs" />
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />
-    <Compile Include="System.Collections.Generic\SortedList.cs" />
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />
-    <Compile Include="System.Collections.Generic\Stack.cs" />
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />
-    <Compile Include="System.ComponentModel\BindingList.cs" />
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />
-    <Compile Include="System.ComponentModel\CharConverter.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\Component.cs" />
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />
-    <Compile Include="System.ComponentModel\Container.cs" />
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />
-    <Compile Include="System.ComponentModel\IBindingList.cs" />
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />
-    <Compile Include="System.ComponentModel\IComponent.cs" />
-    <Compile Include="System.ComponentModel\IContainer.cs" />
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />
-    <Compile Include="System.ComponentModel\IListSource.cs" />
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />
-    <Compile Include="System.ComponentModel\INestedSite.cs" />
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />
-    <Compile Include="System.ComponentModel\ISite.cs" />
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />
-    <Compile Include="System.ComponentModel\ITypedList.cs" />
-    <Compile Include="System.ComponentModel\License.cs" />
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />
-    <Compile Include="System.ComponentModel\LicenseException.cs" />
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />
-    <Compile Include="System.ComponentModel\StringConverter.cs" />
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />
-    <Compile Include="System.ComponentModel\WarningException.cs" />
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />
-    <Compile Include="System.Configuration\ConfigHelper.cs" />
-    <Compile Include="System.Configuration\ConfigurationException.cs" />
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
-    <Compile Include="System.Configuration\IdnElement.cs" />
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
-    <Compile Include="System.Configuration\IriParsingElement.cs" />
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />
-    <Compile Include="System.Configuration\SettingAttribute.cs" />
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingElement.cs" />
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />
-    <Compile Include="System.Configuration\SettingsBase.cs" />
-    <Compile Include="System.Configuration\SettingsContext.cs" />
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingsManageability.cs" />
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsProperty.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />
-    <Compile Include="System.Configuration\SettingsProvider.cs" />
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />
-    <Compile Include="System.Configuration\SettingValueElement.cs" />
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />
-    <Compile Include="System.Configuration\SpecialSetting.cs" />
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />
-    <Compile Include="System.Configuration\UriSection.cs" />
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />
-    <Compile Include="System.Diagnostics\CounterSample.cs" />
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />
-    <Compile Include="System.Diagnostics\Debug.cs" />
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />
-    <Compile Include="System.Diagnostics\EventInstance.cs" />
-    <Compile Include="System.Diagnostics\EventLog.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />
-    <Compile Include="System.Diagnostics\ICollectData.cs" />
-    <Compile Include="System.Diagnostics\InstanceData.cs" />
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />
-    <Compile Include="System.Diagnostics\Process.cs" />
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />
-    <Compile Include="System.Diagnostics\Switch.cs" />
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />
-    <Compile Include="System.Diagnostics\ThreadState.cs" />
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />
-    <Compile Include="System.Diagnostics\Trace.cs" />
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />
-    <Compile Include="System.Diagnostics\TraceListener.cs" />
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />
-    <Compile Include="System.Diagnostics\TraceSource.cs" />
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />
-    <Compile Include="System.IO.Compression\GZipStream.cs" />
-    <Compile Include="System.IO.Ports\Handshake.cs" />
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />
-    <Compile Include="System.IO.Ports\Parity.cs" />
-    <Compile Include="System.IO.Ports\SerialData.cs" />
-    <Compile Include="System.IO.Ports\SerialError.cs" />
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialPort.cs" />
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />
-    <Compile Include="System.IO.Ports\StopBits.cs" />
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />
-    <Compile Include="System.IO\DefaultWatcher.cs" />
-    <Compile Include="System.IO\ErrorEventArgs.cs" />
-    <Compile Include="System.IO\ErrorEventHandler.cs" />
-    <Compile Include="System.IO\FAMWatcher.cs" />
-    <Compile Include="System.IO\FileAction.cs" />
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />
-    <Compile Include="System.IO\FileSystemWatcher.cs" />
-    <Compile Include="System.IO\IFileWatcher.cs" />
-    <Compile Include="System.IO\InotifyWatcher.cs" />
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />
-    <Compile Include="System.IO\InvalidDataException.cs" />
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />
-    <Compile Include="System.IO\KeventWatcher.cs" />
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />
-    <Compile Include="System.IO\NotifyFilters.cs" />
-    <Compile Include="System.IO\NullFileWatcher.cs" />
-    <Compile Include="System.IO\RenamedEventArgs.cs" />
-    <Compile Include="System.IO\RenamedEventHandler.cs" />
-    <Compile Include="System.IO\SearchPattern.cs" />
-    <Compile Include="System.IO\WaitForChangedResult.cs" />
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />
-    <Compile Include="System.IO\WindowsWatcher.cs" />
-    <Compile Include="System.Media\AudioData.cs" />
-    <Compile Include="System.Media\AudioDevice.cs" />
-    <Compile Include="System.Media\SoundPlayer.cs" />
-    <Compile Include="System.Media\SystemSound.cs" />
-    <Compile Include="System.Media\SystemSounds.cs" />
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />
-    <Compile Include="System.Net.Mail\AlternateView.cs" />
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />
-    <Compile Include="System.Net.Mail\Attachment.cs" />
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />
-    <Compile Include="System.Net.Mail\MailAddress.cs" />
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />
-    <Compile Include="System.Net.Mail\MailMessage.cs" />
-    <Compile Include="System.Net.Mail\MailPriority.cs" />
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />
-    <Compile Include="System.Net.Mail\SmtpException.cs" />
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />
-    <Compile Include="System.Net.Mime\ContentType.cs" />
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />
-    <Compile Include="System.Net.Sockets\Socket.cs" />
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />
-    <Compile Include="System.Net.Sockets\SocketError.cs" />
-    <Compile Include="System.Net.Sockets\SocketException.cs" />
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />
-    <Compile Include="System.Net.Sockets\SocketType.cs" />
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />
-    <Compile Include="System.Net\Authorization.cs" />
-    <Compile Include="System.Net\BasicClient.cs" />
-    <Compile Include="System.Net\BindIPEndPoint.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ChunkStream.cs" />
-    <Compile Include="System.Net\ConnectionModes.cs" />
-    <Compile Include="System.Net\Cookie.cs" />
-    <Compile Include="System.Net\CookieCollection.cs" />
-    <Compile Include="System.Net\CookieContainer.cs" />
-    <Compile Include="System.Net\CookieException.cs" />
-    <Compile Include="System.Net\CookieParser.cs" />
-    <Compile Include="System.Net\CredentialCache.cs" />
-    <Compile Include="System.Net\DecompressionMethods.cs" />
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />
-    <Compile Include="System.Net\DigestClient.cs" />
-    <Compile Include="System.Net\Dns.cs" />
-    <Compile Include="System.Net\DnsAsyncResult.cs" />
-    <Compile Include="System.Net\DnsEndPoint.cs" />
-    <Compile Include="System.Net\DnsPermission.cs" />
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />
-    <Compile Include="System.Net\EndPoint.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\EndpointPermission.cs" />
-    <Compile Include="System.Net\FileWebRequest.cs" />
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />
-    <Compile Include="System.Net\FileWebResponse.cs" />
-    <Compile Include="System.Net\FtpAsyncResult.cs" />
-    <Compile Include="System.Net\FtpDataStream.cs" />
-    <Compile Include="System.Net\FtpRequestCreator.cs" />
-    <Compile Include="System.Net\FtpStatus.cs" />
-    <Compile Include="System.Net\FtpStatusCode.cs" />
-    <Compile Include="System.Net\FtpWebRequest.cs" />
-    <Compile Include="System.Net\FtpWebResponse.cs" />
-    <Compile Include="System.Net\GlobalProxySelection.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerException.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpRequestCreator.cs" />
-    <Compile Include="System.Net\HttpRequestHeader.cs" />
-    <Compile Include="System.Net\HttpResponseHeader.cs" />
-    <Compile Include="System.Net\HttpStatusCode.cs" />
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />
-    <Compile Include="System.Net\HttpUtility.cs" />
-    <Compile Include="System.Net\HttpVersion.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\IAuthenticationModule.cs" />
-    <Compile Include="System.Net\ICertificatePolicy.cs" />
-    <Compile Include="System.Net\ICredentialLookup.cs" />
-    <Compile Include="System.Net\ICredentialPolicy.cs" />
-    <Compile Include="System.Net\ICredentialsByHost.cs" />
-    <Compile Include="System.Net\IPAddress.cs" />
-    <Compile Include="System.Net\IPEndPoint.cs" />
-    <Compile Include="System.Net\IPHostEntry.cs" />
-    <Compile Include="System.Net\IPv6Address.cs" />
-    <Compile Include="System.Net\IWebConnectionState.cs" />
-    <Compile Include="System.Net\IWebProxy.cs" />
-    <Compile Include="System.Net\IWebProxyScript.cs" />
-    <Compile Include="System.Net\IWebRequestCreate.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\ListenerPrefix.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoHttpDate.cs" />
-    <Compile Include="System.Net\NetConfig.cs" />
-    <Compile Include="System.Net\NetworkAccess.cs" />
-    <Compile Include="System.Net\NetworkCredential.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />
-    <Compile Include="System.Net\ProtocolViolationException.cs" />
-    <Compile Include="System.Net\RequestStream.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\SecurityProtocolType.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\SocketAddress.cs" />
-    <Compile Include="System.Net\SocketPermission.cs" />
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />
-    <Compile Include="System.Net\TransportContext.cs" />
-    <Compile Include="System.Net\TransportType.cs" />
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />
-    <Compile Include="System.Net\WebAsyncResult.cs" />
-    <Compile Include="System.Net\WebClient.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionData.cs" />
-    <Compile Include="System.Net\WebConnectionGroup.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebException.cs" />
-    <Compile Include="System.Net\WebExceptionStatus.cs" />
-    <Compile Include="System.Net\WebHeaderCollection.cs" />
-    <Compile Include="System.Net\WebPermission.cs" />
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />
-    <Compile Include="System.Net\WebProxy.cs" />
-    <Compile Include="System.Net\WebRequest.cs" />
-    <Compile Include="System.Net\WebRequestMethods.cs" />
-    <Compile Include="System.Net\WebResponse.cs" />
-    <Compile Include="System.Net\WebUtility.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\Oid.cs" />
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\category.cs" />
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />
-    <Compile Include="System.Threading\Barrier.cs" />
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />
-    <Compile Include="System.Threading\Semaphore.cs" />
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />
-    <Compile Include="System.Timers\Timer.cs" />
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
-    <Compile Include="System.Windows.Input\ICommand.cs" />
-    <Compile Include="System\DefaultUriParser.cs" />
-    <Compile Include="System\FileStyleUriParser.cs" />
-    <Compile Include="System\FtpStyleUriParser.cs" />
-    <Compile Include="System\GenericUriParser.cs" />
-    <Compile Include="System\GenericUriParserOptions.cs" />
-    <Compile Include="System\GopherStyleUriParser.cs" />
-    <Compile Include="System\HttpStyleUriParser.cs" />
-    <Compile Include="System\IUriData.cs" />
-    <Compile Include="System\LdapStyleUriParser.cs" />
-    <Compile Include="System\NetPipeStyleUriParser.cs" />
-    <Compile Include="System\NetTcpStyleUriParser.cs" />
-    <Compile Include="System\NewsStyleUriParser.cs" />
-    <Compile Include="System\Platform.cs" />
-    <Compile Include="System\SRDescriptionAttribute.cs" />
-    <Compile Include="System\Uri.cs" />
-    <Compile Include="System\UriBuilder.cs" />
-    <Compile Include="System\UriComponents.cs" />
-    <Compile Include="System\UriData.cs" />
-    <Compile Include="System\UriElements.cs" />
-    <Compile Include="System\UriFormat.cs" />
-    <Compile Include="System\UriFormatException.cs" />
-    <Compile Include="System\UriHostNameType.cs" />
-    <Compile Include="System\UriIdnScope.cs" />
-    <Compile Include="System\UriKind.cs" />
-    <Compile Include="System\UriParseComponents.cs" />
-    <Compile Include="System\UriParser.cs" />
-    <Compile Include="System\UriPartial.cs" />
-    <Compile Include="System\UriTypeConverter.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="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="resources/Asterisk.wav">
-      <LogicalName>Asterisk.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Beep.wav">
-      <LogicalName>Beep.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Exclamation.wav">
-      <LogicalName>Exclamation.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Hand.wav">
-      <LogicalName>Hand.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Question.wav">
-      <LogicalName>Question.wav</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System/System-build.csproj b/mcs/class/System/System-build.csproj
deleted file mode 100644
index 07f879e8a57..00000000000
--- a/mcs/class/System/System-build.csproj
+++ /dev/null
@@ -1,1181 +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>{78CDD7C1-0524-4A2A-BAA6-2A05CCD7116C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,618</NoWarn>
-    <OutputPath>./../../class/lib/build</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,618</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0;XML_DEP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,618</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0;XML_DEP</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="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />
-    <Compile Include="System.CodeDom\CodeComment.cs" />
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDirective.cs" />
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />
-    <Compile Include="System.CodeDom\CodeObject.cs" />
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />
-    <Compile Include="System.CodeDom\CodeStatement.cs" />
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\FieldDirection.cs" />
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />
-    <Compile Include="System.Collections.Generic\ISet.cs" />
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />
-    <Compile Include="System.Collections.Generic\Queue.cs" />
-    <Compile Include="System.Collections.Generic\RBTree.cs" />
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />
-    <Compile Include="System.Collections.Generic\SortedList.cs" />
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />
-    <Compile Include="System.Collections.Generic\Stack.cs" />
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />
-    <Compile Include="System.ComponentModel\BindingList.cs" />
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />
-    <Compile Include="System.ComponentModel\CharConverter.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\Component.cs" />
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />
-    <Compile Include="System.ComponentModel\Container.cs" />
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />
-    <Compile Include="System.ComponentModel\IBindingList.cs" />
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />
-    <Compile Include="System.ComponentModel\IComponent.cs" />
-    <Compile Include="System.ComponentModel\IContainer.cs" />
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />
-    <Compile Include="System.ComponentModel\IListSource.cs" />
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />
-    <Compile Include="System.ComponentModel\INestedSite.cs" />
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />
-    <Compile Include="System.ComponentModel\ISite.cs" />
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />
-    <Compile Include="System.ComponentModel\ITypedList.cs" />
-    <Compile Include="System.ComponentModel\License.cs" />
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />
-    <Compile Include="System.ComponentModel\LicenseException.cs" />
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />
-    <Compile Include="System.ComponentModel\StringConverter.cs" />
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />
-    <Compile Include="System.ComponentModel\WarningException.cs" />
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />
-    <Compile Include="System.Configuration\ConfigHelper.cs" />
-    <Compile Include="System.Configuration\ConfigurationException.cs" />
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
-    <Compile Include="System.Configuration\IdnElement.cs" />
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
-    <Compile Include="System.Configuration\IriParsingElement.cs" />
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />
-    <Compile Include="System.Configuration\SettingAttribute.cs" />
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingElement.cs" />
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />
-    <Compile Include="System.Configuration\SettingsBase.cs" />
-    <Compile Include="System.Configuration\SettingsContext.cs" />
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingsManageability.cs" />
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsProperty.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />
-    <Compile Include="System.Configuration\SettingsProvider.cs" />
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />
-    <Compile Include="System.Configuration\SettingValueElement.cs" />
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />
-    <Compile Include="System.Configuration\SpecialSetting.cs" />
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />
-    <Compile Include="System.Configuration\UriSection.cs" />
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />
-    <Compile Include="System.Diagnostics\CounterSample.cs" />
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />
-    <Compile Include="System.Diagnostics\Debug.cs" />
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />
-    <Compile Include="System.Diagnostics\EventInstance.cs" />
-    <Compile Include="System.Diagnostics\EventLog.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />
-    <Compile Include="System.Diagnostics\ICollectData.cs" />
-    <Compile Include="System.Diagnostics\InstanceData.cs" />
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />
-    <Compile Include="System.Diagnostics\Process.cs" />
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />
-    <Compile Include="System.Diagnostics\Switch.cs" />
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />
-    <Compile Include="System.Diagnostics\ThreadState.cs" />
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />
-    <Compile Include="System.Diagnostics\Trace.cs" />
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />
-    <Compile Include="System.Diagnostics\TraceListener.cs" />
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />
-    <Compile Include="System.Diagnostics\TraceSource.cs" />
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />
-    <Compile Include="System.IO.Compression\GZipStream.cs" />
-    <Compile Include="System.IO.Ports\Handshake.cs" />
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />
-    <Compile Include="System.IO.Ports\Parity.cs" />
-    <Compile Include="System.IO.Ports\SerialData.cs" />
-    <Compile Include="System.IO.Ports\SerialError.cs" />
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialPort.cs" />
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />
-    <Compile Include="System.IO.Ports\StopBits.cs" />
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />
-    <Compile Include="System.IO\DefaultWatcher.cs" />
-    <Compile Include="System.IO\ErrorEventArgs.cs" />
-    <Compile Include="System.IO\ErrorEventHandler.cs" />
-    <Compile Include="System.IO\FAMWatcher.cs" />
-    <Compile Include="System.IO\FileAction.cs" />
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />
-    <Compile Include="System.IO\FileSystemWatcher.cs" />
-    <Compile Include="System.IO\IFileWatcher.cs" />
-    <Compile Include="System.IO\InotifyWatcher.cs" />
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />
-    <Compile Include="System.IO\InvalidDataException.cs" />
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />
-    <Compile Include="System.IO\KeventWatcher.cs" />
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />
-    <Compile Include="System.IO\NotifyFilters.cs" />
-    <Compile Include="System.IO\NullFileWatcher.cs" />
-    <Compile Include="System.IO\RenamedEventArgs.cs" />
-    <Compile Include="System.IO\RenamedEventHandler.cs" />
-    <Compile Include="System.IO\SearchPattern.cs" />
-    <Compile Include="System.IO\WaitForChangedResult.cs" />
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />
-    <Compile Include="System.IO\WindowsWatcher.cs" />
-    <Compile Include="System.Media\AudioData.cs" />
-    <Compile Include="System.Media\AudioDevice.cs" />
-    <Compile Include="System.Media\SoundPlayer.cs" />
-    <Compile Include="System.Media\SystemSound.cs" />
-    <Compile Include="System.Media\SystemSounds.cs" />
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />
-    <Compile Include="System.Net.Mail\AlternateView.cs" />
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />
-    <Compile Include="System.Net.Mail\Attachment.cs" />
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />
-    <Compile Include="System.Net.Mail\MailAddress.cs" />
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />
-    <Compile Include="System.Net.Mail\MailMessage.cs" />
-    <Compile Include="System.Net.Mail\MailPriority.cs" />
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />
-    <Compile Include="System.Net.Mail\SmtpException.cs" />
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />
-    <Compile Include="System.Net.Mime\ContentType.cs" />
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />
-    <Compile Include="System.Net.Sockets\Socket.cs" />
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />
-    <Compile Include="System.Net.Sockets\SocketError.cs" />
-    <Compile Include="System.Net.Sockets\SocketException.cs" />
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />
-    <Compile Include="System.Net.Sockets\SocketType.cs" />
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />
-    <Compile Include="System.Net\Authorization.cs" />
-    <Compile Include="System.Net\BasicClient.cs" />
-    <Compile Include="System.Net\BindIPEndPoint.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ChunkStream.cs" />
-    <Compile Include="System.Net\ConnectionModes.cs" />
-    <Compile Include="System.Net\Cookie.cs" />
-    <Compile Include="System.Net\CookieCollection.cs" />
-    <Compile Include="System.Net\CookieContainer.cs" />
-    <Compile Include="System.Net\CookieException.cs" />
-    <Compile Include="System.Net\CookieParser.cs" />
-    <Compile Include="System.Net\CredentialCache.cs" />
-    <Compile Include="System.Net\DecompressionMethods.cs" />
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />
-    <Compile Include="System.Net\DigestClient.cs" />
-    <Compile Include="System.Net\Dns.cs" />
-    <Compile Include="System.Net\DnsAsyncResult.cs" />
-    <Compile Include="System.Net\DnsEndPoint.cs" />
-    <Compile Include="System.Net\DnsPermission.cs" />
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />
-    <Compile Include="System.Net\EndPoint.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\EndpointPermission.cs" />
-    <Compile Include="System.Net\FileWebRequest.cs" />
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />
-    <Compile Include="System.Net\FileWebResponse.cs" />
-    <Compile Include="System.Net\FtpAsyncResult.cs" />
-    <Compile Include="System.Net\FtpDataStream.cs" />
-    <Compile Include="System.Net\FtpRequestCreator.cs" />
-    <Compile Include="System.Net\FtpStatus.cs" />
-    <Compile Include="System.Net\FtpStatusCode.cs" />
-    <Compile Include="System.Net\FtpWebRequest.cs" />
-    <Compile Include="System.Net\FtpWebResponse.cs" />
-    <Compile Include="System.Net\GlobalProxySelection.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerException.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpRequestCreator.cs" />
-    <Compile Include="System.Net\HttpRequestHeader.cs" />
-    <Compile Include="System.Net\HttpResponseHeader.cs" />
-    <Compile Include="System.Net\HttpStatusCode.cs" />
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />
-    <Compile Include="System.Net\HttpUtility.cs" />
-    <Compile Include="System.Net\HttpVersion.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\IAuthenticationModule.cs" />
-    <Compile Include="System.Net\ICertificatePolicy.cs" />
-    <Compile Include="System.Net\ICredentialLookup.cs" />
-    <Compile Include="System.Net\ICredentialPolicy.cs" />
-    <Compile Include="System.Net\ICredentialsByHost.cs" />
-    <Compile Include="System.Net\IPAddress.cs" />
-    <Compile Include="System.Net\IPEndPoint.cs" />
-    <Compile Include="System.Net\IPHostEntry.cs" />
-    <Compile Include="System.Net\IPv6Address.cs" />
-    <Compile Include="System.Net\IWebConnectionState.cs" />
-    <Compile Include="System.Net\IWebProxy.cs" />
-    <Compile Include="System.Net\IWebProxyScript.cs" />
-    <Compile Include="System.Net\IWebRequestCreate.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\ListenerPrefix.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoHttpDate.cs" />
-    <Compile Include="System.Net\NetConfig.cs" />
-    <Compile Include="System.Net\NetworkAccess.cs" />
-    <Compile Include="System.Net\NetworkCredential.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />
-    <Compile Include="System.Net\ProtocolViolationException.cs" />
-    <Compile Include="System.Net\RequestStream.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\SecurityProtocolType.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\SocketAddress.cs" />
-    <Compile Include="System.Net\SocketPermission.cs" />
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />
-    <Compile Include="System.Net\TransportContext.cs" />
-    <Compile Include="System.Net\TransportType.cs" />
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />
-    <Compile Include="System.Net\WebAsyncResult.cs" />
-    <Compile Include="System.Net\WebClient.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionData.cs" />
-    <Compile Include="System.Net\WebConnectionGroup.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebException.cs" />
-    <Compile Include="System.Net\WebExceptionStatus.cs" />
-    <Compile Include="System.Net\WebHeaderCollection.cs" />
-    <Compile Include="System.Net\WebPermission.cs" />
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />
-    <Compile Include="System.Net\WebProxy.cs" />
-    <Compile Include="System.Net\WebRequest.cs" />
-    <Compile Include="System.Net\WebRequestMethods.cs" />
-    <Compile Include="System.Net\WebResponse.cs" />
-    <Compile Include="System.Net\WebUtility.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\Oid.cs" />
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\category.cs" />
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />
-    <Compile Include="System.Threading\Barrier.cs" />
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />
-    <Compile Include="System.Threading\Semaphore.cs" />
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />
-    <Compile Include="System.Timers\Timer.cs" />
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
-    <Compile Include="System.Windows.Input\ICommand.cs" />
-    <Compile Include="System\DefaultUriParser.cs" />
-    <Compile Include="System\FileStyleUriParser.cs" />
-    <Compile Include="System\FtpStyleUriParser.cs" />
-    <Compile Include="System\GenericUriParser.cs" />
-    <Compile Include="System\GenericUriParserOptions.cs" />
-    <Compile Include="System\GopherStyleUriParser.cs" />
-    <Compile Include="System\HttpStyleUriParser.cs" />
-    <Compile Include="System\IUriData.cs" />
-    <Compile Include="System\LdapStyleUriParser.cs" />
-    <Compile Include="System\NetPipeStyleUriParser.cs" />
-    <Compile Include="System\NetTcpStyleUriParser.cs" />
-    <Compile Include="System\NewsStyleUriParser.cs" />
-    <Compile Include="System\Platform.cs" />
-    <Compile Include="System\SRDescriptionAttribute.cs" />
-    <Compile Include="System\Uri.cs" />
-    <Compile Include="System\UriBuilder.cs" />
-    <Compile Include="System\UriComponents.cs" />
-    <Compile Include="System\UriData.cs" />
-    <Compile Include="System\UriElements.cs" />
-    <Compile Include="System\UriFormat.cs" />
-    <Compile Include="System\UriFormatException.cs" />
-    <Compile Include="System\UriHostNameType.cs" />
-    <Compile Include="System\UriIdnScope.cs" />
-    <Compile Include="System\UriKind.cs" />
-    <Compile Include="System\UriParseComponents.cs" />
-    <Compile Include="System\UriParser.cs" />
-    <Compile Include="System\UriPartial.cs" />
-    <Compile Include="System\UriTypeConverter.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-build.csproj">
-      <Project>{2BDF80D1-6F06-4908-B351-835292B7A9B9}</Project>
-      <Name>corlib\corlib-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.XML\System.Xml-basic.csproj">
-      <Project>{06F3B5C3-F72F-4F26-8479-AA29015E0CCA}</Project>
-      <Name>System.XML\System.Xml-basic</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="resources/Asterisk.wav">
-      <LogicalName>Asterisk.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Beep.wav">
-      <LogicalName>Beep.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Exclamation.wav">
-      <LogicalName>Exclamation.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Hand.wav">
-      <LogicalName>Hand.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Question.wav">
-      <LogicalName>Question.wav</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System/System-net_4_x.csproj b/mcs/class/System/System-net_4_x.csproj
index fe93d680e97..fbd51bbfd99 100644
--- a/mcs/class/System/System-net_4_x.csproj
+++ b/mcs/class/System/System-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -25,7 +28,7 @@
     <DebugType>full</DebugType>
     <NoWarn>1699,618</NoWarn>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;MONO_X509_ALIAS;CONFIGURATION_DEP</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;CONFIGURATION_DEP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -33,7 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699,618</NoWarn>
     <Optimize>true</Optimize>
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;MONO_X509_ALIAS;CONFIGURATION_DEP</DefineConstants>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;CONFIGURATION_DEP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -45,555 +48,671 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayCreateExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayIndexerExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAssignStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttachEventStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgumentCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclaration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclarationCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBaseReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCastExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClause.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClauseCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeChecksumPragma.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeComment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCompileUnit.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConditionStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConstructor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDefaultValueExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateCreateExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateInvokeExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectionExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectiveCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEntryPointMethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEventReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeFieldReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeGotoStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIndexerExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIterationStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLabeledStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLinePragma.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberField.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberMethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberProperty.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodInvokeExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\codemethodreferenceexpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodReturnStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImportCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObjectCreateExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpressionCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePrimitiveExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertyReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertySetValueReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionDirective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRemoveEventStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetCompileUnit.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetTypeMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThisReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThrowExceptionStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTryCatchFinallyStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeConstructor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclaration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclarationCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDelegate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMemberCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeOfExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameterCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableDeclarationStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGeneratorOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerErrorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerParameters.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratedCodeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratorSupport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\IndentTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\LanguageOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\FieldDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\MemberAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\bithelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\debugview.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\iset.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\linkedlist.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\queue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sorteddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedlist.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedset.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedsetdebugview.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\stack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\throwhelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\observablecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\readonlyobservablecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\bitvector32.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\casesensitivestringdictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\collectionsutil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\fixedstringlookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\hybriddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\inotifycollectionchanged.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\iordereddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\listdictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\nameobjectcollectionbase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\namevaluecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\notifycollectionchangedeventargs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\ordereddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringcollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionarywithcomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AmbientValueAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArrayConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArraySubsetEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BackgroundWorker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BaseComponentEditor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\basenumberconverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableSupport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BooleanConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BrowsableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ByteConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CategoryAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CharConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComplexBindingPropertiesAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CompModSwitches.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Component.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentResourceManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Container.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ContainerFilterService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CultureInfoConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CustomTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataErrorsChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectFieldAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeOffsetConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugExtendedPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DecimalConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultBindingPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultEventAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultValueAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DelegatingTypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DescriptionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CheckoutException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CommandID.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransaction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerb.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerbCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContextSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpContextType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentChangeService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentDiscoveryService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentInitializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesigner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerEventService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHost.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHostTransactionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerOptionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDictionaryService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IEventPropertyService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderListService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderProviderService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IHelpService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IInheritanceService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IMenuCommandService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IReferenceService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IResourceService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IRootDesigner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ISelectionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IServiceObjectContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITreeDesigner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDescriptorFilterService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDiscoveryService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\MenuCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\SelectionTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ComponentSerializationService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ContextStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DefaultSerializationProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerSerializerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderHost.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\INameCreationService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\InstanceDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\MemberRelationshipService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\RootDesignerSerializerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\SerializationStore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceCreatorCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceObjectContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardCommands.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardToolWindows.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ToolboxItemAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ViewTechnology.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerCategoryAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibilityAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignOnlyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignTimeVisibleAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DisplayNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoubleConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorBrowsableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EnumConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventHandlerList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExpandableObjectConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtendedPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtenderProvidedPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\FxCopSuppression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\GuidConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingListView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICancelAddNew.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IChangeTracking.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComNativeDescriptorHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComponent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICustomTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IDataErrorInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IEditableObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IExtenderProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IIntellisenseBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IListSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ImmutableObjectAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedSite.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InitializationEventAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyDataErrorInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanged.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanging.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstallerTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstanceCreationEditor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int16Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int32Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int64Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IntSecurity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidAsynchronousStateException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidEnumArgumentException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRaiseItemChangedEvents.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRevertibleChangeTracking.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISite.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitialize.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitializeNotification.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISynchronizeInvoke.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypeDescriptorContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypedList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\License.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseUsageMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicFileLicenseProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListBindableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescription.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescriptionCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LocalizableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LookupBindingPropertiesAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MarshalByValueComponent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextResultHint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MemberDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MergablePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MultilineStringConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NestedContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NullableConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PasswordPropertyTextAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProvidePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReadOnlyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RecommendedAsConfigurableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReferenceConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectEventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectTypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunInstallerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SByteConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SettingsBindableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SingleConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\StringConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SyntaxCheck.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TimeSpanConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverterAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeListConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt16Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt32Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt64Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\WarningException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Debug.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DelimitedListTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DiagnosticsConfiguration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ListenerElementsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SeverityFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceLevels.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceSwitch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Switch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchLevelAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TextWriterTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Trace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceInternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListeners.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\traceutils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\hresults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\invariantcomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\PrivilegedConfigurationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\SecurityUtils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\WeakHashtable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LoggingObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Cache\RequestCachePolicy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookie.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecontainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookieexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\HttpListenerRequestUriBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Internal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\Base64Stream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\Base64WriteStateInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\BaseWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\BufferBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\ClosableStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\ContentDisposition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\ContentType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\DelegatedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\DispositionTypeNames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\EightBitStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\EncodedStreamFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\HeaderCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\IEncodableStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MailBnfHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MailHeaderInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\mediatypenames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeBasePart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeEmbeddedMessagePart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeMultiPart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeMultiPartType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimePart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MultiAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\QEncodedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\QuotedPrintableStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\SmtpDateTime.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\TrackingStringDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\TrackingValidationObjectDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\TransferEncoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\WriteStateInfoBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceStatistics.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\ScopeLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\AuthenticatedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\NegotiateEnumTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\ServicePointManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SocketException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\AddressFamily.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IOControlCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IPPacketInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IPProtectionLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\LingerOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\MulticastOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\NetworkStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\ProtocolFamily.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\ProtocolType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SelectMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketErrors.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketInformationOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketShutdown.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\TransmitFileFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\UdpReceiveResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\webclient.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WebPermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WebUtility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WriteStreamClosedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\UriEnumTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\URIFormatException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\UriHostNameType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\URIPartial.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchTimeoutException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\monitoring\system\diagnosticts\AsyncStreamReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\ElapsedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\Timer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\TimersDescriptionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\interopservices\DefaultParameterValueAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\interopservices\handlecollector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\versioning\FrameworkName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\threading\Barrier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System\compmod\microsoft\win32\safehandles\SafeProcessHandle.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArrayCreateExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArrayIndexerExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAssignStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttachEventStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeArgument.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeArgumentCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeDeclaration.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeDeclarationCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeBaseReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeBinaryOperatorExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeBinaryOperatorType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCastExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCatchClause.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCatchClauseCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeChecksumPragma.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeComment.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCommentStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCommentStatementCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCompileUnit.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeConditionStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeConstructor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDefaultValueExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDelegateCreateExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDelegateInvokeExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDirectionExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDirective.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDirectiveCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeEntryPointMethod.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeEventReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeExpressionCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeExpressionStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeFieldReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeGotoStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeIndexerExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeIterationStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeLabeledStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeLinePragma.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberField.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberMethod.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberProperty.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMethodInvokeExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\codemethodreferenceexpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMethodReturnStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespace.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespaceCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespaceImport.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespaceImportCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeObject.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeObjectCreateExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpressionCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodePrimitiveExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodePropertyReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodePropertySetValueReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeRegionDirective.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeRegionMode.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeRemoveEventStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetCompileUnit.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetTypeMember.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeStatementCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeThisReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeThrowExceptionStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTryCatchFinallyStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeConstructor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeDeclaration.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeDeclarationCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeDelegate.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeMember.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeMemberCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeOfExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeParameter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeParameterCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeReference.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeReferenceCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeVariableDeclarationStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeVariableReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CodeGenerator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CodeGeneratorOptions.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CodeValidator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CompilerError.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CompilerErrorCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CompilerParameters.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\GeneratedCodeAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\GeneratorSupport.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\ICodeCompiler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\ICodeGenerator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\ICodeParser.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\IndentTextWriter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\LanguageOptions.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\FieldDirection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\MemberAttributes.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\bithelper.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\debugview.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\iset.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\linkedlist.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\queue.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sorteddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sortedlist.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sortedset.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sortedsetdebugview.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\stack.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\throwhelper.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\objectmodel\observablecollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\objectmodel\readonlyobservablecollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\bitvector32.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\casesensitivestringdictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\collectionsutil.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\fixedstringlookup.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\hybriddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\inotifycollectionchanged.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\iordereddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\listdictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\nameobjectcollectionbase.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\namevaluecollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\notifycollectionchangedeventargs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\ordereddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\stringcollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\stringdictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\stringdictionarywithcomparer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AddingNewEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AddingNewEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AmbientValueAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ArrayConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ArraySubsetEnumerator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncOperation.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncOperationManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AttributeCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AttributeProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BackgroundWorker.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BaseComponentEditor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\basenumberconverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindableSupport.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindingDirection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindingList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BooleanConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BrowsableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ByteConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CancelEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CancelEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CategoryAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CharConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionChangeAction.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionChangeEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionChangeEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComplexBindingPropertiesAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CompModSwitches.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Component.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComponentCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComponentConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComponentResourceManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Container.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ContainerFilterService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CultureInfoConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CustomTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataErrorsChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectFieldAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectMethodType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DateTimeConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DateTimeOffsetConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugExtendedPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DecimalConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultBindingPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultEventAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultValueAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DelegatingTypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\CheckoutException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\CommandID.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerTransaction.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerVerb.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerVerbCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContext.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContextSerializer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DocumentCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DocumentEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DocumentEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\HelpContextType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\HelpKeywordAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\HelpKeywordType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IComponentChangeService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IComponentDiscoveryService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IComponentInitializer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesigner.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerEventService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerHost.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerHostTransactionState.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerOptionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDictionaryService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IEventPropertyService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IExtenderListService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IExtenderProviderService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IHelpService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IInheritanceService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IMenuCommandService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\InheritanceAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\InheritanceLevel.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IReferenceService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IResourceService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IRootDesigner.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ISelectionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IServiceObjectContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITreeDesigner.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITypeDescriptorFilterService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITypeDiscoveryService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITypeResolutionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\MenuCommand.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\PropertyTabAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\PropertyTabScope.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\SelectionTypes.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ComponentSerializationService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ContextStack.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\DefaultSerializationProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerLoader.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerSerializerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderHost.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\INameCreationService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\InstanceDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\MemberRelationshipService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\RootDesignerSerializerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\SerializationStore.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ServiceCreatorCallback.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ServiceObjectContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\StandardCommands.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\StandardToolWindows.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ToolboxItemAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ViewTechnology.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerCategoryAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibility.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibilityAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignOnlyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignTimeVisibleAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DisplayNameAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoubleConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EditorAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EditorBrowsableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EnumConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EventDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EventDescriptorCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EventHandlerList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ExpandableObjectConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ExtendedPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ExtenderProvidedPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\FxCopSuppression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\GuidConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\HandledEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\HandledEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IBindingList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IBindingListView.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ICancelAddNew.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IChangeTracking.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IComNativeDescriptorHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IComponent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ICustomTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IDataErrorInfo.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IEditableObject.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IExtenderProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IIntellisenseBuilder.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IListSource.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ImmutableObjectAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INestedContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INestedSite.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InitializationEventAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INotifyDataErrorInfo.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanged.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanging.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InstallerTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InstanceCreationEditor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Int16Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Int32Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Int64Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IntSecurity.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InvalidAsynchronousStateException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InvalidEnumArgumentException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IRaiseItemChangedEvents.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IRevertibleChangeTracking.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISite.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISupportInitialize.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISupportInitializeNotification.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISynchronizeInvoke.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ITypeDescriptorContext.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ITypedList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\License.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseContext.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseUsageMode.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicFileLicenseProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListBindableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListChangedType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListSortDescription.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListSortDescriptionCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListSortDirection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LocalizableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LookupBindingPropertiesAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MarshalByValueComponent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MaskedTextProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MaskedTextResultHint.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MemberDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MergablePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MultilineStringConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\NestedContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\NullableConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PasswordPropertyTextAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ProgressChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ProgressChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangingEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangingEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyDescriptorCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ProvidePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReadOnlyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RecommendedAsConfigurableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReferenceConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReflectEventDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReflectPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReflectTypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RefreshEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RefreshEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RunInstallerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SByteConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SettingsBindableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SingleConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\StringConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SyntaxCheck.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TimeSpanConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeConverterAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeListConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\UInt16Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\UInt32Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\UInt64Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\WarningException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\Debug.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\DelimitedListTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\DiagnosticsConfiguration.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\ListenerElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SeverityFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceLevels.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceSwitch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\Switch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchLevelAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TextWriterTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\Trace.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceEventCache.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceEventType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceInternal.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceLevel.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceListeners.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceOptions.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\traceutils.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />
+    <Compile Include="..\referencesource\System\misc\hresults.cs" />
+    <Compile Include="..\referencesource\System\misc\invariantcomparer.cs" />
+    <Compile Include="..\referencesource\System\misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System\misc\SecurityUtils.cs" />
+    <Compile Include="..\referencesource\System\misc\WeakHashtable.cs" />
+    <Compile Include="..\referencesource\System\net\System\_DomainName.cs" />
+    <Compile Include="..\referencesource\System\net\System\_IPv4Address.cs" />
+    <Compile Include="..\referencesource\System\net\System\_IPv6Address.cs" />
+    <Compile Include="..\referencesource\System\net\System\_UncName.cs" />
+    <Compile Include="..\referencesource\System\net\System\_UriSyntax.cs" />
+    <Compile Include="..\referencesource\System\net\System\GenericUriParser.cs" />
+    <Compile Include="..\referencesource\System\net\System\IriHelper.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_Connection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_emptywebproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfoTable.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HTTPDateParse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_IStreams.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LoggingObject.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_NetRes.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_PooledStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_ProxyChain.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_Semaphore.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_TimerThread.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_WebProxyDataBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\AuthenticationScheme.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\AuthenticationSchemeSelector.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Authorization.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCache.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCacheEntry.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCacheManager.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCachePolicy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Configuration\DefaultProxySection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\connectionpool.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookie.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookiecollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookiecontainer.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookieexception.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\CredentialCache.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\DnsEndPoint.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\EndPoint.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\filewebrequest.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\filewebresponse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\FtpStatusCode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\GlobalProxySelection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpListenerException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpListenerRequestUriBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpRequestHeader.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpResponseHeader.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpStatusCode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpVersion.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IAuthenticationModule.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ICertificatePolicy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ICredentials.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ICredentialsByHost.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Internal.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IPAddress.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IPEndPoint.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IPHostEntry.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\iwebproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IWebProxyFinder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IWebRequestCreate.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\Base64Stream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\Base64WriteStateInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\BaseWriter.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\BufferBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\ClosableStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\ContentDisposition.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\ContentType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\DelegatedStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\DispositionTypeNames.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\EightBitStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\EncodedStreamFactory.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\HeaderCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\IEncodableStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MailBnfHelper.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MailHeaderInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\mediatypenames.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeBasePart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeEmbeddedMessagePart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeMultiPart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeMultiPartType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimePart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeWriter.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MultiAsyncResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\QEncodedStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\QuotedPrintableStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\SmtpDateTime.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\TrackingStringDictionary.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\TrackingValidationObjectDictionary.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\TransferEncoding.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\WriteStateInfoBase.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkAccess.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\DuplicateAddressDetectionState.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\GatewayIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\GatewayIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV4Statistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV6Statistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\interfacetype.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPGlobalProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPGlobalStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPStatus.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPv4InterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPv6InterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\MulticastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\MulticastIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkAddressChange.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInformationException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInformationPermission.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInterface.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInterfaceComponent.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\nodetype.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\OperationalStatus.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PhysicalAddress.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\pingexception.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PingOptions.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PingReply.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PrefixOrigin.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\ScopeLevel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SuffixOrigin.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemGatewayIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemMulticastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemTcpConnection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemUnicastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\TcpConnection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\TcpState.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\TcpStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UdpStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ProtocolViolationException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\AuthenticatedStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\NegotiateEnumTypes.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ServicePointManager.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SocketAddress.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SocketException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\AddressFamily.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\IOControlCode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\IPPacketInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\IPProtectionLevel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\LingerOption.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\MulticastOption.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\NetworkStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\ProtocolFamily.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\ProtocolType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SelectMode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketErrors.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketFlags.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketInformationOptions.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketOptionLevel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketShutdown.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TransmitFileFlags.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UdpReceiveResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\TransportContext.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\TransportType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\webclient.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebExceptionStatus.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebHeaderCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebPermission.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\webproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebRequest.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebRequestMethods.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebResponse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebUtility.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WriteStreamClosedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\net\System\URI.cs" />
+    <Compile Include="..\referencesource\System\net\System\uribuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriEnumTypes.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriExt.cs" />
+    <Compile Include="..\referencesource\System\net\System\URIFormatException.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriHelper.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriHostNameType.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriParserTemplates.cs" />
+    <Compile Include="..\referencesource\System\net\System\URIPartial.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriScheme.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexMatchTimeoutException.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\Authentication\ExtendedProtection\TokenBinding.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\cryptography\oid.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\cryptography\x509\x509utils.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\AsyncStreamReader.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\Process.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\ProcessStartInfo.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\processwaithandle.cs" />
+    <Compile Include="..\referencesource\System\services\timers\system\timers\ElapsedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\services\timers\system\timers\Timer.cs" />
+    <Compile Include="..\referencesource\System\services\timers\system\timers\TimersDescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />
+    <Compile Include="..\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />
+    <Compile Include="..\referencesource\System\sys\system\IO\ports\InternalResources.cs" />
+    <Compile Include="..\referencesource\System\sys\system\runtime\interopservices\DefaultParameterValueAttribute.cs" />
+    <Compile Include="..\referencesource\System\sys\system\runtime\interopservices\handlecollector.cs" />
+    <Compile Include="..\referencesource\System\sys\system\runtime\versioning\FrameworkName.cs" />
+    <Compile Include="..\referencesource\System\sys\system\threading\Barrier.cs" />
+    <Compile Include="..\referencesource\System\sys\system\threading\semaphore.cs" />
+    <Compile Include="..\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
@@ -662,12 +781,17 @@
     <Compile Include="ReferenceSources\_SslState.cs" />
     <Compile Include="ReferenceSources\_SslStream.cs" />
     <Compile Include="ReferenceSources\AssertWrapper.cs" />
+    <Compile Include="ReferenceSources\AutoWebProxyScriptEngine.cs" />
     <Compile Include="ReferenceSources\BinaryCompatibility.cs" />
+    <Compile Include="ReferenceSources\CAPI.cs" />
     <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />
+    <Compile Include="ReferenceSources\EnvironmentHelpers.cs" />
+    <Compile Include="ReferenceSources\HttpApi.cs" />
     <Compile Include="ReferenceSources\HttpSysSettings.cs" />
     <Compile Include="ReferenceSources\Internal.cs" />
     <Compile Include="ReferenceSources\Logging.cs" />
     <Compile Include="ReferenceSources\NativeMethods.cs" />
+    <Compile Include="ReferenceSources\RequestCacheProtocol.cs" />
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />
     <Compile Include="ReferenceSources\Socket.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
@@ -677,8 +801,6 @@
     <Compile Include="ReferenceSources\SSPIConfiguration.cs" />
     <Compile Include="ReferenceSources\SSPISafeHandles.cs" />
     <Compile Include="ReferenceSources\SSPIWrapper.cs" />
-    <Compile Include="ReferenceSources\SystemNetworkCredential.cs" />
-    <Compile Include="ReferenceSources\WebHeaderCollectionType.cs" />
     <Compile Include="ReferenceSources\Win32Exception.cs" />
     <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />
     <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />
@@ -917,53 +1039,25 @@
     <Compile Include="System.Net.Mail\SmtpPermission.cs" />
     <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />
     <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />
     <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />
     <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />
     <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />
     <Compile Include="System.Net.NetworkInformation\Ping.cs" />
     <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />
     <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />
     <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />
     <Compile Include="System.Net.Security\EncryptionPolicy.cs" />
     <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />
@@ -993,101 +1087,62 @@
     <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />
     <Compile Include="System.Net.WebSockets\WebSocketState.cs" />
     <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />
-    <Compile Include="System.Net\Authorization.cs" />
     <Compile Include="System.Net\BasicClient.cs" />
     <Compile Include="System.Net\BindIPEndPoint.cs" />
     <Compile Include="System.Net\ChunkedInputStream.cs" />
     <Compile Include="System.Net\ChunkStream.cs" />
-    <Compile Include="System.Net\ConnectionModes.cs" />
-    <Compile Include="System.Net\CredentialCache.cs" />
     <Compile Include="System.Net\DecompressionMethods.cs" />
     <Compile Include="System.Net\DefaultCertificatePolicy.cs" />
     <Compile Include="System.Net\DigestClient.cs" />
     <Compile Include="System.Net\Dns.cs" />
     <Compile Include="System.Net\DnsAsyncResult.cs" />
-    <Compile Include="System.Net\DnsEndPoint.cs" />
     <Compile Include="System.Net\DnsPermission.cs" />
     <Compile Include="System.Net\DnsPermissionAttribute.cs" />
-    <Compile Include="System.Net\EndPoint.cs" />
     <Compile Include="System.Net\EndPointListener.cs" />
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\EndpointPermission.cs" />
-    <Compile Include="System.Net\FileWebRequest.cs" />
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />
-    <Compile Include="System.Net\FileWebResponse.cs" />
     <Compile Include="System.Net\FtpAsyncResult.cs" />
     <Compile Include="System.Net\FtpDataStream.cs" />
     <Compile Include="System.Net\FtpRequestCreator.cs" />
     <Compile Include="System.Net\FtpStatus.cs" />
-    <Compile Include="System.Net\FtpStatusCode.cs" />
     <Compile Include="System.Net\FtpWebRequest.cs" />
     <Compile Include="System.Net\FtpWebResponse.cs" />
-    <Compile Include="System.Net\GlobalProxySelection.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
     <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerException.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
     <Compile Include="System.Net\HttpListenerRequest.cs" />
     <Compile Include="System.Net\HttpListenerResponse.cs" />
     <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
     <Compile Include="System.Net\HttpRequestCreator.cs" />
-    <Compile Include="System.Net\HttpRequestHeader.cs" />
-    <Compile Include="System.Net\HttpResponseHeader.cs" />
-    <Compile Include="System.Net\HttpStatusCode.cs" />
     <Compile Include="System.Net\HttpStreamAsyncResult.cs" />
-    <Compile Include="System.Net\HttpVersion.cs" />
     <Compile Include="System.Net\HttpWebRequest.cs" />
     <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\IAuthenticationModule.cs" />
-    <Compile Include="System.Net\ICertificatePolicy.cs" />
-    <Compile Include="System.Net\ICredentialLookup.cs" />
     <Compile Include="System.Net\ICredentialPolicy.cs" />
-    <Compile Include="System.Net\ICredentialsByHost.cs" />
-    <Compile Include="System.Net\IPAddress.cs" />
-    <Compile Include="System.Net\IPEndPoint.cs" />
-    <Compile Include="System.Net\IPHostEntry.cs" />
     <Compile Include="System.Net\IPv6Address.cs" />
     <Compile Include="System.Net\IWebConnectionState.cs" />
-    <Compile Include="System.Net\IWebProxy.cs" />
     <Compile Include="System.Net\IWebProxyScript.cs" />
-    <Compile Include="System.Net\IWebRequestCreate.cs" />
     <Compile Include="System.Net\ListenerAsyncResult.cs" />
     <Compile Include="System.Net\ListenerPrefix.cs" />
     <Compile Include="System.Net\MacProxy.cs" />
     <Compile Include="System.Net\MonoHttpDate.cs" />
     <Compile Include="System.Net\NetConfig.cs" />
-    <Compile Include="System.Net\NetworkAccess.cs" />
     <Compile Include="System.Net\NetworkCredential.cs" />
     <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ProtocolViolationException.cs" />
     <Compile Include="System.Net\RequestStream.cs" />
     <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\SecurityProtocolType.cs" />
     <Compile Include="System.Net\ServicePoint.cs" />
     <Compile Include="System.Net\ServicePointManager.cs" />
     <Compile Include="System.Net\ServicePointManager.extra.cs" />
     <Compile Include="System.Net\SimpleAsyncResult.cs" />
-    <Compile Include="System.Net\SocketAddress.cs" />
     <Compile Include="System.Net\SocketPermission.cs" />
     <Compile Include="System.Net\SocketPermissionAttribute.cs" />
-    <Compile Include="System.Net\TransportContext.cs" />
-    <Compile Include="System.Net\TransportType.cs" />
     <Compile Include="System.Net\WebAsyncResult.cs" />
     <Compile Include="System.Net\WebConnection.cs" />
     <Compile Include="System.Net\WebConnectionData.cs" />
     <Compile Include="System.Net\WebConnectionGroup.cs" />
     <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebException.cs" />
-    <Compile Include="System.Net\WebExceptionStatus.cs" />
-    <Compile Include="System.Net\WebHeaderCollection.cs" />
-    <Compile Include="System.Net\WebProxy.cs" />
-    <Compile Include="System.Net\WebRequest.cs" />
-    <Compile Include="System.Net\WebRequestMethods.cs" />
-    <Compile Include="System.Net\WebResponse.cs" />
     <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />
     <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />
     <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />
@@ -1132,11 +1187,15 @@
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Impl.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2ImplMono.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainImpl.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainImplMono.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />
@@ -1145,6 +1204,7 @@
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509Helper2.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />
@@ -1158,17 +1218,12 @@
     <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />
     <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />
     <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\Oid.cs" />
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\OidGroup.cs" />
     <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
     <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />
     <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />
     <Compile Include="System.Security.Permissions\StorePermission.cs" />
     <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />
     <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />
-    <Compile Include="System.Threading\Semaphore.cs" />
     <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />
     <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />
     <Compile Include="System.Timers\ElapsedEventArgs.cs" />
@@ -1176,28 +1231,9 @@
     <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />
     <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
     <Compile Include="System.Windows.Input\ICommand.cs" />
-    <Compile Include="System\DefaultUriParser.cs" />
-    <Compile Include="System\FileStyleUriParser.cs" />
-    <Compile Include="System\FtpStyleUriParser.cs" />
-    <Compile Include="System\GenericUriParser.cs" />
-    <Compile Include="System\GenericUriParserOptions.cs" />
-    <Compile Include="System\GopherStyleUriParser.cs" />
-    <Compile Include="System\HttpStyleUriParser.cs" />
     <Compile Include="System\IOSelector.cs" />
-    <Compile Include="System\IUriData.cs" />
-    <Compile Include="System\LdapStyleUriParser.cs" />
-    <Compile Include="System\NetPipeStyleUriParser.cs" />
-    <Compile Include="System\NetTcpStyleUriParser.cs" />
-    <Compile Include="System\NewsStyleUriParser.cs" />
     <Compile Include="System\Platform.cs" />
     <Compile Include="System\SRDescriptionAttribute.cs" />
-    <Compile Include="System\Uri.cs" />
-    <Compile Include="System\UriBuilder.cs" />
-    <Compile Include="System\UriData.cs" />
-    <Compile Include="System\UriElements.cs" />
-    <Compile Include="System\UriHelper.cs" />
-    <Compile Include="System\UriParseComponents.cs" />
-    <Compile Include="System\UriParser.cs" />
     <Compile Include="System\UriTypeConverter.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.
@@ -1207,15 +1243,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -1226,18 +1261,14 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
-      <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
-      <Name>System.Configuration-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System.XML/System.Xml-net_4_x.csproj">
       <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
       <Name>System.Xml-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="System-secxml-net_4_x.csproj">
-      <Project>{19954F80-065E-4D46-8FEF-62BA4D6CFDAD}</Project>
-      <Name>System-secxml-net_4_x</Name>
-      <Aliases>PrebuiltSystem</Aliases>    </ProjectReference>
+    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
+      <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
+      <Name>System.Configuration-net_4_x</Name>
+    </ProjectReference>
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_x.csproj">
       <Project>{42D59DE7-586F-4ACF-BDD5-E7869E39E3EF}</Project>
       <Name>Mono.Security-net_4_x</Name>
diff --git a/mcs/class/System/System-secxml-build.csproj b/mcs/class/System/System-secxml-build.csproj
deleted file mode 100644
index 02381c42dde..00000000000
--- a/mcs/class/System/System-secxml-build.csproj
+++ /dev/null
@@ -1,1195 +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>{7726E34F-345D-41A5-81CD-089E06572BDF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,618</NoWarn>
-    <OutputPath>./../../class/lib/build/secxml</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>System</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>1699,618</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,618</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;CONFIGURATION_2_0;SECURITY_DEP;XML_DEP</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="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeGenerator.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeGeneratorOptions.cs" />
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerError.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerErrorCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerParameters.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />
-    <Compile Include="System.CodeDom.Compiler\GeneratedCodeAttribute.cs" />
-    <Compile Include="System.CodeDom.Compiler\GeneratorSupport.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeCompiler.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeGenerator.cs" />
-    <Compile Include="System.CodeDom.Compiler\ICodeParser.cs" />
-    <Compile Include="System.CodeDom.Compiler\IndentedTextWriter.cs" />
-    <Compile Include="System.CodeDom.Compiler\LanguageOptions.cs" />
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />
-    <Compile Include="System.CodeDom\CodeArgumentReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeArrayCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeArrayIndexerExpression.cs" />
-    <Compile Include="System.CodeDom\CodeAssignStatement.cs" />
-    <Compile Include="System.CodeDom\CodeAttachEventStatement.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeArgument.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeArgumentCollection.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeDeclaration.cs" />
-    <Compile Include="System.CodeDom\CodeAttributeDeclarationCollection.cs" />
-    <Compile Include="System.CodeDom\CodeBaseReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeBinaryOperatorExpression.cs" />
-    <Compile Include="System.CodeDom\CodeBinaryOperatorType.cs" />
-    <Compile Include="System.CodeDom\CodeCastExpression.cs" />
-    <Compile Include="System.CodeDom\CodeCatchClause.cs" />
-    <Compile Include="System.CodeDom\CodeCatchClauseCollection.cs" />
-    <Compile Include="System.CodeDom\CodeChecksumPragma.cs" />
-    <Compile Include="System.CodeDom\CodeComment.cs" />
-    <Compile Include="System.CodeDom\CodeCommentStatement.cs" />
-    <Compile Include="System.CodeDom\CodeCommentStatementCollection.cs" />
-    <Compile Include="System.CodeDom\CodeCompileUnit.cs" />
-    <Compile Include="System.CodeDom\CodeConditionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeConstructor.cs" />
-    <Compile Include="System.CodeDom\CodeDefaultValueExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDelegateCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDelegateInvokeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDirectionExpression.cs" />
-    <Compile Include="System.CodeDom\CodeDirective.cs" />
-    <Compile Include="System.CodeDom\CodeDirectiveCollection.cs" />
-    <Compile Include="System.CodeDom\CodeEntryPointMethod.cs" />
-    <Compile Include="System.CodeDom\CodeEventReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeExpressionCollection.cs" />
-    <Compile Include="System.CodeDom\CodeExpressionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeFieldReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeGotoStatement.cs" />
-    <Compile Include="System.CodeDom\CodeIndexerExpression.cs" />
-    <Compile Include="System.CodeDom\CodeIterationStatement.cs" />
-    <Compile Include="System.CodeDom\CodeLabeledStatement.cs" />
-    <Compile Include="System.CodeDom\CodeLinePragma.cs" />
-    <Compile Include="System.CodeDom\CodeMemberEvent.cs" />
-    <Compile Include="System.CodeDom\CodeMemberField.cs" />
-    <Compile Include="System.CodeDom\CodeMemberMethod.cs" />
-    <Compile Include="System.CodeDom\CodeMemberProperty.cs" />
-    <Compile Include="System.CodeDom\CodeMethodInvokeExpression.cs" />
-    <Compile Include="System.CodeDom\CodeMethodReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeMethodReturnStatement.cs" />
-    <Compile Include="System.CodeDom\CodeNamespace.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceCollection.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceImport.cs" />
-    <Compile Include="System.CodeDom\CodeNamespaceImportCollection.cs" />
-    <Compile Include="System.CodeDom\CodeObject.cs" />
-    <Compile Include="System.CodeDom\CodeObjectCreateExpression.cs" />
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpression.cs" />
-    <Compile Include="System.CodeDom\CodeParameterDeclarationExpressionCollection.cs" />
-    <Compile Include="System.CodeDom\CodePrimitiveExpression.cs" />
-    <Compile Include="System.CodeDom\CodePropertyReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodePropertySetValueReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeRegionDirective.cs" />
-    <Compile Include="System.CodeDom\CodeRegionMode.cs" />
-    <Compile Include="System.CodeDom\CodeRemoveEventStatement.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetCompileUnit.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetExpression.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetStatement.cs" />
-    <Compile Include="System.CodeDom\CodeSnippetTypeMember.cs" />
-    <Compile Include="System.CodeDom\CodeStatement.cs" />
-    <Compile Include="System.CodeDom\CodeStatementCollection.cs" />
-    <Compile Include="System.CodeDom\CodeThisReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeThrowExceptionStatement.cs" />
-    <Compile Include="System.CodeDom\CodeTryCatchFinallyStatement.cs" />
-    <Compile Include="System.CodeDom\CodeTypeConstructor.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDeclaration.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDeclarationCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeDelegate.cs" />
-    <Compile Include="System.CodeDom\CodeTypeMember.cs" />
-    <Compile Include="System.CodeDom\CodeTypeMemberCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeOfExpression.cs" />
-    <Compile Include="System.CodeDom\CodeTypeParameter.cs" />
-    <Compile Include="System.CodeDom\CodeTypeParameterCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReference.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceCollection.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\CodeTypeReferenceOptions.cs" />
-    <Compile Include="System.CodeDom\CodeVariableDeclarationStatement.cs" />
-    <Compile Include="System.CodeDom\CodeVariableReferenceExpression.cs" />
-    <Compile Include="System.CodeDom\FieldDirection.cs" />
-    <Compile Include="System.CodeDom\ICodeDomVisitor.cs" />
-    <Compile Include="System.CodeDom\MemberAttributes.cs" />
-    <Compile Include="System.Collections.Concurrent\BlockingCollection.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentBag.cs" />
-    <Compile Include="System.Collections.Generic\ISet.cs" />
-    <Compile Include="System.Collections.Generic\LinkedList.cs" />
-    <Compile Include="System.Collections.Generic\LinkedListNode.cs" />
-    <Compile Include="System.Collections.Generic\Queue.cs" />
-    <Compile Include="System.Collections.Generic\RBTree.cs" />
-    <Compile Include="System.Collections.Generic\SortedDictionary.cs" />
-    <Compile Include="System.Collections.Generic\SortedList.cs" />
-    <Compile Include="System.Collections.Generic\SortedSet.cs" />
-    <Compile Include="System.Collections.Generic\Stack.cs" />
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />
-    <Compile Include="System.Collections.Specialized\BitVector32.cs" />
-    <Compile Include="System.Collections.Specialized\CollectionsUtil.cs" />
-    <Compile Include="System.Collections.Specialized\HybridDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />
-    <Compile Include="System.Collections.Specialized\IOrderedDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\ListDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\NameObjectCollectionBase.cs" />
-    <Compile Include="System.Collections.Specialized\NameValueCollection.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />
-    <Compile Include="System.Collections.Specialized\OrderedDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\ProcessStringDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\StringCollection.cs" />
-    <Compile Include="System.Collections.Specialized\StringDictionary.cs" />
-    <Compile Include="System.Collections.Specialized\StringEnumerator.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentSerializationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ContextStack.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DefaultSerializationProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerLoader.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializerAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderHost2.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerLoaderService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationManager.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationProvider.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\IDesignerSerializationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\INameCreationService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\InstanceDescriptor.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationship.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberRelationshipService.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\ResolveNameEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\RootDesignerSerializerAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializationStore.cs" />
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ActiveDesignerEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\CheckoutException.cs" />
-    <Compile Include="System.ComponentModel.Design\CommandID.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentChangingEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\ComponentRenameEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerCollection.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerOptionService.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransaction.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerTransactionCloseEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerVerb.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignerVerbCollection.cs" />
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContext.cs" />
-    <Compile Include="System.ComponentModel.Design\DesigntimeLicenseContextSerializer.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpContextType.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />
-    <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />
-    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerHost.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerHostTransactionState.cs" />
-    <Compile Include="System.ComponentModel.Design\IDesignerOptionService.cs" />
-    <Compile Include="System.ComponentModel.Design\IDictionaryService.cs" />
-    <Compile Include="System.ComponentModel.Design\IEventBindingService.cs" />
-    <Compile Include="System.ComponentModel.Design\IExtenderListService.cs" />
-    <Compile Include="System.ComponentModel.Design\IExtenderProviderService.cs" />
-    <Compile Include="System.ComponentModel.Design\IHelpService.cs" />
-    <Compile Include="System.ComponentModel.Design\IInheritanceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IMenuCommandService.cs" />
-    <Compile Include="System.ComponentModel.Design\IReferenceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IResourceService.cs" />
-    <Compile Include="System.ComponentModel.Design\IRootDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\ISelectionService.cs" />
-    <Compile Include="System.ComponentModel.Design\IServiceContainer.cs" />
-    <Compile Include="System.ComponentModel.Design\ITreeDesigner.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeDescriptorFilterService.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeDiscoveryService.cs" />
-    <Compile Include="System.ComponentModel.Design\ITypeResolutionService.cs" />
-    <Compile Include="System.ComponentModel.Design\MenuCommand.cs" />
-    <Compile Include="System.ComponentModel.Design\RuntimeLicenseContext.cs" />
-    <Compile Include="System.ComponentModel.Design\SelectionTypes.cs" />
-    <Compile Include="System.ComponentModel.Design\ServiceContainer.cs" />
-    <Compile Include="System.ComponentModel.Design\ServiceCreatorCallback.cs" />
-    <Compile Include="System.ComponentModel.Design\StandardCommands.cs" />
-    <Compile Include="System.ComponentModel.Design\StandardToolWindows.cs" />
-    <Compile Include="System.ComponentModel.Design\TypeDescriptionProviderService.cs" />
-    <Compile Include="System.ComponentModel.Design\ViewTechnology.cs" />
-    <Compile Include="System.ComponentModel\AddingNewEventArgs.cs" />
-    <Compile Include="System.ComponentModel\AddingNewEventHandler.cs" />
-    <Compile Include="System.ComponentModel\AmbientValueAttribute.cs" />
-    <Compile Include="System.ComponentModel\ArrayConverter.cs" />
-    <Compile Include="System.ComponentModel\AsyncCompletedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\AsyncCompletedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\AsyncOperation.cs" />
-    <Compile Include="System.ComponentModel\AsyncOperationManager.cs" />
-    <Compile Include="System.ComponentModel\AttributeCollection.cs" />
-    <Compile Include="System.ComponentModel\AttributeProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\BackgroundWorker.cs" />
-    <Compile Include="System.ComponentModel\BaseNumberConverter.cs" />
-    <Compile Include="System.ComponentModel\BindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\BindableSupport.cs" />
-    <Compile Include="System.ComponentModel\BindingDirection.cs" />
-    <Compile Include="System.ComponentModel\BindingList.cs" />
-    <Compile Include="System.ComponentModel\BooleanConverter.cs" />
-    <Compile Include="System.ComponentModel\BrowsableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ByteConverter.cs" />
-    <Compile Include="System.ComponentModel\CancelEventArgs.cs" />
-    <Compile Include="System.ComponentModel\CancelEventHandler.cs" />
-    <Compile Include="System.ComponentModel\CategoryAttribute.cs" />
-    <Compile Include="System.ComponentModel\CharConverter.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeAction.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeEventArgs.cs" />
-    <Compile Include="System.ComponentModel\CollectionChangeEventHandler.cs" />
-    <Compile Include="System.ComponentModel\CollectionConverter.cs" />
-    <Compile Include="System.ComponentModel\ComplexBindingPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\Component.cs" />
-    <Compile Include="System.ComponentModel\ComponentCollection.cs" />
-    <Compile Include="System.ComponentModel\ComponentConverter.cs" />
-    <Compile Include="System.ComponentModel\ComponentEditor.cs" />
-    <Compile Include="System.ComponentModel\ComponentResourceManager.cs" />
-    <Compile Include="System.ComponentModel\Container.cs" />
-    <Compile Include="System.ComponentModel\ContainerFilterService.cs" />
-    <Compile Include="System.ComponentModel\CultureInfoConverter.cs" />
-    <Compile Include="System.ComponentModel\CustomTypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\DataErrorsChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\DataObjectAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectFieldAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectMethodAttribute.cs" />
-    <Compile Include="System.ComponentModel\DataObjectMethodType.cs" />
-    <Compile Include="System.ComponentModel\DateTimeConverter.cs" />
-    <Compile Include="System.ComponentModel\DateTimeOffsetConverter.cs" />
-    <Compile Include="System.ComponentModel\DecimalConverter.cs" />
-    <Compile Include="System.ComponentModel\DefaultBindingPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultEventAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DefaultValueAttribute.cs" />
-    <Compile Include="System.ComponentModel\DerivedPropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\DescriptionAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerCategoryAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibility.cs" />
-    <Compile Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />
-    <Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />
-    <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />
-    <Compile Include="System.ComponentModel\DoubleConverter.cs" />
-    <Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />
-    <Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />
-    <Compile Include="System.ComponentModel\EditorAttribute.cs" />
-    <Compile Include="System.ComponentModel\EditorBrowsableAttribute.cs" />
-    <Compile Include="System.ComponentModel\EditorBrowsableState.cs" />
-    <Compile Include="System.ComponentModel\EnumConverter.cs" />
-    <Compile Include="System.ComponentModel\EventDescriptor.cs" />
-    <Compile Include="System.ComponentModel\EventDescriptorCollection.cs" />
-    <Compile Include="System.ComponentModel\EventHandlerList.cs" />
-    <Compile Include="System.ComponentModel\ExpandableObjectConverter.cs" />
-    <Compile Include="System.ComponentModel\ExtenderProvidedPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\GuidConverter.cs" />
-    <Compile Include="System.ComponentModel\HandledEventArgs.cs" />
-    <Compile Include="System.ComponentModel\HandledEventHandler.cs" />
-    <Compile Include="System.ComponentModel\IBindingList.cs" />
-    <Compile Include="System.ComponentModel\IBindingListView.cs" />
-    <Compile Include="System.ComponentModel\ICancelAddNew.cs" />
-    <Compile Include="System.ComponentModel\IChangeTracking.cs" />
-    <Compile Include="System.ComponentModel\IComNativeDescriptorHandler.cs" />
-    <Compile Include="System.ComponentModel\IComponent.cs" />
-    <Compile Include="System.ComponentModel\IContainer.cs" />
-    <Compile Include="System.ComponentModel\ICustomTypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\IDataErrorInfo.cs" />
-    <Compile Include="System.ComponentModel\IEditableObject.cs" />
-    <Compile Include="System.ComponentModel\IExtenderProvider.cs" />
-    <Compile Include="System.ComponentModel\IIntellisenseBuilder.cs" />
-    <Compile Include="System.ComponentModel\IListSource.cs" />
-    <Compile Include="System.ComponentModel\ImmutableObjectAttribute.cs" />
-    <Compile Include="System.ComponentModel\INestedContainer.cs" />
-    <Compile Include="System.ComponentModel\INestedSite.cs" />
-    <Compile Include="System.ComponentModel\InheritanceAttribute.cs" />
-    <Compile Include="System.ComponentModel\InheritanceLevel.cs" />
-    <Compile Include="System.ComponentModel\InitializationEventAttribute.cs" />
-    <Compile Include="System.ComponentModel\INotifyDataErrorInfo.cs" />
-    <Compile Include="System.ComponentModel\INotifyPropertyChanged.cs" />
-    <Compile Include="System.ComponentModel\INotifyPropertyChanging.cs" />
-    <Compile Include="System.ComponentModel\InstallerTypeAttribute.cs" />
-    <Compile Include="System.ComponentModel\InstanceCreationEditor.cs" />
-    <Compile Include="System.ComponentModel\Int16Converter.cs" />
-    <Compile Include="System.ComponentModel\Int32Converter.cs" />
-    <Compile Include="System.ComponentModel\Int64Converter.cs" />
-    <Compile Include="System.ComponentModel\InvalidAsynchronousStateException.cs" />
-    <Compile Include="System.ComponentModel\InvalidEnumArgumentException.cs" />
-    <Compile Include="System.ComponentModel\IRaiseItemChangedEvents.cs" />
-    <Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />
-    <Compile Include="System.ComponentModel\ISite.cs" />
-    <Compile Include="System.ComponentModel\ISupportInitialize.cs" />
-    <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs" />
-    <Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />
-    <Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />
-    <Compile Include="System.ComponentModel\ITypedList.cs" />
-    <Compile Include="System.ComponentModel\License.cs" />
-    <Compile Include="System.ComponentModel\LicenseContext.cs" />
-    <Compile Include="System.ComponentModel\LicenseException.cs" />
-    <Compile Include="System.ComponentModel\LicenseManager.cs" />
-    <Compile Include="System.ComponentModel\LicenseProvider.cs" />
-    <Compile Include="System.ComponentModel\LicenseProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\LicenseUsageMode.cs" />
-    <Compile Include="System.ComponentModel\LicFileLicenseProvider.cs" />
-    <Compile Include="System.ComponentModel\ListBindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ListChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\ListChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\ListChangedType.cs" />
-    <Compile Include="System.ComponentModel\ListSortDescription.cs" />
-    <Compile Include="System.ComponentModel\ListSortDescriptionCollection.cs" />
-    <Compile Include="System.ComponentModel\ListSortDirection.cs" />
-    <Compile Include="System.ComponentModel\LocalizableAttribute.cs" />
-    <Compile Include="System.ComponentModel\LookupBindingPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\MarshalByValueComponent.cs" />
-    <Compile Include="System.ComponentModel\MaskedTextProvider.cs" />
-    <Compile Include="System.ComponentModel\MaskedTextResultHint.cs" />
-    <Compile Include="System.ComponentModel\MemberDescriptor.cs" />
-    <Compile Include="System.ComponentModel\MergablePropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\MultilineStringConverter.cs" />
-    <Compile Include="System.ComponentModel\NestedContainer.cs" />
-    <Compile Include="System.ComponentModel\NotifyParentPropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\NullableConverter.cs" />
-    <Compile Include="System.ComponentModel\ParenthesizePropertyNameAttribute.cs" />
-    <Compile Include="System.ComponentModel\PasswordPropertyTextAttribute.cs" />
-    <Compile Include="System.ComponentModel\ProgressChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\ProgressChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangingEventArgs.cs" />
-    <Compile Include="System.ComponentModel\PropertyChangingEventHandler.cs" />
-    <Compile Include="System.ComponentModel\PropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\PropertyDescriptorCollection.cs" />
-    <Compile Include="System.ComponentModel\PropertyTabAttribute.cs" />
-    <Compile Include="System.ComponentModel\PropertyTabScope.cs" />
-    <Compile Include="System.ComponentModel\ProvidePropertyAttribute.cs" />
-    <Compile Include="System.ComponentModel\ReadOnlyAttribute.cs" />
-    <Compile Include="System.ComponentModel\RecommendedAsConfigurableAttribute.cs" />
-    <Compile Include="System.ComponentModel\ReferenceConverter.cs" />
-    <Compile Include="System.ComponentModel\ReflectionEventDescriptor.cs" />
-    <Compile Include="System.ComponentModel\ReflectionPropertyDescriptor.cs" />
-    <Compile Include="System.ComponentModel\RefreshEventArgs.cs" />
-    <Compile Include="System.ComponentModel\RefreshEventHandler.cs" />
-    <Compile Include="System.ComponentModel\RefreshProperties.cs" />
-    <Compile Include="System.ComponentModel\RefreshPropertiesAttribute.cs" />
-    <Compile Include="System.ComponentModel\RunInstallerAttribute.cs" />
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventArgs.cs" />
-    <Compile Include="System.ComponentModel\RunWorkerCompletedEventHandler.cs" />
-    <Compile Include="System.ComponentModel\SByteConverter.cs" />
-    <Compile Include="System.ComponentModel\SettingsBindableAttribute.cs" />
-    <Compile Include="System.ComponentModel\SingleConverter.cs" />
-    <Compile Include="System.ComponentModel\StringConverter.cs" />
-    <Compile Include="System.ComponentModel\SyntaxCheck.cs" />
-    <Compile Include="System.ComponentModel\TimeSpanConverter.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemAttribute.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemFilterAttribute.cs" />
-    <Compile Include="System.ComponentModel\ToolboxItemFilterType.cs" />
-    <Compile Include="System.ComponentModel\TypeConverter.cs" />
-    <Compile Include="System.ComponentModel\TypeConverterAttribute.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptionProvider.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptionProviderAttribute.cs" />
-    <Compile Include="System.ComponentModel\TypeDescriptor.cs" />
-    <Compile Include="System.ComponentModel\TypeListConverter.cs" />
-    <Compile Include="System.ComponentModel\UInt16Converter.cs" />
-    <Compile Include="System.ComponentModel\UInt32Converter.cs" />
-    <Compile Include="System.ComponentModel\UInt64Converter.cs" />
-    <Compile Include="System.ComponentModel\WarningException.cs" />
-    <Compile Include="System.ComponentModel\WeakObjectWrapper.cs" />
-    <Compile Include="System.ComponentModel\WeakObjectWrapperComparer.cs" />
-    <Compile Include="System.ComponentModel\Win32Exception.cs" />
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />
-    <Compile Include="System.Configuration\ConfigHelper.cs" />
-    <Compile Include="System.Configuration\ConfigurationException.cs" />
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
-    <Compile Include="System.Configuration\IdnElement.cs" />
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
-    <Compile Include="System.Configuration\IriParsingElement.cs" />
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />
-    <Compile Include="System.Configuration\SettingAttribute.cs" />
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingElement.cs" />
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />
-    <Compile Include="System.Configuration\SettingsBase.cs" />
-    <Compile Include="System.Configuration\SettingsContext.cs" />
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingsManageability.cs" />
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsProperty.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />
-    <Compile Include="System.Configuration\SettingsProvider.cs" />
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />
-    <Compile Include="System.Configuration\SettingValueElement.cs" />
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />
-    <Compile Include="System.Configuration\SpecialSetting.cs" />
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />
-    <Compile Include="System.Configuration\UriSection.cs" />
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />
-    <Compile Include="System.Diagnostics\BooleanSwitch.cs" />
-    <Compile Include="System.Diagnostics\ConsoleTraceListener.cs" />
-    <Compile Include="System.Diagnostics\CorrelationManager.cs" />
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />
-    <Compile Include="System.Diagnostics\CounterSample.cs" />
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />
-    <Compile Include="System.Diagnostics\Debug.cs" />
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />
-    <Compile Include="System.Diagnostics\DelimitedListTraceListener.cs" />
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />
-    <Compile Include="System.Diagnostics\EventInstance.cs" />
-    <Compile Include="System.Diagnostics\EventLog.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />
-    <Compile Include="System.Diagnostics\EventTypeFilter.cs" />
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />
-    <Compile Include="System.Diagnostics\ICollectData.cs" />
-    <Compile Include="System.Diagnostics\InstanceData.cs" />
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />
-    <Compile Include="System.Diagnostics\Process.cs" />
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />
-    <Compile Include="System.Diagnostics\SourceFilter.cs" />
-    <Compile Include="System.Diagnostics\SourceLevels.cs" />
-    <Compile Include="System.Diagnostics\SourceSwitch.cs" />
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />
-    <Compile Include="System.Diagnostics\Switch.cs" />
-    <Compile Include="System.Diagnostics\SwitchAttribute.cs" />
-    <Compile Include="System.Diagnostics\SwitchLevelAttribute.cs" />
-    <Compile Include="System.Diagnostics\TextWriterTraceListener.cs" />
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />
-    <Compile Include="System.Diagnostics\ThreadState.cs" />
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />
-    <Compile Include="System.Diagnostics\Trace.cs" />
-    <Compile Include="System.Diagnostics\TraceEventCache.cs" />
-    <Compile Include="System.Diagnostics\TraceEventType.cs" />
-    <Compile Include="System.Diagnostics\TraceFilter.cs" />
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />
-    <Compile Include="System.Diagnostics\TraceLevel.cs" />
-    <Compile Include="System.Diagnostics\TraceListener.cs" />
-    <Compile Include="System.Diagnostics\TraceListenerCollection.cs" />
-    <Compile Include="System.Diagnostics\TraceOptions.cs" />
-    <Compile Include="System.Diagnostics\TraceSource.cs" />
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />
-    <Compile Include="System.Diagnostics\TraceSwitch.cs" />
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />
-    <Compile Include="System.Diagnostics\XmlWriterTraceListener.cs" />
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />
-    <Compile Include="System.IO.Compression\GZipStream.cs" />
-    <Compile Include="System.IO.Ports\Handshake.cs" />
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />
-    <Compile Include="System.IO.Ports\Parity.cs" />
-    <Compile Include="System.IO.Ports\SerialData.cs" />
-    <Compile Include="System.IO.Ports\SerialError.cs" />
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialPort.cs" />
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />
-    <Compile Include="System.IO.Ports\StopBits.cs" />
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />
-    <Compile Include="System.IO\DefaultWatcher.cs" />
-    <Compile Include="System.IO\ErrorEventArgs.cs" />
-    <Compile Include="System.IO\ErrorEventHandler.cs" />
-    <Compile Include="System.IO\FAMWatcher.cs" />
-    <Compile Include="System.IO\FileAction.cs" />
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />
-    <Compile Include="System.IO\FileSystemWatcher.cs" />
-    <Compile Include="System.IO\IFileWatcher.cs" />
-    <Compile Include="System.IO\InotifyWatcher.cs" />
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />
-    <Compile Include="System.IO\InvalidDataException.cs" />
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />
-    <Compile Include="System.IO\KeventWatcher.cs" />
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />
-    <Compile Include="System.IO\NotifyFilters.cs" />
-    <Compile Include="System.IO\NullFileWatcher.cs" />
-    <Compile Include="System.IO\RenamedEventArgs.cs" />
-    <Compile Include="System.IO\RenamedEventHandler.cs" />
-    <Compile Include="System.IO\SearchPattern.cs" />
-    <Compile Include="System.IO\WaitForChangedResult.cs" />
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />
-    <Compile Include="System.IO\WindowsWatcher.cs" />
-    <Compile Include="System.Media\AudioData.cs" />
-    <Compile Include="System.Media\AudioDevice.cs" />
-    <Compile Include="System.Media\SoundPlayer.cs" />
-    <Compile Include="System.Media\SystemSound.cs" />
-    <Compile Include="System.Media\SystemSounds.cs" />
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />
-    <Compile Include="System.Net.Mail\AlternateView.cs" />
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />
-    <Compile Include="System.Net.Mail\Attachment.cs" />
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />
-    <Compile Include="System.Net.Mail\MailAddress.cs" />
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />
-    <Compile Include="System.Net.Mail\MailMessage.cs" />
-    <Compile Include="System.Net.Mail\MailPriority.cs" />
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />
-    <Compile Include="System.Net.Mail\SmtpException.cs" />
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />
-    <Compile Include="System.Net.Mime\ContentType.cs" />
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />
-    <Compile Include="System.Net.Sockets\Socket.cs" />
-    <Compile Include="System.Net.Sockets\Socket_2_1.cs" />
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />
-    <Compile Include="System.Net.Sockets\SocketError.cs" />
-    <Compile Include="System.Net.Sockets\SocketException.cs" />
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />
-    <Compile Include="System.Net.Sockets\SocketOptionName.cs" />
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />
-    <Compile Include="System.Net.Sockets\SocketType.cs" />
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="System.Net.WebSockets\StreamWebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />
-    <Compile Include="System.Net\Authorization.cs" />
-    <Compile Include="System.Net\BasicClient.cs" />
-    <Compile Include="System.Net\BindIPEndPoint.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ChunkStream.cs" />
-    <Compile Include="System.Net\ConnectionModes.cs" />
-    <Compile Include="System.Net\Cookie.cs" />
-    <Compile Include="System.Net\CookieCollection.cs" />
-    <Compile Include="System.Net\CookieContainer.cs" />
-    <Compile Include="System.Net\CookieException.cs" />
-    <Compile Include="System.Net\CookieParser.cs" />
-    <Compile Include="System.Net\CredentialCache.cs" />
-    <Compile Include="System.Net\DecompressionMethods.cs" />
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />
-    <Compile Include="System.Net\DigestClient.cs" />
-    <Compile Include="System.Net\Dns.cs" />
-    <Compile Include="System.Net\DnsAsyncResult.cs" />
-    <Compile Include="System.Net\DnsEndPoint.cs" />
-    <Compile Include="System.Net\DnsPermission.cs" />
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />
-    <Compile Include="System.Net\DownloadDataCompletedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadDataCompletedEventHandler.cs" />
-    <Compile Include="System.Net\DownloadProgressChangedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadProgressChangedEventHandler.cs" />
-    <Compile Include="System.Net\DownloadStringCompletedEventArgs.cs" />
-    <Compile Include="System.Net\DownloadStringCompletedEventHandler.cs" />
-    <Compile Include="System.Net\EndPoint.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\EndpointPermission.cs" />
-    <Compile Include="System.Net\FileWebRequest.cs" />
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />
-    <Compile Include="System.Net\FileWebResponse.cs" />
-    <Compile Include="System.Net\FtpAsyncResult.cs" />
-    <Compile Include="System.Net\FtpDataStream.cs" />
-    <Compile Include="System.Net\FtpRequestCreator.cs" />
-    <Compile Include="System.Net\FtpStatus.cs" />
-    <Compile Include="System.Net\FtpStatusCode.cs" />
-    <Compile Include="System.Net\FtpWebRequest.cs" />
-    <Compile Include="System.Net\FtpWebResponse.cs" />
-    <Compile Include="System.Net\GlobalProxySelection.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpContinueDelegate.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerException.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpRequestCreator.cs" />
-    <Compile Include="System.Net\HttpRequestHeader.cs" />
-    <Compile Include="System.Net\HttpResponseHeader.cs" />
-    <Compile Include="System.Net\HttpStatusCode.cs" />
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />
-    <Compile Include="System.Net\HttpUtility.cs" />
-    <Compile Include="System.Net\HttpVersion.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\IAuthenticationModule.cs" />
-    <Compile Include="System.Net\ICertificatePolicy.cs" />
-    <Compile Include="System.Net\ICredentialLookup.cs" />
-    <Compile Include="System.Net\ICredentialPolicy.cs" />
-    <Compile Include="System.Net\ICredentialsByHost.cs" />
-    <Compile Include="System.Net\IPAddress.cs" />
-    <Compile Include="System.Net\IPEndPoint.cs" />
-    <Compile Include="System.Net\IPHostEntry.cs" />
-    <Compile Include="System.Net\IPv6Address.cs" />
-    <Compile Include="System.Net\IWebConnectionState.cs" />
-    <Compile Include="System.Net\IWebProxy.cs" />
-    <Compile Include="System.Net\IWebProxyScript.cs" />
-    <Compile Include="System.Net\IWebRequestCreate.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\ListenerPrefix.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoHttpDate.cs" />
-    <Compile Include="System.Net\NetConfig.cs" />
-    <Compile Include="System.Net\NetworkAccess.cs" />
-    <Compile Include="System.Net\NetworkCredential.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\OpenReadCompletedEventArgs.cs" />
-    <Compile Include="System.Net\OpenReadCompletedEventHandler.cs" />
-    <Compile Include="System.Net\OpenWriteCompletedEventArgs.cs" />
-    <Compile Include="System.Net\OpenWriteCompletedEventHandler.cs" />
-    <Compile Include="System.Net\ProtocolViolationException.cs" />
-    <Compile Include="System.Net\RequestStream.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\SecurityProtocolType.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\SimpleAsyncResult.cs" />
-    <Compile Include="System.Net\SocketAddress.cs" />
-    <Compile Include="System.Net\SocketPermission.cs" />
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />
-    <Compile Include="System.Net\TransportContext.cs" />
-    <Compile Include="System.Net\TransportType.cs" />
-    <Compile Include="System.Net\UploadDataCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadDataCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadFileCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadFileCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadProgressChangedEventArgs.cs" />
-    <Compile Include="System.Net\UploadProgressChangedEventHandler.cs" />
-    <Compile Include="System.Net\UploadStringCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadStringCompletedEventHandler.cs" />
-    <Compile Include="System.Net\UploadValuesCompletedEventArgs.cs" />
-    <Compile Include="System.Net\UploadValuesCompletedEventHandler.cs" />
-    <Compile Include="System.Net\WebAsyncResult.cs" />
-    <Compile Include="System.Net\WebClient.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionData.cs" />
-    <Compile Include="System.Net\WebConnectionGroup.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebException.cs" />
-    <Compile Include="System.Net\WebExceptionStatus.cs" />
-    <Compile Include="System.Net\WebHeaderCollection.cs" />
-    <Compile Include="System.Net\WebPermission.cs" />
-    <Compile Include="System.Net\WebPermissionAttribute.cs" />
-    <Compile Include="System.Net\WebProxy.cs" />
-    <Compile Include="System.Net\WebRequest.cs" />
-    <Compile Include="System.Net\WebRequestMethods.cs" />
-    <Compile Include="System.Net\WebResponse.cs" />
-    <Compile Include="System.Net\WebUtility.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />
-    <Compile Include="System.Runtime.Versioning\FrameworkName.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\Oid.cs" />
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />
-    <Compile Include="System.Text.RegularExpressions\arch.cs" />
-    <Compile Include="System.Text.RegularExpressions\BaseMachine.cs" />
-    <Compile Include="System.Text.RegularExpressions\cache.cs" />
-    <Compile Include="System.Text.RegularExpressions\Capture.cs" />
-    <Compile Include="System.Text.RegularExpressions\CaptureCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\category.cs" />
-    <Compile Include="System.Text.RegularExpressions\CILCompiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\compiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\debug.cs" />
-    <Compile Include="System.Text.RegularExpressions\Group.cs" />
-    <Compile Include="System.Text.RegularExpressions\GroupCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\interpreter.cs" />
-    <Compile Include="System.Text.RegularExpressions\interval.cs" />
-    <Compile Include="System.Text.RegularExpressions\Match.cs" />
-    <Compile Include="System.Text.RegularExpressions\MatchCollection.cs" />
-    <Compile Include="System.Text.RegularExpressions\MatchEvaluator.cs" />
-    <Compile Include="System.Text.RegularExpressions\parser.cs" />
-    <Compile Include="System.Text.RegularExpressions\quicksearch.cs" />
-    <Compile Include="System.Text.RegularExpressions\Regex.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexCompilationInfo.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexMatchTimeoutException.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexOptions.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexRunner.cs" />
-    <Compile Include="System.Text.RegularExpressions\RegexRunnerFactory.cs" />
-    <Compile Include="System.Text.RegularExpressions\replace.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxCompiler.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxInterpreter.cs" />
-    <Compile Include="System.Text.RegularExpressions\RxOp.cs" />
-    <Compile Include="System.Text.RegularExpressions\syntax.cs" />
-    <Compile Include="System.Threading\Barrier.cs" />
-    <Compile Include="System.Threading\BarrierPostPhaseException.cs" />
-    <Compile Include="System.Threading\Semaphore.cs" />
-    <Compile Include="System.Threading\SemaphoreFullException.cs" />
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />
-    <Compile Include="System.Timers\ElapsedEventHandler.cs" />
-    <Compile Include="System.Timers\Timer.cs" />
-    <Compile Include="System.Timers\TimersDescriptionAttribute.cs" />
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
-    <Compile Include="System.Windows.Input\ICommand.cs" />
-    <Compile Include="System\DefaultUriParser.cs" />
-    <Compile Include="System\FileStyleUriParser.cs" />
-    <Compile Include="System\FtpStyleUriParser.cs" />
-    <Compile Include="System\GenericUriParser.cs" />
-    <Compile Include="System\GenericUriParserOptions.cs" />
-    <Compile Include="System\GopherStyleUriParser.cs" />
-    <Compile Include="System\HttpStyleUriParser.cs" />
-    <Compile Include="System\IUriData.cs" />
-    <Compile Include="System\LdapStyleUriParser.cs" />
-    <Compile Include="System\NetPipeStyleUriParser.cs" />
-    <Compile Include="System\NetTcpStyleUriParser.cs" />
-    <Compile Include="System\NewsStyleUriParser.cs" />
-    <Compile Include="System\Platform.cs" />
-    <Compile Include="System\SRDescriptionAttribute.cs" />
-    <Compile Include="System\Uri.cs" />
-    <Compile Include="System\UriBuilder.cs" />
-    <Compile Include="System\UriComponents.cs" />
-    <Compile Include="System\UriData.cs" />
-    <Compile Include="System\UriElements.cs" />
-    <Compile Include="System\UriFormat.cs" />
-    <Compile Include="System\UriFormatException.cs" />
-    <Compile Include="System\UriHostNameType.cs" />
-    <Compile Include="System\UriIdnScope.cs" />
-    <Compile Include="System\UriKind.cs" />
-    <Compile Include="System\UriParseComponents.cs" />
-    <Compile Include="System\UriParser.cs" />
-    <Compile Include="System\UriPartial.cs" />
-    <Compile Include="System\UriTypeConverter.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 Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="../corlib/corlib-build.csproj">
-      <Project>{594C95E0-0B98-4CF3-B13F-ADEAF8D88968}</Project>
-      <Name>corlib\corlib-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="../System.XML/System.Xml-bare-build.csproj">
-      <Project>{20A32333-D767-41D0-BB6B-9E2DE296EF10}</Project>
-      <Name>System.XML\System.Xml-bare-build</Name>
-    </ProjectReference>
-    <ProjectReference Include="System-build.csproj">
-      <Project>{1F4CF6D1-51F5-420D-9F19-285609B2F2CA}</Project>
-      <Name>System\System-build</Name>
-      <Aliases>PrebuiltSystem</Aliases>    </ProjectReference>
-    <ProjectReference Include="../Mono.Security/Mono.Security-basic.csproj">
-      <Project>{75FAE38B-6CBC-40B3-AAD7-FF0ACD2C94BD}</Project>
-      <Name>Mono.Security\Mono.Security-basic</Name>
-      <Aliases>MonoSecurity</Aliases>    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="resources/Asterisk.wav">
-      <LogicalName>Asterisk.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Beep.wav">
-      <LogicalName>Beep.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Exclamation.wav">
-      <LogicalName>Exclamation.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Hand.wav">
-      <LogicalName>Hand.wav</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/Question.wav">
-      <LogicalName>Question.wav</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/System/System-secxml-net_4_x.csproj b/mcs/class/System/System-secxml-net_4_x.csproj
index 39f6fc430a0..16f5809c708 100644
--- a/mcs/class/System/System-secxml-net_4_x.csproj
+++ b/mcs/class/System/System-secxml-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x/secxml</OutputPath>
+    <IntermediateOutputPath>obj-secxml</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -25,7 +28,7 @@
     <DebugType>full</DebugType>
     <NoWarn>1699,618</NoWarn>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;MONO_X509_ALIAS</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -33,7 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699,618</NoWarn>
     <Optimize>true</Optimize>
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;MONO_X509_ALIAS</DefineConstants>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -45,555 +48,671 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayCreateExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayIndexerExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAssignStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttachEventStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgument.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgumentCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclaration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclarationCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBaseReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCastExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClause.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClauseCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeChecksumPragma.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeComment.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCompileUnit.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConditionStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConstructor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDefaultValueExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateCreateExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateInvokeExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectionExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectiveCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEntryPointMethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEventReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeFieldReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeGotoStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIndexerExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIterationStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLabeledStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLinePragma.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberField.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberMethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberProperty.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodInvokeExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\codemethodreferenceexpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodReturnStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImportCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObjectCreateExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpressionCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePrimitiveExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertyReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertySetValueReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionDirective.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRemoveEventStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetCompileUnit.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetTypeMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatementCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThisReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThrowExceptionStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTryCatchFinallyStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeConstructor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclaration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclarationCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDelegate.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMember.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMemberCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeOfExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameterCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReference.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableDeclarationStatement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableReferenceExpression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGeneratorOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeValidator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerError.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerErrorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerParameters.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratedCodeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratorSupport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeGenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\IndentTextWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\LanguageOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\FieldDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\MemberAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\bithelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\debugview.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\iset.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\linkedlist.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\queue.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sorteddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedlist.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedset.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedsetdebugview.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\stack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\throwhelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\observablecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\readonlyobservablecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\bitvector32.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\casesensitivestringdictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\collectionsutil.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\fixedstringlookup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\hybriddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\inotifycollectionchanged.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\iordereddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\listdictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\nameobjectcollectionbase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\namevaluecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\notifycollectionchangedeventargs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\ordereddictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringcollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionarywithcomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AmbientValueAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArrayConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArraySubsetEnumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BackgroundWorker.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BaseComponentEditor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\basenumberconverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableSupport.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BooleanConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BrowsableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ByteConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CategoryAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CharConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeAction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComplexBindingPropertiesAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CompModSwitches.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Component.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentResourceManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Container.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ContainerFilterService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CultureInfoConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CustomTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataErrorsChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectFieldAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeOffsetConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugExtendedPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DecimalConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultBindingPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultEventAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultValueAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DelegatingTypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DescriptionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CheckoutException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CommandID.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransaction.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerb.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerbCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContextSerializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpContextType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentChangeService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentDiscoveryService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentInitializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesigner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerEventService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHost.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHostTransactionState.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerOptionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDictionaryService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IEventPropertyService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderListService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderProviderService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IHelpService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IInheritanceService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IMenuCommandService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IReferenceService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IResourceService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IRootDesigner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ISelectionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IServiceObjectContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITreeDesigner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDescriptorFilterService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDiscoveryService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeResolutionService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\MenuCommand.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabScope.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\SelectionTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ComponentSerializationService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ContextStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DefaultSerializationProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerLoader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerSerializerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderHost.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\INameCreationService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\InstanceDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\MemberRelationshipService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\RootDesignerSerializerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\SerializationStore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceCreatorCallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceObjectContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardCommands.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardToolWindows.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ToolboxItemAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ViewTechnology.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerCategoryAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibilityAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignOnlyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignTimeVisibleAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DisplayNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoubleConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorBrowsableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EnumConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventHandlerList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExpandableObjectConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtendedPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtenderProvidedPropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\FxCopSuppression.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\GuidConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingListView.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICancelAddNew.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IChangeTracking.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComNativeDescriptorHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComponent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICustomTypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IDataErrorInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IEditableObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IExtenderProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IIntellisenseBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IListSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ImmutableObjectAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedSite.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InitializationEventAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyDataErrorInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanged.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanging.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstallerTypeAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstanceCreationEditor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int16Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int32Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int64Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IntSecurity.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidAsynchronousStateException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidEnumArgumentException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRaiseItemChangedEvents.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRevertibleChangeTracking.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISite.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitialize.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitializeNotification.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISynchronizeInvoke.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypeDescriptorContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypedList.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\License.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseUsageMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicFileLicenseProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListBindableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescription.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescriptionCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDirection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LocalizableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LookupBindingPropertiesAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MarshalByValueComponent.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextResultHint.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MemberDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MergablePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MultilineStringConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NestedContainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NullableConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PasswordPropertyTextAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptorCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProvidePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReadOnlyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RecommendedAsConfigurableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReferenceConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectEventDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectPropertyDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectTypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunInstallerAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SByteConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SettingsBindableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SingleConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\StringConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SyntaxCheck.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TimeSpanConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverterAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderService.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeListConverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt16Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt32Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt64Converter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\WarningException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Debug.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DelimitedListTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DiagnosticsConfiguration.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ListenerElementsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SeverityFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceLevels.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceSwitch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Switch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchLevelAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TextWriterTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Trace.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventCache.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceFilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceInternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListeners.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\traceutils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\hresults.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\invariantcomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\PrivilegedConfigurationManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\SecurityUtils.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\misc\WeakHashtable.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LoggingObject.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Cache\RequestCachePolicy.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookie.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecontainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookieexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\HttpListenerRequestUriBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Internal.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\Base64Stream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\Base64WriteStateInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\BaseWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\BufferBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\ClosableStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\ContentDisposition.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\ContentType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\DelegatedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\DispositionTypeNames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\EightBitStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\EncodedStreamFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\HeaderCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\IEncodableStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MailBnfHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MailHeaderInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\mediatypenames.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeBasePart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeEmbeddedMessagePart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeMultiPart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeMultiPartType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimePart.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MimeWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\MultiAsyncResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\QEncodedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\QuotedPrintableStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\SmtpDateTime.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\TrackingStringDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\TrackingValidationObjectDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\TransferEncoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\mail\WriteStateInfoBase.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceStatistics.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\ScopeLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\AuthenticatedStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\NegotiateEnumTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\ServicePointManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SocketException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\AddressFamily.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IOControlCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IPPacketInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IPProtectionLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\LingerOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\MulticastOption.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\NetworkStream.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\ProtocolFamily.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\ProtocolType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SelectMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketErrors.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketInformation.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketInformationOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionLevel.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketShutdown.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\TransmitFileFlags.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\UdpReceiveResult.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\webclient.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WebPermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WebUtility.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WriteStreamClosedEventArgs.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\UriEnumTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\URIFormatException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\UriHostNameType.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\net\System\URIPartial.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchTimeoutException.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\monitoring\system\diagnosticts\AsyncStreamReader.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\ElapsedEventHandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\Timer.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\TimersDescriptionAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\interopservices\DefaultParameterValueAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\interopservices\handlecollector.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\versioning\FrameworkName.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\threading\Barrier.cs" />
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\referencesource\System\compmod\microsoft\win32\safehandles\SafeProcessHandle.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArrayCreateExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArrayIndexerExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAssignStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttachEventStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeArgument.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeArgumentCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeDeclaration.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeAttributeDeclarationCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeBaseReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeBinaryOperatorExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeBinaryOperatorType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCastExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCatchClause.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCatchClauseCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeChecksumPragma.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeComment.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCommentStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCommentStatementCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeCompileUnit.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeConditionStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeConstructor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDefaultValueExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDelegateCreateExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDelegateInvokeExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDirectionExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDirective.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeDirectiveCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeEntryPointMethod.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeEventReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeExpressionCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeExpressionStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeFieldReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeGotoStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeIndexerExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeIterationStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeLabeledStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeLinePragma.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberField.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberMethod.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMemberProperty.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMethodInvokeExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\codemethodreferenceexpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeMethodReturnStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespace.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespaceCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespaceImport.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeNamespaceImportCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeObject.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeObjectCreateExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpressionCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodePrimitiveExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodePropertyReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodePropertySetValueReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeRegionDirective.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeRegionMode.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeRemoveEventStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetCompileUnit.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeSnippetTypeMember.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeStatementCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeThisReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeThrowExceptionStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTryCatchFinallyStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeConstructor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeDeclaration.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeDeclarationCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeDelegate.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeMember.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeMemberCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeOfExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeParameter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeParameterCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeReference.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeReferenceCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeTypeReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeVariableDeclarationStatement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\CodeVariableReferenceExpression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CodeGenerator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CodeGeneratorOptions.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CodeValidator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CompilerError.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CompilerErrorCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\CompilerParameters.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\GeneratedCodeAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\GeneratorSupport.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\ICodeCompiler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\ICodeGenerator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\ICodeParser.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\IndentTextWriter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\compiler\LanguageOptions.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\FieldDirection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\codedom\MemberAttributes.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\bithelper.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\debugview.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\iset.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\linkedlist.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\queue.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sorteddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sortedlist.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sortedset.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\sortedsetdebugview.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\stack.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\generic\throwhelper.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\objectmodel\observablecollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\objectmodel\readonlyobservablecollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\bitvector32.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\casesensitivestringdictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\collectionsutil.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\fixedstringlookup.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\hybriddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\inotifycollectionchanged.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\iordereddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\listdictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\nameobjectcollectionbase.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\namevaluecollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\notifycollectionchangedeventargs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\ordereddictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\stringcollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\stringdictionary.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\collections\specialized\stringdictionarywithcomparer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AddingNewEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AddingNewEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AmbientValueAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ArrayConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ArraySubsetEnumerator.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncOperation.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AsyncOperationManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AttributeCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\AttributeProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BackgroundWorker.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BaseComponentEditor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\basenumberconverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindableSupport.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindingDirection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BindingList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BooleanConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\BrowsableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ByteConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CancelEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CancelEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CategoryAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CharConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionChangeAction.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionChangeEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionChangeEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CollectionConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComplexBindingPropertiesAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CompModSwitches.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Component.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComponentCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComponentConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ComponentResourceManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Container.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ContainerFilterService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CultureInfoConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\CustomTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataErrorsChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectFieldAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DataObjectMethodType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DateTimeConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DateTimeOffsetConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugExtendedPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DecimalConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultBindingPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultEventAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DefaultValueAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DelegatingTypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\CheckoutException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\CommandID.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerTransaction.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEvent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerVerb.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerVerbCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContext.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContextSerializer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DocumentCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DocumentEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DocumentEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\HelpContextType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\HelpKeywordAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\HelpKeywordType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IComponentChangeService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IComponentDiscoveryService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IComponentInitializer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesigner.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerEventService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerHost.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerHostTransactionState.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDesignerOptionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IDictionaryService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IEventPropertyService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IExtenderListService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IExtenderProviderService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IHelpService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IInheritanceService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IMenuCommandService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\InheritanceAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\InheritanceLevel.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IReferenceService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IResourceService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IRootDesigner.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ISelectionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\IServiceObjectContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITreeDesigner.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITypeDescriptorFilterService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITypeDiscoveryService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ITypeResolutionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\MenuCommand.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\PropertyTabAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\PropertyTabScope.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\SelectionTypes.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ComponentSerializationService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ContextStack.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\DefaultSerializationProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerLoader.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerSerializerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderHost.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\INameCreationService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\InstanceDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\MemberRelationshipService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\RootDesignerSerializerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\serialization\SerializationStore.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ServiceCreatorCallback.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ServiceObjectContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\StandardCommands.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\StandardToolWindows.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ToolboxItemAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ViewTechnology.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerCategoryAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibility.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibilityAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignOnlyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignTimeVisibleAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DisplayNameAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoubleConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EditorAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EditorBrowsableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EnumConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EventDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EventDescriptorCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\EventHandlerList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ExpandableObjectConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ExtendedPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ExtenderProvidedPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\FxCopSuppression.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\GuidConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\HandledEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\HandledEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IBindingList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IBindingListView.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ICancelAddNew.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IChangeTracking.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IComNativeDescriptorHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IComponent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ICustomTypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IDataErrorInfo.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IEditableObject.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IExtenderProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IIntellisenseBuilder.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IListSource.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ImmutableObjectAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INestedContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INestedSite.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InitializationEventAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INotifyDataErrorInfo.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanged.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanging.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InstallerTypeAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InstanceCreationEditor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Int16Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Int32Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Int64Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IntSecurity.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InvalidAsynchronousStateException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\InvalidEnumArgumentException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IRaiseItemChangedEvents.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\IRevertibleChangeTracking.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISite.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISupportInitialize.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISupportInitializeNotification.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ISynchronizeInvoke.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ITypeDescriptorContext.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ITypedList.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\License.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseContext.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicenseUsageMode.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LicFileLicenseProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListBindableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListChangedType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListSortDescription.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListSortDescriptionCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ListSortDirection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LocalizableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\LookupBindingPropertiesAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MarshalByValueComponent.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MaskedTextProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MaskedTextResultHint.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MemberDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MergablePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\MultilineStringConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\NestedContainer.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\NullableConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PasswordPropertyTextAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ProgressChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ProgressChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangingEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyChangingEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\PropertyDescriptorCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ProvidePropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReadOnlyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RecommendedAsConfigurableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReferenceConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReflectEventDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReflectPropertyDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ReflectTypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RefreshEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RefreshEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RunInstallerAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SByteConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SettingsBindableAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SingleConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\StringConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\SyntaxCheck.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TimeSpanConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeConverterAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptionProvider.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeListConverter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\UInt16Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\UInt32Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\UInt64Converter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\WarningException.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\Debug.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\DelimitedListTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\DiagnosticsConfiguration.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\ListenerElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SeverityFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceLevels.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceSwitch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\Switch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchLevelAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TextWriterTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\Trace.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceEventCache.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceEventType.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceFilter.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceInternal.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceLevel.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceListeners.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceOptions.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\traceutils.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />
+    <Compile Include="..\referencesource\System\misc\hresults.cs" />
+    <Compile Include="..\referencesource\System\misc\invariantcomparer.cs" />
+    <Compile Include="..\referencesource\System\misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System\misc\SecurityUtils.cs" />
+    <Compile Include="..\referencesource\System\misc\WeakHashtable.cs" />
+    <Compile Include="..\referencesource\System\net\System\_DomainName.cs" />
+    <Compile Include="..\referencesource\System\net\System\_IPv4Address.cs" />
+    <Compile Include="..\referencesource\System\net\System\_IPv6Address.cs" />
+    <Compile Include="..\referencesource\System\net\System\_UncName.cs" />
+    <Compile Include="..\referencesource\System\net\System\_UriSyntax.cs" />
+    <Compile Include="..\referencesource\System\net\System\GenericUriParser.cs" />
+    <Compile Include="..\referencesource\System\net\System\IriHelper.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_Connection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_emptywebproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfoTable.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HTTPDateParse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_IStreams.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LoggingObject.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_NetRes.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_PooledStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_ProxyChain.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_Semaphore.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_TimerThread.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_WebProxyDataBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\AuthenticationScheme.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\AuthenticationSchemeSelector.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Authorization.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCache.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCacheEntry.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCacheManager.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCachePolicy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Configuration\DefaultProxySection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\connectionpool.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookie.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookiecollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookiecontainer.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookieexception.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\CredentialCache.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\DnsEndPoint.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\EndPoint.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\filewebrequest.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\filewebresponse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\FtpStatusCode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\GlobalProxySelection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpListenerException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpListenerRequestUriBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpRequestHeader.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpResponseHeader.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpStatusCode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\HttpVersion.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IAuthenticationModule.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ICertificatePolicy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ICredentials.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ICredentialsByHost.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Internal.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IPAddress.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IPEndPoint.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IPHostEntry.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\iwebproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IWebProxyFinder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\IWebRequestCreate.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\Base64Stream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\Base64WriteStateInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\BaseWriter.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\BufferBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\ClosableStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\ContentDisposition.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\ContentType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\DelegatedStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\DispositionTypeNames.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\EightBitStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\EncodedStreamFactory.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\HeaderCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\IEncodableStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MailBnfHelper.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MailHeaderInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\mediatypenames.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeBasePart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeEmbeddedMessagePart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeMultiPart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeMultiPartType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimePart.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MimeWriter.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\MultiAsyncResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\QEncodedStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\QuotedPrintableStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\SmtpDateTime.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\TrackingStringDictionary.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\TrackingValidationObjectDictionary.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\TransferEncoding.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\mail\WriteStateInfoBase.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkAccess.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\DuplicateAddressDetectionState.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\GatewayIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\GatewayIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV4Statistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV6Statistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\interfacetype.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPGlobalProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPGlobalStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPStatus.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPv4InterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPv6InterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\MulticastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\MulticastIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkAddressChange.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInformationException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInformationPermission.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInterface.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInterfaceComponent.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\nodetype.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\OperationalStatus.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PhysicalAddress.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\pingexception.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PingOptions.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PingReply.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PrefixOrigin.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\ScopeLevel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SuffixOrigin.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemGatewayIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemMulticastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemTcpConnection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\SystemUnicastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\TcpConnection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\TcpState.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\TcpStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UdpStatistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ProtocolViolationException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\AuthenticatedStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\NegotiateEnumTypes.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\ServicePointManager.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SocketAddress.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\SocketException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\AddressFamily.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\IOControlCode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\IPPacketInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\IPProtectionLevel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\LingerOption.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\MulticastOption.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\NetworkStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\ProtocolFamily.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\ProtocolType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SelectMode.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketErrors.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketFlags.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketInformation.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketInformationOptions.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketOptionLevel.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketShutdown.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TransmitFileFlags.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UdpReceiveResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\TransportContext.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\TransportType.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\webclient.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebException.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebExceptionStatus.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebHeaderCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebPermission.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\webproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebRequest.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebRequestMethods.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebResponse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WebUtility.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\WriteStreamClosedEventArgs.cs" />
+    <Compile Include="..\referencesource\System\net\System\URI.cs" />
+    <Compile Include="..\referencesource\System\net\System\uribuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriEnumTypes.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriExt.cs" />
+    <Compile Include="..\referencesource\System\net\System\URIFormatException.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriHelper.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriHostNameType.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriParserTemplates.cs" />
+    <Compile Include="..\referencesource\System\net\System\URIPartial.cs" />
+    <Compile Include="..\referencesource\System\net\System\UriScheme.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexMatchTimeoutException.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />
+    <Compile Include="..\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\Authentication\ExtendedProtection\TokenBinding.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\cryptography\oid.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\cryptography\x509\x509utils.cs" />
+    <Compile Include="..\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\AsyncStreamReader.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\Process.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\ProcessStartInfo.cs" />
+    <Compile Include="..\referencesource\System\services\monitoring\system\diagnosticts\processwaithandle.cs" />
+    <Compile Include="..\referencesource\System\services\timers\system\timers\ElapsedEventHandler.cs" />
+    <Compile Include="..\referencesource\System\services\timers\system\timers\Timer.cs" />
+    <Compile Include="..\referencesource\System\services\timers\system\timers\TimersDescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />
+    <Compile Include="..\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />
+    <Compile Include="..\referencesource\System\sys\system\IO\ports\InternalResources.cs" />
+    <Compile Include="..\referencesource\System\sys\system\runtime\interopservices\DefaultParameterValueAttribute.cs" />
+    <Compile Include="..\referencesource\System\sys\system\runtime\interopservices\handlecollector.cs" />
+    <Compile Include="..\referencesource\System\sys\system\runtime\versioning\FrameworkName.cs" />
+    <Compile Include="..\referencesource\System\sys\system\threading\Barrier.cs" />
+    <Compile Include="..\referencesource\System\sys\system\threading\semaphore.cs" />
+    <Compile Include="..\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
@@ -662,12 +781,17 @@
     <Compile Include="ReferenceSources\_SslState.cs" />
     <Compile Include="ReferenceSources\_SslStream.cs" />
     <Compile Include="ReferenceSources\AssertWrapper.cs" />
+    <Compile Include="ReferenceSources\AutoWebProxyScriptEngine.cs" />
     <Compile Include="ReferenceSources\BinaryCompatibility.cs" />
+    <Compile Include="ReferenceSources\CAPI.cs" />
     <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />
+    <Compile Include="ReferenceSources\EnvironmentHelpers.cs" />
+    <Compile Include="ReferenceSources\HttpApi.cs" />
     <Compile Include="ReferenceSources\HttpSysSettings.cs" />
     <Compile Include="ReferenceSources\Internal.cs" />
     <Compile Include="ReferenceSources\Logging.cs" />
     <Compile Include="ReferenceSources\NativeMethods.cs" />
+    <Compile Include="ReferenceSources\RequestCacheProtocol.cs" />
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />
     <Compile Include="ReferenceSources\Socket.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
@@ -677,8 +801,6 @@
     <Compile Include="ReferenceSources\SSPIConfiguration.cs" />
     <Compile Include="ReferenceSources\SSPISafeHandles.cs" />
     <Compile Include="ReferenceSources\SSPIWrapper.cs" />
-    <Compile Include="ReferenceSources\SystemNetworkCredential.cs" />
-    <Compile Include="ReferenceSources\WebHeaderCollectionType.cs" />
     <Compile Include="ReferenceSources\Win32Exception.cs" />
     <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />
     <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />
@@ -917,53 +1039,25 @@
     <Compile Include="System.Net.Mail\SmtpPermission.cs" />
     <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />
     <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />
     <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />
     <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />
     <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />
     <Compile Include="System.Net.NetworkInformation\Ping.cs" />
     <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />
     <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />
     <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />
     <Compile Include="System.Net.Security\EncryptionPolicy.cs" />
     <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />
@@ -993,101 +1087,62 @@
     <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />
     <Compile Include="System.Net.WebSockets\WebSocketState.cs" />
     <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />
-    <Compile Include="System.Net\Authorization.cs" />
     <Compile Include="System.Net\BasicClient.cs" />
     <Compile Include="System.Net\BindIPEndPoint.cs" />
     <Compile Include="System.Net\ChunkedInputStream.cs" />
     <Compile Include="System.Net\ChunkStream.cs" />
-    <Compile Include="System.Net\ConnectionModes.cs" />
-    <Compile Include="System.Net\CredentialCache.cs" />
     <Compile Include="System.Net\DecompressionMethods.cs" />
     <Compile Include="System.Net\DefaultCertificatePolicy.cs" />
     <Compile Include="System.Net\DigestClient.cs" />
     <Compile Include="System.Net\Dns.cs" />
     <Compile Include="System.Net\DnsAsyncResult.cs" />
-    <Compile Include="System.Net\DnsEndPoint.cs" />
     <Compile Include="System.Net\DnsPermission.cs" />
     <Compile Include="System.Net\DnsPermissionAttribute.cs" />
-    <Compile Include="System.Net\EndPoint.cs" />
     <Compile Include="System.Net\EndPointListener.cs" />
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\EndpointPermission.cs" />
-    <Compile Include="System.Net\FileWebRequest.cs" />
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />
-    <Compile Include="System.Net\FileWebResponse.cs" />
     <Compile Include="System.Net\FtpAsyncResult.cs" />
     <Compile Include="System.Net\FtpDataStream.cs" />
     <Compile Include="System.Net\FtpRequestCreator.cs" />
     <Compile Include="System.Net\FtpStatus.cs" />
-    <Compile Include="System.Net\FtpStatusCode.cs" />
     <Compile Include="System.Net\FtpWebRequest.cs" />
     <Compile Include="System.Net\FtpWebResponse.cs" />
-    <Compile Include="System.Net\GlobalProxySelection.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
     <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerException.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
     <Compile Include="System.Net\HttpListenerRequest.cs" />
     <Compile Include="System.Net\HttpListenerResponse.cs" />
     <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
     <Compile Include="System.Net\HttpRequestCreator.cs" />
-    <Compile Include="System.Net\HttpRequestHeader.cs" />
-    <Compile Include="System.Net\HttpResponseHeader.cs" />
-    <Compile Include="System.Net\HttpStatusCode.cs" />
     <Compile Include="System.Net\HttpStreamAsyncResult.cs" />
-    <Compile Include="System.Net\HttpVersion.cs" />
     <Compile Include="System.Net\HttpWebRequest.cs" />
     <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\IAuthenticationModule.cs" />
-    <Compile Include="System.Net\ICertificatePolicy.cs" />
-    <Compile Include="System.Net\ICredentialLookup.cs" />
     <Compile Include="System.Net\ICredentialPolicy.cs" />
-    <Compile Include="System.Net\ICredentialsByHost.cs" />
-    <Compile Include="System.Net\IPAddress.cs" />
-    <Compile Include="System.Net\IPEndPoint.cs" />
-    <Compile Include="System.Net\IPHostEntry.cs" />
     <Compile Include="System.Net\IPv6Address.cs" />
     <Compile Include="System.Net\IWebConnectionState.cs" />
-    <Compile Include="System.Net\IWebProxy.cs" />
     <Compile Include="System.Net\IWebProxyScript.cs" />
-    <Compile Include="System.Net\IWebRequestCreate.cs" />
     <Compile Include="System.Net\ListenerAsyncResult.cs" />
     <Compile Include="System.Net\ListenerPrefix.cs" />
     <Compile Include="System.Net\MacProxy.cs" />
     <Compile Include="System.Net\MonoHttpDate.cs" />
     <Compile Include="System.Net\NetConfig.cs" />
-    <Compile Include="System.Net\NetworkAccess.cs" />
     <Compile Include="System.Net\NetworkCredential.cs" />
     <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ProtocolViolationException.cs" />
     <Compile Include="System.Net\RequestStream.cs" />
     <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\SecurityProtocolType.cs" />
     <Compile Include="System.Net\ServicePoint.cs" />
     <Compile Include="System.Net\ServicePointManager.cs" />
     <Compile Include="System.Net\ServicePointManager.extra.cs" />
     <Compile Include="System.Net\SimpleAsyncResult.cs" />
-    <Compile Include="System.Net\SocketAddress.cs" />
     <Compile Include="System.Net\SocketPermission.cs" />
     <Compile Include="System.Net\SocketPermissionAttribute.cs" />
-    <Compile Include="System.Net\TransportContext.cs" />
-    <Compile Include="System.Net\TransportType.cs" />
     <Compile Include="System.Net\WebAsyncResult.cs" />
     <Compile Include="System.Net\WebConnection.cs" />
     <Compile Include="System.Net\WebConnectionData.cs" />
     <Compile Include="System.Net\WebConnectionGroup.cs" />
     <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebException.cs" />
-    <Compile Include="System.Net\WebExceptionStatus.cs" />
-    <Compile Include="System.Net\WebHeaderCollection.cs" />
-    <Compile Include="System.Net\WebProxy.cs" />
-    <Compile Include="System.Net\WebRequest.cs" />
-    <Compile Include="System.Net\WebRequestMethods.cs" />
-    <Compile Include="System.Net\WebResponse.cs" />
     <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />
     <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />
     <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />
@@ -1132,11 +1187,15 @@
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Impl.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2ImplMono.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainImpl.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainImplMono.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />
@@ -1145,6 +1204,7 @@
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\X509Helper2.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />
@@ -1158,17 +1218,12 @@
     <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />
     <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />
     <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\Oid.cs" />
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />
-    <Compile Include="System.Security.Cryptography\OidGroup.cs" />
     <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
     <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />
     <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />
     <Compile Include="System.Security.Permissions\StorePermission.cs" />
     <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />
     <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />
-    <Compile Include="System.Threading\Semaphore.cs" />
     <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />
     <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />
     <Compile Include="System.Timers\ElapsedEventArgs.cs" />
@@ -1176,28 +1231,9 @@
     <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />
     <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
     <Compile Include="System.Windows.Input\ICommand.cs" />
-    <Compile Include="System\DefaultUriParser.cs" />
-    <Compile Include="System\FileStyleUriParser.cs" />
-    <Compile Include="System\FtpStyleUriParser.cs" />
-    <Compile Include="System\GenericUriParser.cs" />
-    <Compile Include="System\GenericUriParserOptions.cs" />
-    <Compile Include="System\GopherStyleUriParser.cs" />
-    <Compile Include="System\HttpStyleUriParser.cs" />
     <Compile Include="System\IOSelector.cs" />
-    <Compile Include="System\IUriData.cs" />
-    <Compile Include="System\LdapStyleUriParser.cs" />
-    <Compile Include="System\NetPipeStyleUriParser.cs" />
-    <Compile Include="System\NetTcpStyleUriParser.cs" />
-    <Compile Include="System\NewsStyleUriParser.cs" />
     <Compile Include="System\Platform.cs" />
     <Compile Include="System\SRDescriptionAttribute.cs" />
-    <Compile Include="System\Uri.cs" />
-    <Compile Include="System\UriBuilder.cs" />
-    <Compile Include="System\UriData.cs" />
-    <Compile Include="System\UriElements.cs" />
-    <Compile Include="System\UriHelper.cs" />
-    <Compile Include="System\UriParseComponents.cs" />
-    <Compile Include="System\UriParser.cs" />
     <Compile Include="System\UriTypeConverter.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.
@@ -1207,15 +1243,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -1230,10 +1265,6 @@
       <Project>{A5216031-11A3-44DD-B2FF-A14AE63BD0C3}</Project>
       <Name>System.Xml-bare-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="System-bare-net_4_x.csproj">
-      <Project>{483DB7F6-9145-4AE2-B9B2-2B5EE6FDEFB4}</Project>
-      <Name>System-bare-net_4_x</Name>
-      <Aliases>PrebuiltSystem</Aliases>    </ProjectReference>
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_x.csproj">
       <Project>{42D59DE7-586F-4ACF-BDD5-E7869E39E3EF}</Project>
       <Name>Mono.Security-net_4_x</Name>
diff --git a/mcs/class/System/System.Configuration/IdnElement.cs b/mcs/class/System/System.Configuration/IdnElement.cs
index 84287ebf822..56724d4756d 100644
--- a/mcs/class/System/System.Configuration/IdnElement.cs
+++ b/mcs/class/System/System.Configuration/IdnElement.cs
@@ -43,6 +43,8 @@ namespace System.Configuration
 			properties.Add (enabled_prop);
 		}
 
+		internal const UriIdnScope EnabledDefaultValue = UriIdnScope.None;
+
 		public IdnElement ()
 		{
 		}
diff --git a/mcs/class/System/System.Net.Configuration/WebRequestModuleHandler.cs b/mcs/class/System/System.Net.Configuration/WebRequestModuleHandler.cs
index ed53a837361..594803e2c2d 100644
--- a/mcs/class/System/System.Net.Configuration/WebRequestModuleHandler.cs
+++ b/mcs/class/System/System.Net.Configuration/WebRequestModuleHandler.cs
@@ -42,7 +42,7 @@ namespace System.Net.Configuration
 	{
 		public virtual object Create (object parent, object configContext, XmlNode section)
 		{
-#if (XML_DEP)			
+#if XML_DEP
 			if (section.Attributes != null && section.Attributes.Count != 0)
 				HandlersUtil.ThrowException ("Unrecognized attribute", section);
 
@@ -60,7 +60,7 @@ namespace System.Net.Configuration
 					if (child.Attributes != null && child.Attributes.Count != 0)
 						HandlersUtil.ThrowException ("Unrecognized attribute", child);
 
-					WebRequest.ClearPrefixes ();
+					WebRequest.PrefixList = new ArrayList ();
 					continue;
 				}
 
@@ -70,16 +70,18 @@ namespace System.Net.Configuration
 					if (child.Attributes != null && child.Attributes.Count != 0)
 						HandlersUtil.ThrowException ("Unrecognized attribute", child);
 
-					WebRequest.AddPrefix (prefix, type);
-					continue;
+					throw new NotImplementedException ();
+					//WebRequest.PrefixList.Add (new WebRequestPrefixElement(prefix, type));
+					//continue;
 				}
 
 				if (name == "remove") {
 					if (child.Attributes != null && child.Attributes.Count != 0)
 						HandlersUtil.ThrowException ("Unrecognized attribute", child);
 
-					WebRequest.RemovePrefix (prefix);
-					continue;
+					throw new NotImplementedException ();
+					// WebRequest.RemovePrefix (prefix);
+					// continue;
 				}
 
 				HandlersUtil.ThrowException ("Unexpected element", child);
diff --git a/mcs/class/System/System.Net.NetworkInformation/DuplicateAddressDetectionState.cs b/mcs/class/System/System.Net.NetworkInformation/DuplicateAddressDetectionState.cs
deleted file mode 100644
index 5625522a21d..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/DuplicateAddressDetectionState.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Net.NetworkInformation.DuplicateAddressDetectionState
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public enum DuplicateAddressDetectionState {
-		Invalid,
-		Tentative,
-		Duplicate,
-		Deprecated,
-		Preferred
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformation.cs b/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformation.cs
deleted file mode 100644
index ea761a3fc41..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformation.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Net.NetworkInformation.GatewayIPAddressInformation
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Atsushi Enomoto (atsushi@ximian.com)
-//
-// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public abstract class GatewayIPAddressInformation {
-		protected GatewayIPAddressInformation ()
-		{
-		}
-		
-		public abstract IPAddress Address { get; }
-	}
-
-	class GatewayIPAddressInformationImpl : GatewayIPAddressInformation
-	{
-		IPAddress address;
-
-		public GatewayIPAddressInformationImpl (IPAddress address)
-		{
-			this.address = address;
-		}
-		
-		public override IPAddress Address {
-			get { return address; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs
deleted file mode 100644
index 14767dd782b..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// System.Net.NetworkInformation.GatewayIPAddressInformationCollection
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Atsushi Enomoto (atsushi@ximian.com)
-//
-// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
-namespace System.Net.NetworkInformation {
-	public class GatewayIPAddressInformationCollection : ICollection<GatewayIPAddressInformation>, IEnumerable<GatewayIPAddressInformation>, IEnumerable {
-		List<GatewayIPAddressInformation> list = new List<GatewayIPAddressInformation> ();
-		
-		protected GatewayIPAddressInformationCollection ()
-		{
-		}
-
-		public virtual void Add (GatewayIPAddressInformation address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Add (address);
-		}
-
-		public virtual void Clear ()
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Clear ();
-		}
-
-		public virtual bool Contains (GatewayIPAddressInformation address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (GatewayIPAddressInformation [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<GatewayIPAddressInformation> GetEnumerator ()
-		{
-			return ((IEnumerable<GatewayIPAddressInformation>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (GatewayIPAddressInformation address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			return list.Remove (address);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return true; }
-		}
-
-		public virtual GatewayIPAddressInformation this [int index] {
-			get { return list [index]; }
-		}
-	}
-
-#if !MOBILE
-	class Win32GatewayIPAddressInformationCollection : GatewayIPAddressInformationCollection
-	{
-		public static readonly Win32GatewayIPAddressInformationCollection Empty = new Win32GatewayIPAddressInformationCollection (true);
-
-		bool is_readonly;
-
-		private Win32GatewayIPAddressInformationCollection (bool isReadOnly)
-		{
-			this.is_readonly = isReadOnly;
-		}
-
-		public Win32GatewayIPAddressInformationCollection (params Win32_IP_ADDR_STRING [] al)
-		{
-			foreach (Win32_IP_ADDR_STRING a in al) {
-				if (String.IsNullOrEmpty (a.IpAddress))
-					continue;
-				Add (new GatewayIPAddressInformationImpl (IPAddress.Parse (a.IpAddress)));
-				AddSubsequently (a.Next);
-			}
-			is_readonly = true;
-		}
-
-		void AddSubsequently (IntPtr head)
-		{
-			Win32_IP_ADDR_STRING a;
-			for (IntPtr p = head; p != IntPtr.Zero; p = a.Next) {
-				a = (Win32_IP_ADDR_STRING) Marshal.PtrToStructure (p, typeof (Win32_IP_ADDR_STRING));
-				Add (new GatewayIPAddressInformationImpl (IPAddress.Parse (a.IpAddress)));
-			}
-		}
-
-		public override bool IsReadOnly {
-			get { return is_readonly; }
-		}
-	}
-#endif
-
-	class UnixGatewayIPAddressInformationCollection : GatewayIPAddressInformationCollection
-	{
-		public static readonly UnixGatewayIPAddressInformationCollection Empty = new UnixGatewayIPAddressInformationCollection (true);
-
-		bool is_readonly;
-
-		private UnixGatewayIPAddressInformationCollection (bool isReadOnly)
-		{
-			this.is_readonly = isReadOnly;
-		}
-
-		public UnixGatewayIPAddressInformationCollection (IPAddressCollection col)
-		{
-			foreach (IPAddress a in col)
-				Add (new GatewayIPAddressInformationImpl (a));
-			this.is_readonly = true;
-		}
-		
-		public override bool IsReadOnly {
-			get { return is_readonly; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs b/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs
index 3900ac1f192..2b39ff8311c 100644
--- a/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs
@@ -33,72 +33,6 @@ using System.Net;
 using System.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {
-	public class IPAddressCollection : ICollection<IPAddress>, IEnumerable<IPAddress>, IEnumerable {
-		IList <IPAddress> list = new List<IPAddress> ();
-
-		protected internal IPAddressCollection ()
-		{
-		}
-
-		internal void SetReadOnly ()
-		{
-			if (!IsReadOnly)
-				list = ((List<IPAddress>) list).AsReadOnly ();
-		}
-
-		public virtual void Add (IPAddress address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Add (address);
-		}
-
-		public virtual void Clear ()
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Clear ();
-		}
-
-		public virtual bool Contains (IPAddress address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (IPAddress [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<IPAddress> GetEnumerator ()
-		{
-			return ((IEnumerable<IPAddress>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (IPAddress address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			return list.Remove (address);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return list.IsReadOnly; }
-		}
-
-		public virtual IPAddress this [int index] {
-			get { return list [index]; }
-		}
-	}
 
 #if !MOBILE
 	class Win32IPAddressCollection : IPAddressCollection
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPAddressInformation.cs b/mcs/class/System/System.Net.NetworkInformation/IPAddressInformation.cs
deleted file mode 100644
index 092ba2e2244..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPAddressInformation.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// System.Net.NetworkInformation.IPAddressInformation
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Atsushi Enomoto (atsushi@ximian.com)
-//
-// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-
-namespace System.Net.NetworkInformation {
-	public abstract class IPAddressInformation {
-		protected IPAddressInformation ()
-		{
-		}
-		
-		public abstract IPAddress Address { get; }
-		public abstract bool IsDnsEligible { get; }
-		public abstract bool IsTransient { get; }
-	}
-
-	class IPAddressInformationImpl : IPAddressInformation 
-	{
-		IPAddress address;
-		bool is_dns_eligible, is_transient;
-
-		public IPAddressInformationImpl (IPAddress address, bool isDnsEligible, bool isTransient)
-		{
-			this.address = address;
-			this.is_dns_eligible = isDnsEligible;
-			this.is_transient = isTransient;
-		}
-
-		public override IPAddress Address {
-			get { return address; }
-		}
-
-		public override bool IsDnsEligible {
-			get { return is_dns_eligible; }
-		}
-
-		[MonoTODO ("Always false on Linux")]
-		public override bool IsTransient {
-			get { return is_transient; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/IPAddressInformationCollection.cs
deleted file mode 100644
index 1492fe0f925..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPAddressInformationCollection.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// System.Net.NetworkInformation.IPAddressInformationCollection
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Atsushi Enomoto (atsushi@ximian.com)
-//
-// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
-namespace System.Net.NetworkInformation {
-	public class IPAddressInformationCollection : ICollection<IPAddressInformation>, IEnumerable<IPAddressInformation>, IEnumerable {
-		List <IPAddressInformation> list = new List <IPAddressInformation> ();
-
-		internal IPAddressInformationCollection ()
-		{
-		}
-
-		public virtual void Add (IPAddressInformation address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Add (address);
-		}
-
-		public virtual void Clear ()
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Clear ();
-		}
-
-		public virtual bool Contains (IPAddressInformation address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (IPAddressInformation [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<IPAddressInformation> GetEnumerator ()
-		{
-			return ((IEnumerable<IPAddressInformation>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (IPAddressInformation address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			return list.Remove (address);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return true; }
-		}
-
-		public virtual IPAddressInformation this [int index] {
-			get { return list [index]; }
-		}
-	}
-
-	class IPAddressInformationImplCollection : IPAddressInformationCollection
-	{
-		public static readonly IPAddressInformationImplCollection Empty = new IPAddressInformationImplCollection (true);
-
-		bool is_readonly;
-
-		// for static methods
-		IPAddressInformationImplCollection (bool isReadOnly)
-		{
-			is_readonly = isReadOnly;
-		}
-
-		public override bool IsReadOnly {
-			get { return is_readonly; }
-		}
-
-#if !MOBILE
-		public static IPAddressInformationCollection Win32FromAnycast (IntPtr ptr)
-		{
-			IPAddressInformationImplCollection c = new IPAddressInformationImplCollection (false);
-			Win32_IP_ADAPTER_ANYCAST_ADDRESS a;
-			for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
-				a = (Win32_IP_ADAPTER_ANYCAST_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_ANYCAST_ADDRESS));
-				c.Add (new IPAddressInformationImpl (
-				       a.Address.GetIPAddress (),
-				       a.LengthFlags.IsDnsEligible,
-				       a.LengthFlags.IsTransient));
-			}
-			c.is_readonly = true;
-			return c;
-		}
-#endif
-
-		public static IPAddressInformationImplCollection LinuxFromAnycast (IList<IPAddress> addresses)
-		{
-			IPAddressInformationImplCollection c = new IPAddressInformationImplCollection (false);
-			foreach (IPAddress address in addresses) {
-				c.Add (new IPAddressInformationImpl (address, false, false));
-			}
-			c.is_readonly = true;
-			return c;
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs b/mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs
index b22a33c9ad5..be2d13b71c0 100644
--- a/mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs
@@ -37,62 +37,6 @@ using System.Runtime.InteropServices;
 using System.Text;
 
 namespace System.Net.NetworkInformation {
-	public abstract class IPGlobalProperties {
-		protected IPGlobalProperties ()
-		{
-		}
-
-		public static IPGlobalProperties GetIPGlobalProperties ()
-		{
-#if MONODROID
-			return new AndroidIPGlobalProperties ();
-#elif MONOTOUCH || XAMMAC || MOBILE_STATIC
-			return new UnixIPGlobalProperties ();
-#else
-			switch (Environment.OSVersion.Platform) {
-			case PlatformID.Unix:
-				MibIPGlobalProperties impl = null;
-				if (Directory.Exists (MibIPGlobalProperties.ProcDir)) {
-					impl = new MibIPGlobalProperties (MibIPGlobalProperties.ProcDir);
-					if (File.Exists (impl.StatisticsFile))
-						return impl;
-				}
-				if (Directory.Exists (MibIPGlobalProperties.CompatProcDir)) {
-					impl = new MibIPGlobalProperties (MibIPGlobalProperties.CompatProcDir);
-					if (File.Exists (impl.StatisticsFile))
-						return impl;
-				}
-				return new UnixIPGlobalProperties ();
-			default:
-				return new Win32IPGlobalProperties ();
-			}
-#endif
-		}
-
-		internal static IPGlobalProperties InternalGetIPGlobalProperties()
-		{
-			return GetIPGlobalProperties ();
-		}
-
-		public abstract TcpConnectionInformation [] GetActiveTcpConnections ();
-		public abstract IPEndPoint [] GetActiveTcpListeners ();
-		public abstract IPEndPoint [] GetActiveUdpListeners ();
-		public abstract IcmpV4Statistics GetIcmpV4Statistics ();
-		public abstract IcmpV6Statistics GetIcmpV6Statistics ();
-		public abstract IPGlobalStatistics GetIPv4GlobalStatistics ();
-		public abstract IPGlobalStatistics GetIPv6GlobalStatistics ();
-		public abstract TcpStatistics GetTcpIPv4Statistics ();
-		public abstract TcpStatistics GetTcpIPv6Statistics ();
-		public abstract UdpStatistics GetUdpIPv4Statistics ();
-		public abstract UdpStatistics GetUdpIPv6Statistics ();
-
-		public abstract string DhcpScopeName { get; }
-		public abstract string DomainName { get; }
-		public abstract string HostName { get; }
-		public abstract bool IsWinsProxy { get; }
-		public abstract NetBiosNodeType NodeType { get; }
-	}
-
 	abstract class CommonUnixIPGlobalProperties : IPGlobalProperties
 	{
 		[DllImport ("libc")]
@@ -343,7 +287,7 @@ namespace System.Net.NetworkInformation {
 				IPEndPoint local = ToEndpoint (list [i] [1]);
 				IPEndPoint remote = ToEndpoint (list [i] [2]);
 				TcpState state = (TcpState) int.Parse (list [i] [3], NumberStyles.HexNumber);
-				ret [i] = new TcpConnectionInformationImpl (local, remote, state);
+				ret [i] = new SystemTcpConnectionInformation (local, remote, state);
 			}
 			return ret;
 		}
@@ -690,7 +634,7 @@ namespace System.Net.NetworkInformation {
 			}
 
 			public TcpConnectionInformation TcpInfo {
-				get { return new TcpConnectionInformationImpl (LocalEndPoint, RemoteEndPoint, State); }
+				get { return new SystemTcpConnectionInformation (LocalEndPoint, RemoteEndPoint, State); }
 			}
 		}
 
@@ -714,7 +658,7 @@ namespace System.Net.NetworkInformation {
 			}
 
 			public TcpConnectionInformation TcpInfo {
-				get { return new TcpConnectionInformationImpl (LocalEndPoint, RemoteEndPoint, State); }
+				get { return new SystemTcpConnectionInformation (LocalEndPoint, RemoteEndPoint, State); }
 			}
 		}
 
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPGlobalStatistics.cs b/mcs/class/System/System.Net.NetworkInformation/IPGlobalStatistics.cs
index 749be358302..7822dfc6f36 100644
--- a/mcs/class/System/System.Net.NetworkInformation/IPGlobalStatistics.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/IPGlobalStatistics.cs
@@ -31,35 +31,6 @@ using System.Globalization;
 using System.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {
-	public abstract class IPGlobalStatistics {
-		protected IPGlobalStatistics ()
-		{
-		}
-
-		public abstract int DefaultTtl { get; }
-		public abstract bool ForwardingEnabled { get; }
-		public abstract int NumberOfInterfaces { get; }
-		public abstract int NumberOfIPAddresses { get; }
-		public abstract int NumberOfRoutes { get; }
-		public abstract long OutputPacketRequests { get; }
-		public abstract long OutputPacketRoutingDiscards { get; }
-		public abstract long OutputPacketsDiscarded { get; }
-		public abstract long OutputPacketsWithNoRoute { get; }
-		public abstract long PacketFragmentFailures { get; }
-		public abstract long PacketReassembliesRequired { get; }
-		public abstract long PacketReassemblyFailures { get; }
-		public abstract long PacketReassemblyTimeout { get; }
-		public abstract long PacketsFragmented { get; }
-		public abstract long PacketsReassembled { get; }
-		public abstract long ReceivedPackets { get; }
-		public abstract long ReceivedPacketsDelivered { get; }
-		public abstract long ReceivedPacketsDiscarded { get; }
-		public abstract long ReceivedPacketsForwarded { get; }
-		public abstract long ReceivedPacketsWithAddressErrors { get; }
-		public abstract long ReceivedPacketsWithHeadersErrors { get; }
-		public abstract long ReceivedPacketsWithUnknownProtocol { get; }
-	}
-
 	class MibIPGlobalStatistics : IPGlobalStatistics
 	{
 		StringDictionary dic;
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPInterfaceProperties.cs b/mcs/class/System/System.Net.NetworkInformation/IPInterfaceProperties.cs
index 3a37594d755..9a8560a92b5 100644
--- a/mcs/class/System/System.Net.NetworkInformation/IPInterfaceProperties.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/IPInterfaceProperties.cs
@@ -32,28 +32,9 @@ using System.IO;
 using System.Net.Sockets;
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
+using System.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {
-	public abstract class IPInterfaceProperties {
-		protected IPInterfaceProperties ()
-		{
-		}
-
-		public abstract IPv4InterfaceProperties GetIPv4Properties ();
-		public abstract IPv6InterfaceProperties GetIPv6Properties ();
-
-		public abstract IPAddressInformationCollection AnycastAddresses { get; }
-		public abstract IPAddressCollection DhcpServerAddresses { get; }
-		public abstract IPAddressCollection DnsAddresses { get; }
-		public abstract string DnsSuffix { get; }
-		public abstract GatewayIPAddressInformationCollection GatewayAddresses { get; }
-		public abstract bool IsDnsEnabled { get; }
-		public abstract bool IsDynamicDnsEnabled { get; }
-		public abstract MulticastIPAddressInformationCollection MulticastAddresses { get; }
-		public abstract UnicastIPAddressInformationCollection UnicastAddresses { get; }
-		public abstract IPAddressCollection WinsServersAddresses { get; }
-	}
-
 	abstract class UnixIPInterfaceProperties : IPInterfaceProperties
 	{
 		protected IPv4InterfaceProperties ipv4iface_properties;
@@ -98,7 +79,7 @@ namespace System.Net.NetworkInformation {
 							try {
 								str = match.Groups ["address"].Value;
 								str = str.Trim ();
-								dns_servers.Add (IPAddress.Parse (str));
+								dns_servers.InternalAdd (IPAddress.Parse (str));
 							} catch {
 							}
 						} else {
@@ -112,22 +93,16 @@ namespace System.Net.NetworkInformation {
 					}
 				}
 			} catch {
-			} finally {
-				dns_servers.SetReadOnly ();
 			}
 		}
 
 		public override IPAddressInformationCollection AnycastAddresses {
 			get {
-				List<IPAddress> anycastAddresses = new List<IPAddress> ();
-				/* XXX:
+				var c = new IPAddressInformationCollection ();
 				foreach (IPAddress address in addresses) {
-					if (is_anycast_address (address)) {
-						anycastAddresses.Add (address);
-					}
+					c.InternalAdd (new SystemIPAddressInformation (address, false, false));
 				}
-				*/
-				return IPAddressInformationImplCollection.LinuxFromAnycast (anycastAddresses);
+				return c;
 			}
 		}
 
@@ -138,7 +113,6 @@ namespace System.Net.NetworkInformation {
 				// that all store their configuration differently.
 				// I'm not sure what to do here.
 				IPAddressCollection coll = new IPAddressCollection ();
-				coll.SetReadOnly ();
 				return coll;
 			}
 		}
@@ -173,37 +147,37 @@ namespace System.Net.NetworkInformation {
 
 		public override MulticastIPAddressInformationCollection MulticastAddresses {
 			get {
-				List<IPAddress> multicastAddresses = new List<IPAddress> ();
+				var multicastAddresses = new MulticastIPAddressInformationCollection ();
 				foreach (IPAddress address in addresses) {
 					byte[] addressBytes = address.GetAddressBytes ();
 					if (addressBytes[0] >= 224 && addressBytes[0] <= 239) {
-						multicastAddresses.Add (address);
+						multicastAddresses.InternalAdd (new SystemMulticastIPAddressInformation (new SystemIPAddressInformation (address, true, false)));
 					}
 				}
-				return MulticastIPAddressInformationImplCollection.LinuxFromList (multicastAddresses);
+				return multicastAddresses;
 			}
 		}
 
 		public override UnicastIPAddressInformationCollection UnicastAddresses {
 			get {
-				List<IPAddress> unicastAddresses = new List<IPAddress> ();
+				var unicastAddresses = new UnicastIPAddressInformationCollection ();
 				foreach (IPAddress address in addresses) {
 					switch (address.AddressFamily) {
 						case AddressFamily.InterNetwork:
 							byte top = address.GetAddressBytes () [0];
 							if (top >= 224 && top <= 239)
 								continue;
-							unicastAddresses.Add (address);
+							unicastAddresses.InternalAdd (new LinuxUnicastIPAddressInformation (address));
 							break;
 
 						case AddressFamily.InterNetworkV6:
 							if (address.IsIPv6Multicast)
 								continue;
-							unicastAddresses.Add (address);
+							unicastAddresses.InternalAdd (new LinuxUnicastIPAddressInformation (address));
 							break;
 					}
 				}
-				return UnicastIPAddressInformationImplCollection.LinuxFromList (unicastAddresses);
+				return unicastAddresses;
 			}
 		}
 
@@ -218,8 +192,6 @@ namespace System.Net.NetworkInformation {
 
 	class LinuxIPInterfaceProperties : UnixIPInterfaceProperties
 	{
-		IPAddressCollection gateways;
-
 		public LinuxIPInterfaceProperties (LinuxNetworkInterface iface, List <IPAddress> addresses)
 			: base (iface, addresses)
 		{
@@ -233,8 +205,9 @@ namespace System.Net.NetworkInformation {
 			return ipv4iface_properties;
 		}
 
-		void ParseRouteInfo (string iface)
+		IPAddressCollection ParseRouteInfo (string iface)
 		{
+			var col = new IPAddressCollection ();
 			try {
 				using (StreamReader reader = new StreamReader ("/proc/net/route")) {
 					string line;
@@ -255,31 +228,26 @@ namespace System.Net.NetworkInformation {
 									continue;
 							}
 							IPAddress ip = new IPAddress (ipbytes);
-							if (!ip.Equals (IPAddress.Any) && !gateways.Contains (ip))
-								gateways.Add (ip);
+							if (!ip.Equals (IPAddress.Any) && !col.Contains (ip))
+								col.InternalAdd (ip);
 						}
 					}
 				}
 			} catch {
 			}
+
+			return col;
 		}
 
 		public override GatewayIPAddressInformationCollection GatewayAddresses {
 			get {
-				gateways = new IPAddressCollection ();
-				ParseRouteInfo (this.iface.Name.ToString());
-				if (gateways.Count > 0)
-					return new UnixGatewayIPAddressInformationCollection (gateways);
-				else
-					return UnixGatewayIPAddressInformationCollection.Empty;
+				return SystemGatewayIPAddressInformation.ToGatewayIpAddressInformationCollection (ParseRouteInfo (this.iface.Name.ToString()));
 			}
 		}
 	}
 
 	class MacOsIPInterfaceProperties : UnixIPInterfaceProperties
 	{
-		IPAddressCollection gateways;
-
 		public MacOsIPInterfaceProperties (MacOsNetworkInterface iface, List <IPAddress> addresses)
 			: base (iface, addresses)
 		{
@@ -298,16 +266,16 @@ namespace System.Net.NetworkInformation {
 
 		public override GatewayIPAddressInformationCollection GatewayAddresses {
 			get {
-				gateways = new IPAddressCollection ();
+				var gateways = new IPAddressCollection ();
 				string[] gw_addrlist;
 				if (!ParseRouteInfo_internal (this.iface.Name.ToString(), out gw_addrlist))
-					return UnixGatewayIPAddressInformationCollection.Empty;
+					return new GatewayIPAddressInformationCollection ();
 
 				for(int i=0; i<gw_addrlist.Length; i++) {
 					try {
 						IPAddress ip = IPAddress.Parse(gw_addrlist[i]);
 						if (!ip.Equals (IPAddress.Any) && !gateways.Contains (ip))
-							gateways.Add (ip);
+							gateways.InternalAdd (ip);
 					} catch (ArgumentNullException) {
 						/* Ignore this, as the
 						 * internal call might have
@@ -317,10 +285,7 @@ namespace System.Net.NetworkInformation {
 					}
 				}
 
-				if (gateways.Count > 0)
-					return new UnixGatewayIPAddressInformationCollection (gateways);
-				else
-					return UnixGatewayIPAddressInformationCollection.Empty;
+				return SystemGatewayIPAddressInformation.ToGatewayIpAddressInformationCollection (gateways);
 			}
 		}
 	}
@@ -351,7 +316,21 @@ namespace System.Net.NetworkInformation {
 		}
 
 		public override IPAddressInformationCollection AnycastAddresses {
-			get { return IPAddressInformationImplCollection.Win32FromAnycast (addr.FirstAnycastAddress); }
+			get { return Win32FromAnycast (addr.FirstAnycastAddress); }
+		}
+
+		static IPAddressInformationCollection Win32FromAnycast (IntPtr ptr)
+		{
+			var c = new IPAddressInformationCollection ();
+			Win32_IP_ADAPTER_ANYCAST_ADDRESS a;
+			for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
+				a = (Win32_IP_ADAPTER_ANYCAST_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_ANYCAST_ADDRESS));
+				c.InternalAdd (new SystemIPAddressInformation (
+				       a.Address.GetIPAddress (),
+				       a.LengthFlags.IsDnsEligible,
+				       a.LengthFlags.IsTransient));
+			}
+			return c;
 		}
 
 		public override IPAddressCollection DhcpServerAddresses {
@@ -374,7 +353,26 @@ namespace System.Net.NetworkInformation {
 			get {
 				Win32_IP_ADAPTER_INFO v4info = Win32NetworkInterface2.GetAdapterInfoByIndex (mib4.Index);
 				// FIXME: should ipv6 DhcpServer be considered?
-				return v4info != null ? new Win32GatewayIPAddressInformationCollection (v4info.GatewayList) : Win32GatewayIPAddressInformationCollection.Empty;
+
+				var col = new GatewayIPAddressInformationCollection ();
+				if (v4info != null) {
+					var a = v4info.GatewayList;
+					if (!String.IsNullOrEmpty (a.IpAddress)) {
+						col.InternalAdd(new SystemGatewayIPAddressInformation(IPAddress.Parse (a.IpAddress)));
+						AddSubsequently (a.Next, col);
+					}
+				}
+
+				return col;
+			}
+		}
+
+		static void AddSubsequently (IntPtr head, GatewayIPAddressInformationCollection col)
+		{
+			Win32_IP_ADDR_STRING a;
+			for (IntPtr p = head; p != IntPtr.Zero; p = a.Next) {
+				a = (Win32_IP_ADDR_STRING) Marshal.PtrToStructure (p, typeof (Win32_IP_ADDR_STRING));
+				col.InternalAdd (new SystemGatewayIPAddressInformation (IPAddress.Parse (a.IpAddress)));
 			}
 		}
 
@@ -387,17 +385,42 @@ namespace System.Net.NetworkInformation {
 		}
 
 		public override MulticastIPAddressInformationCollection MulticastAddresses {
-			get { return MulticastIPAddressInformationImplCollection.Win32FromMulticast (addr.FirstMulticastAddress); }
+			get { return Win32FromMulticast (addr.FirstMulticastAddress); }
+		}
+
+		static MulticastIPAddressInformationCollection Win32FromMulticast (IntPtr ptr)
+		{
+			var c = new MulticastIPAddressInformationCollection ();
+			Win32_IP_ADAPTER_MULTICAST_ADDRESS a;
+			for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
+				a = (Win32_IP_ADAPTER_MULTICAST_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_MULTICAST_ADDRESS));
+				c.InternalAdd (new SystemMulticastIPAddressInformation (new SystemIPAddressInformation (
+				       a.Address.GetIPAddress (),
+				       a.LengthFlags.IsDnsEligible,
+				       a.LengthFlags.IsTransient)));
+			}
+			return c;
 		}
 
 		public override UnicastIPAddressInformationCollection UnicastAddresses {
 			get {
 				Win32_IP_ADAPTER_INFO ai = Win32NetworkInterface2.GetAdapterInfoByIndex (mib4.Index);
 				// FIXME: should ipv6 DhcpServer be considered?
-				return ai != null ? UnicastIPAddressInformationImplCollection.Win32FromUnicast ((int) ai.Index, addr.FirstUnicastAddress) : UnicastIPAddressInformationImplCollection.Empty;
+				return ai != null ? Win32FromUnicast ((int) ai.Index, addr.FirstUnicastAddress) : new UnicastIPAddressInformationCollection ();
 			}
 		}
 
+		static UnicastIPAddressInformationCollection Win32FromUnicast (int ifIndex, IntPtr ptr)
+		{
+			UnicastIPAddressInformationCollection c = new UnicastIPAddressInformationCollection ();
+			Win32_IP_ADAPTER_UNICAST_ADDRESS a;
+			for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
+				a = (Win32_IP_ADAPTER_UNICAST_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_UNICAST_ADDRESS));
+				c.InternalAdd (new Win32UnicastIPAddressInformation (ifIndex, a));
+			}
+			return c;
+		}
+
 		public override IPAddressCollection WinsServersAddresses {
 			get {
 				Win32_IP_ADAPTER_INFO v4info = Win32NetworkInterface2.GetAdapterInfoByIndex (mib4.Index);
@@ -408,6 +431,7 @@ namespace System.Net.NetworkInformation {
 
 	}
 #endif
+
 }
 
 
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPStatus.cs b/mcs/class/System/System.Net.NetworkInformation/IPStatus.cs
deleted file mode 100644
index 0d21b3b071e..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPStatus.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// System.Net.NetworkInformation.IPStatus
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public enum IPStatus {
-		Unknown = -1,
-		Success = 0,
-		DestinationNetworkUnreachable = 11002,
-		DestinationHostUnreachable = 11003,
-		DestinationProhibited = 11004,
-		DestinationProtocolUnreachable = 11004,
-		DestinationPortUnreachable = 11005,
-		NoResources = 11006,
-		BadOption = 11007,
-		HardwareError = 11008,
-		PacketTooBig = 11009,
-		TimedOut = 11010,
-		BadRoute = 11012,
-		TtlExpired = 11013,
-		TtlReassemblyTimeExceeded = 11014,
-		ParameterProblem = 11015,
-		SourceQuench = 11016,
-		BadDestination = 11018,
-		DestinationUnreachable = 11040,
-		TimeExceeded = 11041,
-		BadHeader = 11042,
-		UnrecognizedNextHeader = 11043,
-		IcmpError = 11044,
-		DestinationScopeMismatch = 11045
-	}
-}
-
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceProperties.cs b/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceProperties.cs
index 33264fb4d6a..c3c34f847a0 100644
--- a/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceProperties.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceProperties.cs
@@ -31,20 +31,6 @@ using System.IO;
 using System.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {
-	public abstract class IPv4InterfaceProperties {
-		protected IPv4InterfaceProperties ()
-		{
-		}
-
-		public abstract int Index { get; }
-		public abstract bool IsAutomaticPrivateAddressingActive { get; }
-		public abstract bool IsAutomaticPrivateAddressingEnabled { get; }
-		public abstract bool IsDhcpEnabled { get; }
-		public abstract bool IsForwardingEnabled { get; }
-		public abstract int Mtu { get; }
-		public abstract bool UsesWins { get; }
-	}
-
 	abstract class UnixIPv4InterfaceProperties : IPv4InterfaceProperties
 	{
 		protected UnixNetworkInterface iface;
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPv6InterfaceProperties.cs b/mcs/class/System/System.Net.NetworkInformation/IPv6InterfaceProperties.cs
index bf31050377a..d7a3dcfe20a 100644
--- a/mcs/class/System/System.Net.NetworkInformation/IPv6InterfaceProperties.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/IPv6InterfaceProperties.cs
@@ -27,14 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace System.Net.NetworkInformation {
-	public abstract class IPv6InterfaceProperties {
-		protected IPv6InterfaceProperties ()
-		{
-		}
-
-		public abstract int Index { get; }
-		public abstract int Mtu { get; }
-	}
 #if !MOBILE
 	class Win32IPv6InterfaceProperties : IPv6InterfaceProperties
 	{
diff --git a/mcs/class/System/System.Net.NetworkInformation/IcmpV4Statistics.cs b/mcs/class/System/System.Net.NetworkInformation/IcmpV4Statistics.cs
index 3ad40ed2e1c..c3888abeafd 100644
--- a/mcs/class/System/System.Net.NetworkInformation/IcmpV4Statistics.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/IcmpV4Statistics.cs
@@ -30,39 +30,6 @@ using System.Collections.Specialized;
 using System.Globalization;
 
 namespace System.Net.NetworkInformation {
-	public abstract class IcmpV4Statistics {
-		protected IcmpV4Statistics ()
-		{
-		}
-
-		public abstract long AddressMaskRepliesReceived { get; }
-		public abstract long AddressMaskRepliesSent { get; }
-		public abstract long AddressMaskRequestsReceived { get; }
-		public abstract long AddressMaskRequestsSent { get; }
-		public abstract long DestinationUnreachableMessagesReceived { get; }
-		public abstract long DestinationUnreachableMessagesSent { get; }
-		public abstract long EchoRepliesReceived { get; }
-		public abstract long EchoRepliesSent { get; }
-		public abstract long EchoRequestsReceived { get; }
-		public abstract long EchoRequestsSent { get; }
-		public abstract long ErrorsReceived { get; }
-		public abstract long ErrorsSent { get; }
-		public abstract long MessagesReceived { get; }
-		public abstract long MessagesSent { get; }
-		public abstract long ParameterProblemsReceived { get; }
-		public abstract long ParameterProblemsSent { get; }
-		public abstract long RedirectsReceived { get; }
-		public abstract long RedirectsSent { get; }
-		public abstract long SourceQuenchesReceived { get; }
-		public abstract long SourceQuenchesSent { get; }
-		public abstract long TimeExceededMessagesReceived { get; }
-		public abstract long TimeExceededMessagesSent { get; }
-		public abstract long TimestampRepliesReceived { get; }
-		public abstract long TimestampRepliesSent { get; }
-		public abstract long TimestampRequestsReceived { get; }
-		public abstract long TimestampRequestsSent { get; }
-	}
-
 	class MibIcmpV4Statistics : IcmpV4Statistics
 	{
 		StringDictionary dic;
diff --git a/mcs/class/System/System.Net.NetworkInformation/IcmpV6Statistics.cs b/mcs/class/System/System.Net.NetworkInformation/IcmpV6Statistics.cs
index 94b05b14342..ffe247afc62 100644
--- a/mcs/class/System/System.Net.NetworkInformation/IcmpV6Statistics.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/IcmpV6Statistics.cs
@@ -31,45 +31,6 @@ using System.Globalization;
 using System.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {
-	public abstract class IcmpV6Statistics {
-		protected IcmpV6Statistics ()
-		{
-		}
-
-		public abstract long DestinationUnreachableMessagesReceived { get; }
-		public abstract long DestinationUnreachableMessagesSent { get; }
-		public abstract long EchoRepliesReceived { get; }
-		public abstract long EchoRepliesSent { get; }
-		public abstract long EchoRequestsReceived { get; }
-		public abstract long EchoRequestsSent { get; }
-		public abstract long ErrorsReceived { get; }
-		public abstract long ErrorsSent { get; }
-		public abstract long MembershipQueriesReceived { get; }
-		public abstract long MembershipQueriesSent { get; }
-		public abstract long MembershipReductionsReceived { get; }
-		public abstract long MembershipReductionsSent { get; }
-		public abstract long MembershipReportsReceived { get; }
-		public abstract long MembershipReportsSent { get; }
-		public abstract long MessagesReceived { get; }
-		public abstract long MessagesSent { get; }
-		public abstract long NeighborAdvertisementsReceived { get; }
-		public abstract long NeighborAdvertisementsSent { get; }
-		public abstract long NeighborSolicitsReceived { get; }
-		public abstract long NeighborSolicitsSent { get; }
-		public abstract long PacketTooBigMessagesReceived { get; }
-		public abstract long PacketTooBigMessagesSent { get; }
-		public abstract long ParameterProblemsReceived { get; }
-		public abstract long ParameterProblemsSent { get; }
-		public abstract long RedirectsReceived { get; }
-		public abstract long RedirectsSent { get; }
-		public abstract long RouterAdvertisementsReceived { get; }
-		public abstract long RouterAdvertisementsSent { get; }
-		public abstract long RouterSolicitsReceived { get; }
-		public abstract long RouterSolicitsSent { get; }
-		public abstract long TimeExceededMessagesReceived { get; }
-		public abstract long TimeExceededMessagesSent { get; }
-	}
-
 	class MibIcmpV6Statistics : IcmpV6Statistics
 	{
 		StringDictionary dic;
diff --git a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs b/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs
deleted file mode 100644
index 3aa41277606..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// System.Net.NetworkInformation.MulticastIPAddressInformation
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Atsushi Enomoto (atsushi@ximian.com)
-//
-// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System.Runtime.InteropServices;
-
-namespace System.Net.NetworkInformation {
-	public abstract class MulticastIPAddressInformation : IPAddressInformation {
-		protected MulticastIPAddressInformation ()
-		{
-		}
-
-		public abstract long AddressPreferredLifetime { get; }
-		public abstract long AddressValidLifetime { get; }
-		public abstract long DhcpLeaseLifetime { get; }
-		public abstract DuplicateAddressDetectionState DuplicateAddressDetectionState { get; }
-		public abstract PrefixOrigin PrefixOrigin { get; }
-		public abstract SuffixOrigin SuffixOrigin { get; }
-	}
-
-	// So, why are there many pointless members in the base class?
-	class MulticastIPAddressInformationImpl : MulticastIPAddressInformation
-	{
-		IPAddress address;
-		bool is_dns_eligible, is_transient;
-
-		public MulticastIPAddressInformationImpl (IPAddress address, bool isDnsEligible, bool isTransient)
-		{
-			this.address = address;
-			this.is_dns_eligible = isDnsEligible;
-			this.is_transient = isTransient;
-		}
-
-		public override IPAddress Address {
-			get { return address; }
-		}
-
-		public override bool IsDnsEligible {
-			get { return is_dns_eligible; }
-		}
-
-		public override bool IsTransient {
-			get { return is_transient; }
-		}
-
-		public override long AddressPreferredLifetime {
-			get { return 0; }
-		}
-
-		public override long AddressValidLifetime {
-			get { return 0; }
-		}
-
-		public override long DhcpLeaseLifetime {
-			get { return 0; }
-		}
-
-		public override DuplicateAddressDetectionState DuplicateAddressDetectionState {
-			get { return DuplicateAddressDetectionState.Invalid; }
-		}
-
-		public override PrefixOrigin PrefixOrigin {
-			get { return PrefixOrigin.Other; }
-		}
-
-		public override SuffixOrigin SuffixOrigin {
-			get { return SuffixOrigin.Other; }
-		}
-
-	}
-}
diff --git a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
deleted file mode 100644
index 36bd9c42de1..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// System.Net.NetworkInformation.MulticastIPAddressInformationCollection
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Atsushi Enomoto (atsushi@ximian.com)
-//	Eric Butler (eric@extremeboredom.net)
-//
-// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
-namespace System.Net.NetworkInformation {
-	public class MulticastIPAddressInformationCollection : ICollection<MulticastIPAddressInformation>, IEnumerable<MulticastIPAddressInformation>, IEnumerable {
-		List<MulticastIPAddressInformation> list = new List<MulticastIPAddressInformation> ();
-		
-		protected internal MulticastIPAddressInformationCollection ()
-		{
-		}
-
-		public virtual void Add (MulticastIPAddressInformation address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Add (address);
-		}
-
-		public virtual void Clear ()
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Clear ();
-		}
-
-		public virtual bool Contains (MulticastIPAddressInformation address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (MulticastIPAddressInformation [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<MulticastIPAddressInformation> GetEnumerator ()
-		{
-			return ((IEnumerable<MulticastIPAddressInformation>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (MulticastIPAddressInformation address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			return list.Remove (address);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return true; }
-		}
-
-		public virtual MulticastIPAddressInformation this [int index] {
-			get { return list [index]; }
-		}
-	}
-
-	class MulticastIPAddressInformationImplCollection : MulticastIPAddressInformationCollection
-	{
-		public static readonly MulticastIPAddressInformationImplCollection Empty = new MulticastIPAddressInformationImplCollection (true);
-
-		bool is_readonly;
-
-		// for static methods
-		MulticastIPAddressInformationImplCollection (bool isReadOnly)
-		{
-			is_readonly = isReadOnly;
-		}
-
-		public override bool IsReadOnly {
-			get { return is_readonly; }
-		}
-
-#if !MOBILE
-		public static MulticastIPAddressInformationCollection Win32FromMulticast (IntPtr ptr)
-		{
-			MulticastIPAddressInformationImplCollection c = new MulticastIPAddressInformationImplCollection (false);
-			Win32_IP_ADAPTER_MULTICAST_ADDRESS a;
-			for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
-				a = (Win32_IP_ADAPTER_MULTICAST_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_MULTICAST_ADDRESS));
-				c.Add (new MulticastIPAddressInformationImpl (
-				       a.Address.GetIPAddress (),
-				       a.LengthFlags.IsDnsEligible,
-				       a.LengthFlags.IsTransient));
-			}
-			c.is_readonly = true;
-			return c;
-		}
-#endif
-
-		public static MulticastIPAddressInformationImplCollection LinuxFromList (List<IPAddress> addresses)
-		{
-			MulticastIPAddressInformationImplCollection c = new MulticastIPAddressInformationImplCollection (false);
-			foreach (IPAddress address in addresses) {
-				c.Add (new MulticastIPAddressInformationImpl (
-					address,
-					true,
-					false));
-			}
-			c.is_readonly = true;
-			return c;
-		}
-	}
-}
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs b/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs
deleted file mode 100644
index 42fb66d2d62..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Net.NetworkInformation.NetBiosNodeType
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public enum NetBiosNodeType {
-		Unknown = 0,
-		Broadcast = 1,
-		Peer2Peer = 1 << 1,
-		Mixed = 1 << 2,
-		Hybrid = 1 << 3,
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
deleted file mode 100644
index 4242c9b0013..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkAddressChangeEventHandler
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public delegate void NetworkAddressChangedEventHandler (object sender, EventArgs e);
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
deleted file mode 100644
index df580bb2589..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkAvailabilityChangedEventHandler
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net.NetworkInformation {
-	public delegate void NetworkAvailabilityChangedEventHandler (object sender, NetworkAvailabilityEventArgs e);
-}
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs
deleted file mode 100644
index af78934957c..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkAvailabilityEventArgs
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-
-namespace System.Net.NetworkInformation {
-	public class NetworkAvailabilityEventArgs : EventArgs {
-		bool available;
-
-		internal NetworkAvailabilityEventArgs (bool available)
-		{
-			this.available = available;
-		}
-
-		public bool IsAvailable {
-			get { return available; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
index 35721765996..50e9009741a 100644
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
@@ -101,6 +101,9 @@ namespace System.Net.NetworkInformation {
 
 		static void MaybeCreate ()
 		{
+#if MONOTOUCH_WATCH
+			throw new PlatformNotSupportedException ("NetworkInformation.NetworkChange is not supported on the current platform.");
+#else
 			if (networkChange != null)
 				return;
 
@@ -111,6 +114,7 @@ namespace System.Net.NetworkInformation {
 				networkChange = new LinuxNetworkChange ();
 #endif
 			}
+#endif // MONOTOUCH_WATCH
 		}
 
 		static void MaybeDispose ()
@@ -122,6 +126,7 @@ namespace System.Net.NetworkInformation {
 		}
 	}
 
+#if !MONOTOUCH_WATCH
 	internal sealed class MacNetworkChange : INetworkChange
 	{
 		const string DL_LIB = "/usr/lib/libSystem.dylib";
@@ -317,6 +322,7 @@ namespace System.Net.NetworkInformation {
 				availabilityChanged (null, new NetworkAvailabilityEventArgs (instance.IsAvailable));
 		}
 	}
+#endif // !MONOTOUCH_WATCH
 
 #if !NETWORK_CHANGE_STANDALONE && !MONOTOUCH
 
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationAccess.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationAccess.cs
deleted file mode 100644
index b51aa38bc8e..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationAccess.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInformationAccess
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-namespace System.Net.NetworkInformation {
-	[Flags]
-	public enum NetworkInformationAccess {
-		None,
-		Read,
-		Ping = 4
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs
deleted file mode 100644
index 0770801732c..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInformationException
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System.ComponentModel;
-using System.Runtime.Serialization;
-
-namespace System.Net.NetworkInformation {
-	[Serializable]
-	public class NetworkInformationException
-#if !NET_2_1
-		: Win32Exception
-#else
-		: Exception
-#endif
-	{
-		int error_code;
-		
-		public NetworkInformationException ()
-		{
-		}
-
-#if !NET_2_1
-		public NetworkInformationException (int errorCode) : base (errorCode)
-		{
-		}
-#else
-		public NetworkInformationException (int errorCode)
-		{
-			error_code = errorCode;
-		}
-#endif
-
-#if !NET_2_1
-		protected NetworkInformationException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-			error_code = info.GetInt32 ("ErrorCode");
-		}
-#endif
-
-		public
-#if !NET_2_1
-		override
-#endif
-		int ErrorCode {
-			get { return error_code; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermission.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermission.cs
deleted file mode 100644
index 2ffeb882cce..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermission.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInformationPermission
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Security;
-using System.Security.Permissions;
-
-namespace System.Net.NetworkInformation {
-	[Serializable]
-	public sealed class NetworkInformationPermission : CodeAccessPermission, IUnrestrictedPermission {
-		private const int version = 1;
-
-		[MonoTODO]
-		public NetworkInformationPermission (PermissionState state)
-		{
-		}
-
-		[MonoTODO]
-		public NetworkInformationPermission (NetworkInformationAccess access)
-		{
-		}
-
-		[MonoTODO]
-		public void AddPermission (NetworkInformationAccess access)
-		{
-		}
-
-		[MonoTODO]
-		public override IPermission Copy ()
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public override void FromXml (SecurityElement securityElement)
-		{
-		}
-
-		[MonoTODO]
-		public override IPermission Intersect (System.Security.IPermission target)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public override bool IsSubsetOf (IPermission target)
-		{
-			return false;
-		}
-
-		[MonoTODO]
-		public bool IsUnrestricted ()
-		{
-			return false;
-		}
-
-		[MonoTODO]
-		public override SecurityElement ToXml ()
-		{
-			SecurityElement se = PermissionHelper.Element (typeof (NetworkInformationPermission), version);
-
-			// FIXME: add fields
-
-			return se;
-		}
-
-		[MonoTODO]
-		public override IPermission Union (IPermission target)
-		{
-			return null;
-		}
-		
-		[MonoTODO]
-		public NetworkInformationAccess Access {
-			get { return 0; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermissionAttribute.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermissionAttribute.cs
deleted file mode 100644
index 6b37c4fdf96..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermissionAttribute.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInformationPermissionAttribute
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Security;
-using System.Security.Permissions;
-
-namespace System.Net.NetworkInformation {
-	[Serializable]
-	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
-	public sealed class NetworkInformationPermissionAttribute : System.Security.Permissions.CodeAccessSecurityAttribute {
-		string access;
-
-		public NetworkInformationPermissionAttribute (SecurityAction action)
-			: base (action)
-		{
-		}
-
-		[MonoTODO ("verify implementation")]
-		public override IPermission CreatePermission ()
-		{
-			NetworkInformationAccess a = NetworkInformationAccess.None;
-			switch (Access) {
-			case "Read":
-				a = NetworkInformationAccess.Read;
-				break;
-			case "Full":
-				a = NetworkInformationAccess.Read | NetworkInformationAccess.Ping;
-				break;
-			}
-			return new NetworkInformationPermission (a);
-		}
-
-		public string Access {
-			get { return access; }
-			set {
-				switch (access) {
-				case "Read":
-				case "Full":
-				case "None":
-					break;
-				default:
-					throw new ArgumentException ("Only 'Read', 'Full' and 'None' are allowed");
-				}
-				access = value; 
-			}
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
index 27927a81f61..ece698af2b4 100644
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
@@ -41,15 +41,11 @@ using System.IO;
 using System.Globalization;
 
 namespace System.Net.NetworkInformation {
-	public abstract class NetworkInterface {
+	static class SystemNetworkInterface {
 
 		static readonly NetworkInterfaceFactory nif = NetworkInterfaceFactory.Create ();
 
-		protected NetworkInterface ()
-		{
-		}
-
-		public static NetworkInterface [] GetAllNetworkInterfaces ()
+		public static NetworkInterface [] GetNetworkInterfaces ()
 		{
 			try {
 				return nif.GetAllNetworkInterfaces ();
@@ -58,36 +54,28 @@ namespace System.Net.NetworkInformation {
 			}
 		}
 
-		[MonoTODO("Always returns true")]
-		public static bool GetIsNetworkAvailable ()
+		public static bool InternalGetIsNetworkAvailable ()
 		{
+			// TODO:
 			return true;
 		}
-		
-		public static int LoopbackInterfaceIndex {
+
+		public static int InternalLoopbackInterfaceIndex {
 			get {
 				return nif.GetLoopbackInterfaceIndex ();
 			}
 		}
 
+		public static int InternalIPv6LoopbackInterfaceIndex {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
 		public static IPAddress GetNetMask (IPAddress address)
 		{
 			return nif.GetNetMask (address);
 		}
-
-		public abstract IPInterfaceProperties GetIPProperties ();
-		public abstract IPv4InterfaceStatistics GetIPv4Statistics ();
-		public abstract PhysicalAddress GetPhysicalAddress ();
-		public abstract bool Supports (NetworkInterfaceComponent networkInterfaceComponent);
-
-		public abstract string Description { get; }
-		public abstract string Id { get; }
-		public abstract bool IsReceiveOnly { get; }
-		public abstract string Name { get; }
-		public abstract NetworkInterfaceType NetworkInterfaceType { get; }
-		public abstract OperationalStatus OperationalStatus { get; }
-		public abstract long Speed { get; }
-		public abstract bool SupportsMulticast { get; }
 	}
 
 	abstract class NetworkInterfaceFactory
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceComponent.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceComponent.cs
deleted file mode 100644
index daf09e4bd50..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceComponent.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInterfaceComponent
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-namespace System.Net.NetworkInformation {
-	public enum NetworkInterfaceComponent {
-		IPv4,
-		IPv6
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceType.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceType.cs
deleted file mode 100644
index 76580917cb4..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceType.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInterfaceType
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-namespace System.Net.NetworkInformation {
-	public enum NetworkInterfaceType {
-		Unknown = 1,
-		Ethernet = 6,
-		TokenRing = 9,
-		Fddi = 15,
-		BasicIsdn = 20,
-		PrimaryIsdn = 21,
-		Ppp = 23,
-		Loopback = 24,
-		Ethernet3Megabit = 26,
-		Slip = 28,
-		Atm = 37,
-		GenericModem = 48,
-		FastEthernetT = 62,
-		Isdn = 63,
-		FastEthernetFx = 69,
-		Wireless80211 = 71,
-		AsymmetricDsl = 94,
-		RateAdaptDsl = 95,
-		SymmetricDsl = 96,
-		VeryHighSpeedDsl = 97,
-		IPOverAtm = 114,
-		GigabitEthernet = 117,
-		Tunnel = 131,
-		MultiRateSymmetricDsl = 143,
-		HighPerformanceSerialBus = 144
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/OperationalStatus.cs b/mcs/class/System/System.Net.NetworkInformation/OperationalStatus.cs
deleted file mode 100644
index 1050f984279..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/OperationalStatus.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Net.NetworkInformation.OperationalStatus
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public enum OperationalStatus {
-		Up = 1,
-		Down = 2,
-		Testing = 3,
-		Unknown = 4,
-		Dormant = 5,
-		NotPresent = 6,
-		LowerLayerDown = 7
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PhysicalAddress.cs b/mcs/class/System/System.Net.NetworkInformation/PhysicalAddress.cs
deleted file mode 100644
index 2c0c93366e7..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PhysicalAddress.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// System.Net.NetworkInformation.PhysicalAddress
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Text;
-using System.Globalization;
-
-namespace System.Net.NetworkInformation {
-	public class PhysicalAddress {
-		public static readonly PhysicalAddress None = new PhysicalAddress (new byte [0]);
-		private const int numberOfBytes = 6;
-		byte [] bytes;
-		
-		public PhysicalAddress (byte [] address)
-		{
-			this.bytes = address;
-		}
-
-		internal static PhysicalAddress ParseEthernet (string address)
-		{
-			if (address == null)
-				return None;
-
-			string [] blocks = address.Split (':');
-			byte [] bytes = new byte [blocks.Length];
-			int i = 0;
-			foreach (string b in blocks){
-				bytes [i++] = Byte.Parse (b, NumberStyles.HexNumber);
-			}
-			return new PhysicalAddress (bytes);
-		}
-		
-		public static PhysicalAddress Parse (string address)
-		{
-			if (address == null)
-				return None;
-
-			if (address == string.Empty)
-				throw new FormatException("An invalid physical address was specified.");
-
-			string[] addrSplit = address.Split('-');
-
-			if (addrSplit.Length == 1) {
-				if (address.Length != numberOfBytes * 2)
-					throw new FormatException("An invalid physical address was specified.");
-
-				addrSplit = new string[numberOfBytes];
-				for (int index = 0; index < addrSplit.Length; index++) {
-					addrSplit[index] = address.Substring(index * 2, 2);
-				}
-			}
-
-			if (addrSplit.Length == numberOfBytes) {
-				foreach (string str in addrSplit)
-					if (str.Length > 2)
-						throw new FormatException("An invalid physical address was specified.");
-					else if (str.Length < 2)
-						throw new IndexOutOfRangeException("An invalid physical address was specified.");
-			}
-			else
-				throw new FormatException("An invalid physical address was specified.");
-
-			byte[] data = new byte[numberOfBytes];
-			for (int i = 0; i < numberOfBytes; i++) {
-				byte b = (byte)(GetValue(addrSplit[i][0]) << 4);
-				b += GetValue(addrSplit[i][1]);
-				data[i] = b;
-			}
-
-			return new PhysicalAddress (data);
-		}
-
-		static byte GetValue (char c)
-		{
-			if (c >= '0' && c <= '9')
-				return (byte) (c - '0');
-
-			if (c >= 'a' && c <= 'f')
-				return (byte) (c - 'a' + 10);
-
-			if (c >= 'A' && c <= 'F')
-				return (byte) (c - 'A' + 10);
-
-			throw new FormatException ("Invalid physical address.");
-		}
-
-		public override bool Equals (object comparand)
-		{
-			PhysicalAddress other = comparand as PhysicalAddress;
-			if (other == null)
-				return false;
-
-			if (bytes.Length != other.bytes.Length)
-				return false;
-
-			for (int index = 0; index < bytes.Length; index++)
-				if (bytes[index] != other.bytes[index])
-					return false;
-
-			return true;
-		}
-
-		public override int GetHashCode ()
-		{
-			return (bytes[5] << 8) ^ (bytes[4]) ^ (bytes[3] << 24) ^ (bytes[2] << 16) ^ (bytes[1] << 8) ^ (bytes[0]);
-		}
-
-		public byte [] GetAddressBytes ()
-		{
-			return bytes;
-		}
-
-		public override string ToString ()
-		{
-			if (bytes == null)
-				return "";
-
-			StringBuilder sb = new StringBuilder ();
-			foreach (byte b in bytes)
-				sb.AppendFormat("{0:X2}", b);
-			return sb.ToString ();
-		}
-	}
-}
diff --git a/mcs/class/System/System.Net.NetworkInformation/Ping.cs b/mcs/class/System/System.Net.NetworkInformation/Ping.cs
index f18b70c0f9a..72645bcd3a7 100644
--- a/mcs/class/System/System.Net.NetworkInformation/Ping.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/Ping.cs
@@ -159,7 +159,11 @@ namespace System.Net.NetworkInformation {
 		{
 			user_async_state = null;
 			worker = null;
-			cts = null;
+
+			if (cts != null) {
+				cts.Dispose();
+				cts = null;
+			}
 
 			if (PingCompleted != null)
 				PingCompleted (this, e);
@@ -596,6 +600,8 @@ namespace System.Net.NetworkInformation {
 			if ((worker != null) || (cts != null))
 				throw new InvalidOperationException ("Another SendAsync operation is in progress");
 
+			cts = new CancellationTokenSource();
+
 			var task = Task<PingReply>.Factory.StartNew (
 				() => Send (address, timeout, buffer, options), cts.Token);
 
diff --git a/mcs/class/System/System.Net.NetworkInformation/PingException.cs b/mcs/class/System/System.Net.NetworkInformation/PingException.cs
deleted file mode 100644
index 6a1081705e0..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PingException.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Net.NetworkInformation.PingException
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections;
-using System.Runtime.Serialization;
-
-namespace System.Net.NetworkInformation {
-	[Serializable]
-	public class PingException : InvalidOperationException {
-		public PingException (string message)
-			: base (message)
-		{
-		}
-
-		public PingException (string message, Exception innerException)
-			: base (message, innerException)
-		{
-		}
-
-		protected PingException (SerializationInfo serializationInfo, StreamingContext streamingContext)
-			: base (serializationInfo, streamingContext)
-		{
-		}
-
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PingOptions.cs b/mcs/class/System/System.Net.NetworkInformation/PingOptions.cs
deleted file mode 100644
index f1dbecdde42..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PingOptions.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// System.Net.NetworkInformation.PingOptions
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public class PingOptions {
-		int ttl = 128;
-		bool dont_fragment;
-
-		public PingOptions ()
-		{
-		}
-
-		public PingOptions (int ttl, bool dontFragment)
-		{
-			if (ttl <= 0)
-				throw new ArgumentOutOfRangeException ("Must be greater than zero.", "ttl");
-			this.ttl = ttl;
-			this.dont_fragment = dontFragment;
-		}
-
-		public bool DontFragment {
-			get { return dont_fragment; }
-			set { dont_fragment = value; }
-		}
-
-		public int Ttl {
-			get { return ttl; }
-			set { ttl = value; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PingReply.cs b/mcs/class/System/System.Net.NetworkInformation/PingReply.cs
deleted file mode 100644
index ecdd001c008..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PingReply.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// System.Net.NetworkInformation.PingReply
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Atsushi Enomoto (atsushi@ximian.com)
-//
-// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public class PingReply {
-		IPAddress address;
-		byte [] buffer;
-		PingOptions options;
-		long rtt;
-		IPStatus status;
-
-		internal PingReply (IPAddress address, byte [] buffer, PingOptions options, long roundtripTime, IPStatus status)
-		{
-			this.address = address;
-			this.buffer = buffer;
-			this.options = options;
-			this.rtt = roundtripTime;
-			this.status = status;
-		}
-
-		public IPAddress Address {
-			get { return address; }
-		}
-
-		public byte [] Buffer {
-			get { return buffer; }
-		}
-
-		public PingOptions Options {
-			get { return options; }
-		}
-
-		public long RoundtripTime {
-			get { return rtt; }
-		}
-
-		public IPStatus Status {
-			get { return status; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PrefixOrigin.cs b/mcs/class/System/System.Net.NetworkInformation/PrefixOrigin.cs
deleted file mode 100644
index f61cf42ddd1..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PrefixOrigin.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Net.NetworkInformation.PrefixOrigin
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public enum PrefixOrigin {
-		Other = 0,
-		Manual = 1,
-		WellKnown = 2,
-		Dhcp = 3,
-		RouterAdvertisement = 4
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/SuffixOrigin.cs b/mcs/class/System/System.Net.NetworkInformation/SuffixOrigin.cs
deleted file mode 100644
index 44d44f29148..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/SuffixOrigin.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Net.NetworkInformation.SuffixOrigin
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public enum SuffixOrigin {
-		Other = 0,
-		Manual = 1,
-		WellKnown = 2,
-		OriginDhcp = 3,
-		LinkLayerAddress = 4,
-		Random = 5
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/TcpConnectionInformation.cs b/mcs/class/System/System.Net.NetworkInformation/TcpConnectionInformation.cs
deleted file mode 100644
index f2aa8622486..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/TcpConnectionInformation.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// System.Net.NetworkInformation.TcpConnectionInformation
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Atsushi Enomoto (atsushi@ximian.com)
-//
-// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System.Net;
-
-namespace System.Net.NetworkInformation {
-	public abstract class TcpConnectionInformation {
-		protected TcpConnectionInformation ()
-		{
-		}
-		
-		public abstract IPEndPoint LocalEndPoint { get; }
-		public abstract IPEndPoint RemoteEndPoint { get; }
-		public abstract TcpState State { get; }
-	}
-
-	class TcpConnectionInformationImpl : TcpConnectionInformation
-	{
-		IPEndPoint local;
-		IPEndPoint remote;
-		TcpState state;
-
-		public TcpConnectionInformationImpl (IPEndPoint local, IPEndPoint remote, TcpState state)
-		{
-			this.local = local;
-			this.remote = remote;
-			this.state = state;
-		}
-
-		public override IPEndPoint LocalEndPoint {
-			get { return local; }
-		}
-		public override IPEndPoint RemoteEndPoint {
-			get { return remote; }
-		}
-		public override TcpState State {
-			get { return state; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/TcpState.cs b/mcs/class/System/System.Net.NetworkInformation/TcpState.cs
deleted file mode 100644
index 75c097b43a7..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/TcpState.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Net.NetworkInformation.TcpState
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net.NetworkInformation {
-	public enum TcpState {
-		Unknown = 0,
-		Closed = 1,
-		Listen = 2,
-		SynSent = 3,
-		SynReceived = 4,
-		Established = 5,
-		FinWait1 = 6,
-		FinWait2 = 7,
-		CloseWait = 8,
-		Closing = 9,
-		LastAck = 10,
-		TimeWait = 11,
-		DeleteTcb = 12
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/TcpStatistics.cs b/mcs/class/System/System.Net.NetworkInformation/TcpStatistics.cs
index 9f8c88a2eb3..6e5fff4fdfe 100644
--- a/mcs/class/System/System.Net.NetworkInformation/TcpStatistics.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/TcpStatistics.cs
@@ -30,27 +30,6 @@ using System.Collections.Specialized;
 using System.Globalization;
 
 namespace System.Net.NetworkInformation {
-	public abstract class TcpStatistics {
-		protected TcpStatistics ()
-		{
-		}
-		
-		public abstract long ConnectionsAccepted { get; }
-		public abstract long ConnectionsInitiated { get; }
-		public abstract long CumulativeConnections { get; }
-		public abstract long CurrentConnections { get; }
-		public abstract long ErrorsReceived { get; }
-		public abstract long FailedConnectionAttempts { get; }
-		public abstract long MaximumConnections { get; }
-		public abstract long MaximumTransmissionTimeout { get; }
-		public abstract long MinimumTransmissionTimeout { get; }
-		public abstract long ResetConnections { get; }
-		public abstract long ResetsSent { get; }
-		public abstract long SegmentsReceived { get; }
-		public abstract long SegmentsResent { get; }
-		public abstract long SegmentsSent { get; }
-	}
-
 	class MibTcpStatistics : TcpStatistics
 	{
 		StringDictionary dic;
diff --git a/mcs/class/System/System.Net.NetworkInformation/UdpStatistics.cs b/mcs/class/System/System.Net.NetworkInformation/UdpStatistics.cs
index 2c9d6962912..2adcdec433c 100644
--- a/mcs/class/System/System.Net.NetworkInformation/UdpStatistics.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/UdpStatistics.cs
@@ -30,18 +30,6 @@ using System.Collections.Specialized;
 using System.Globalization;
 
 namespace System.Net.NetworkInformation {
-	public abstract class UdpStatistics {
-		protected UdpStatistics ()
-		{
-		}
-
-		public abstract long DatagramsReceived { get; }
-		public abstract long DatagramsSent { get; }
-		public abstract long IncomingDatagramsDiscarded { get; }
-		public abstract long IncomingDatagramsWithErrors { get; }
-		public abstract int UdpListeners { get; }
-	}
-
 	class MibUdpStatistics : UdpStatistics
 	{
 		StringDictionary dic;
diff --git a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformation.cs b/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformation.cs
index a7510f033e9..439cab07cf0 100644
--- a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformation.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformation.cs
@@ -159,7 +159,7 @@ namespace System.Net.NetworkInformation {
 					return IPAddress.Any;
 
 				if (ipv4Mask == null)
-					ipv4Mask = NetworkInterface.GetNetMask (address);
+					ipv4Mask = SystemNetworkInterface.GetNetMask (address);
 
 				return ipv4Mask;
 			}
diff --git a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
deleted file mode 100644
index b83959a3faf..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// System.Net.NetworkInformation.UnicastIPAddressInformationCollection
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Atsushi Enomoto (atsushi@ximian.com)
-//
-// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
-namespace System.Net.NetworkInformation {
-	public class UnicastIPAddressInformationCollection : ICollection<UnicastIPAddressInformation>,
-						IEnumerable<UnicastIPAddressInformation> {
-
-		List<UnicastIPAddressInformation> list = new List<UnicastIPAddressInformation> ();
-
-		protected internal UnicastIPAddressInformationCollection ()
-		{
-		}
-
-		public virtual void Add (UnicastIPAddressInformation address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Add (address);
-		}
-
-		public virtual void Clear ()
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			list.Clear ();
-		}
-
-		public virtual bool Contains (UnicastIPAddressInformation address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (UnicastIPAddressInformation [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<UnicastIPAddressInformation> GetEnumerator ()
-		{
-			return ((IEnumerable<UnicastIPAddressInformation>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (UnicastIPAddressInformation address)
-		{
-			if (IsReadOnly)
-				throw new NotSupportedException ("The collection is read-only.");
-			return list.Remove (address);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return true; }
-		}
-
-		public virtual UnicastIPAddressInformation this [int index] {
-			get { return list [index]; }
-		}
-	}
-
-	class UnicastIPAddressInformationImplCollection : UnicastIPAddressInformationCollection
-	{
-		public static readonly UnicastIPAddressInformationImplCollection Empty = new UnicastIPAddressInformationImplCollection (true);
-
-		bool is_readonly;
-
-		// for static methods
-		UnicastIPAddressInformationImplCollection (bool isReadOnly)
-		{
-			is_readonly = isReadOnly;
-		}
-
-		public override bool IsReadOnly {
-			get { return is_readonly; }
-		}
-
-#if !MOBILE
-		public static UnicastIPAddressInformationCollection Win32FromUnicast (int ifIndex, IntPtr ptr)
-		{
-			UnicastIPAddressInformationImplCollection c = new UnicastIPAddressInformationImplCollection (false);
-			Win32_IP_ADAPTER_UNICAST_ADDRESS a;
-			for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
-				a = (Win32_IP_ADAPTER_UNICAST_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_UNICAST_ADDRESS));
-				c.Add (new Win32UnicastIPAddressInformation (ifIndex, a));
-			}
-			c.is_readonly = true;
-			return c;
-		}
-#endif
-
-		public static UnicastIPAddressInformationCollection LinuxFromList (List<IPAddress> addresses)
-		{
-			UnicastIPAddressInformationImplCollection c = new UnicastIPAddressInformationImplCollection (false);
-			foreach (IPAddress address in addresses) {
-				c.Add (new LinuxUnicastIPAddressInformation (address));
-			}
-			c.is_readonly = true;
-			return c;
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/Win32NetworkInterfaceMarshal.cs b/mcs/class/System/System.Net.NetworkInformation/Win32NetworkInterfaceMarshal.cs
index afcd4c36e02..3c3256c7096 100644
--- a/mcs/class/System/System.Net.NetworkInformation/Win32NetworkInterfaceMarshal.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/Win32NetworkInterfaceMarshal.cs
@@ -39,8 +39,11 @@ namespace System.Net.NetworkInformation
 	[StructLayout (LayoutKind.Sequential)]
 	class Win32_FIXED_INFO
 	{
+		// Can't have unresolvable pinvokes on ios
+#if !MOBILE
 		[DllImport ("iphlpapi.dll", SetLastError = true)]
 		static extern int GetNetworkParams (byte [] bytes, ref int size);
+#endif
 
 		static Win32_FIXED_INFO fixed_info;
 
@@ -54,6 +57,7 @@ namespace System.Net.NetworkInformation
 
 		static Win32_FIXED_INFO GetInstance ()
 		{
+#if !MOBILE
 			int len = 0;
 			byte [] bytes = null;
 			GetNetworkParams (null, ref len);
@@ -66,6 +70,9 @@ namespace System.Net.NetworkInformation
 				}
 			}
 			return info;
+#else
+		throw new NotImplementedException ();
+#endif
 		}
 
 		const int MAX_HOSTNAME_LEN = 128;
diff --git a/mcs/class/System/System.Net.Security/EncryptionPolicy.cs b/mcs/class/System/System.Net.Security/EncryptionPolicy.cs
index 4db75cc9655..f9cb48fc731 100644
--- a/mcs/class/System/System.Net.Security/EncryptionPolicy.cs
+++ b/mcs/class/System/System.Net.Security/EncryptionPolicy.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if SECURITY_DEP && !MONO_FEATURE_NEW_TLS
+#if !MONO_FEATURE_NEW_TLS
 namespace System.Net.Security
 {
 	public enum EncryptionPolicy
diff --git a/mcs/class/System/System.Net.Sockets/SafeSocketHandle.cs b/mcs/class/System/System.Net.Sockets/SafeSocketHandle.cs
index 33f83eccec4..968038e5c36 100644
--- a/mcs/class/System/System.Net.Sockets/SafeSocketHandle.cs
+++ b/mcs/class/System/System.Net.Sockets/SafeSocketHandle.cs
@@ -7,7 +7,9 @@
 
 using System;
 using System.IO;
+using System.Text;
 using System.Threading;
+using System.Diagnostics;
 using System.Collections.Generic;
 using Microsoft.Win32.SafeHandles;
 
@@ -16,6 +18,8 @@ namespace System.Net.Sockets {
 	sealed class SafeSocketHandle : SafeHandleZeroOrMinusOneIsInvalid {
 
 		List<Thread> blocking_threads;
+		Dictionary<Thread, StackTrace> threads_stacktraces;
+
 		bool in_cleanup;
 
 		const int SOCKET_CLOSED = 10004;
@@ -26,6 +30,9 @@ namespace System.Net.Sockets {
 		public SafeSocketHandle (IntPtr preexistingHandle, bool ownsHandle) : base (ownsHandle)
 		{
 			SetHandle (preexistingHandle);
+
+			if (THROW_ON_ABORT_RETRIES)
+				threads_stacktraces = new Dictionary<Thread, StackTrace> ();
 		}
 
 		// This is just for marshalling
@@ -48,8 +55,17 @@ namespace System.Net.Sockets {
 					int abort_attempts = 0;
 					while (blocking_threads.Count > 0) {
 						if (abort_attempts++ >= ABORT_RETRIES) {
-							if (THROW_ON_ABORT_RETRIES)
-								throw new Exception ("Could not abort registered blocking threads before closing socket.");
+							if (THROW_ON_ABORT_RETRIES) {
+								StringBuilder sb = new StringBuilder ();
+								sb.AppendLine ("Could not abort registered blocking threads before closing socket.");
+								foreach (var thread in blocking_threads) {
+									sb.AppendLine ("Thread StackTrace:");
+									sb.AppendLine (threads_stacktraces[thread].ToString ());
+								}
+								sb.AppendLine ();
+
+								throw new Exception (sb.ToString ());
+							}
 
 							// Attempts to close the socket safely failed.
 							// We give up, and close the socket with pending blocking system calls.
@@ -94,6 +110,8 @@ namespace System.Net.Sockets {
 				/* We must use a finally block here to make this atomic. */
 				lock (blocking_threads) {
 					blocking_threads.Add (Thread.CurrentThread);
+					if (THROW_ON_ABORT_RETRIES)
+						threads_stacktraces.Add (Thread.CurrentThread, new StackTrace (true));
 				}
 				if (release)
 					DangerousRelease ();
@@ -110,6 +128,9 @@ namespace System.Net.Sockets {
 			//If this NRE, we're in deep problems because Register Must have
 			lock (blocking_threads) {
 				blocking_threads.Remove (Thread.CurrentThread);
+				if (THROW_ON_ABORT_RETRIES)
+					threads_stacktraces.Remove (Thread.CurrentThread);
+
 				if (in_cleanup && blocking_threads.Count == 0)
 					Monitor.Pulse (blocking_threads);
 			}
diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs
index b41d204ace8..c7576897189 100644
--- a/mcs/class/System/System.Net.Sockets/Socket.cs
+++ b/mcs/class/System/System.Net.Sockets/Socket.cs
@@ -702,8 +702,8 @@ namespace System.Net.Sockets
 			set {
 				ThrowIfDisposedAndClosed ();
 
-				if (value < 0)
-					throw new ArgumentOutOfRangeException ("value", "The value specified for a set operation is less than zero");
+				if (value < 0 || value > 255)
+					throw new ArgumentOutOfRangeException ("value", "The value specified for a set operation is less than zero or greater than 255.");
 
 				switch (address_family) {
 				case AddressFamily.InterNetwork:
@@ -3167,27 +3167,24 @@ namespace System.Net.Sockets
 
 		public void SetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, bool optionValue)
 		{
-			ThrowIfDisposedAndClosed ();
-
-			int error;
 			int int_val = optionValue ? 1 : 0;
-			SetSocketOption_internal (safe_handle, optionLevel, optionName, null, null, int_val, out error);
 
-			if (error != 0) {
-				if (error == (int) SocketError.InvalidArgument)
-					throw new ArgumentException ();
-				throw new SocketException (error);
-			}
+			SetSocketOption (optionLevel, optionName, int_val);
 		}
 
 		public void SetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, int optionValue)
 		{
 			ThrowIfDisposedAndClosed ();
 
+			if (optionLevel == SocketOptionLevel.Socket && optionName == SocketOptionName.ReuseAddress && optionValue != 0 && !SupportsPortReuse (protocol_type))
+				throw new SocketException ((int) SocketError.OperationNotSupported, "Operating system sockets do not support ReuseAddress.\nIf your socket is not intended to bind to the same address and port multiple times remove this option, otherwise you should ignore this exception inside a try catch and check that ReuseAddress is true before binding to the same address and port multiple times.");
+
 			int error;
 			SetSocketOption_internal (safe_handle, optionLevel, optionName, null, null, optionValue, out error);
 
 			if (error != 0) {
+				if (error == (int) SocketError.InvalidArgument)
+					throw new ArgumentException ();
 				throw new SocketException (error);
 			}
 		}
@@ -3482,7 +3479,7 @@ namespace System.Net.Sockets
 		internal static extern void cancel_blocking_socket_operation (Thread thread);
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		internal static extern bool SupportsPortReuse ();
+		internal static extern bool SupportsPortReuse (ProtocolType proto);
 	}
 }
 
diff --git a/mcs/class/System/System.Net/AuthenticationManager.cs b/mcs/class/System/System.Net/AuthenticationManager.cs
index 679bd5ae1ea..e987c5bd55f 100644
--- a/mcs/class/System/System.Net/AuthenticationManager.cs
+++ b/mcs/class/System/System.Net/AuthenticationManager.cs
@@ -136,7 +136,7 @@ namespace System.Net
 					if (auth == null)
 						continue;
 
-					auth.Module = mod;
+					auth.ModuleAuthenticationType = mod.AuthenticationType;
 					return auth;
 				}
 			}
@@ -159,7 +159,7 @@ namespace System.Net
 					if (auth == null)
 						continue;
 
-					auth.Module = mod;
+					auth.ModuleAuthenticationType = mod.AuthenticationType;
 					return auth;
 				}
 			}
diff --git a/mcs/class/System/System.Net/AuthenticationSchemeSelector.cs b/mcs/class/System/System.Net/AuthenticationSchemeSelector.cs
deleted file mode 100644
index e20ccb4465a..00000000000
--- a/mcs/class/System/System.Net/AuthenticationSchemeSelector.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Net.AuthenticationSchemeSelector.cs
-//
-// Author:
-//	Gonzalo Paniagua Javier  <gonzalo@novell.com>
-//
-// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if SECURITY_DEP
-
-namespace System.Net {
-	public delegate AuthenticationSchemes AuthenticationSchemeSelector (HttpListenerRequest httpRequest);
-}
-#endif
-
diff --git a/mcs/class/System/System.Net/AuthenticationSchemes.cs b/mcs/class/System/System.Net/AuthenticationSchemes.cs
deleted file mode 100644
index 0a599855537..00000000000
--- a/mcs/class/System/System.Net/AuthenticationSchemes.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// System.Net.AuthenticationSchemes.cs
-//
-// Author:
-//	Atsushi Enomoto  <atsushi@ximian.com>
-//
-// (C) 2005 Novell, Inc. (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System.Collections;
-using System.Configuration;
-
-namespace System.Net
-{
-	[Flags]
-	public enum AuthenticationSchemes {
-		None,
-		Digest = 1,
-		Negotiate = 2,
-		Ntlm = 4,
-		IntegratedWindowsAuthentication = 6,
-		Basic = 8,
-		Anonymous = 0x8000,
-	}
-}
-
diff --git a/mcs/class/System/System.Net/Authorization.cs b/mcs/class/System/System.Net/Authorization.cs
deleted file mode 100644
index a80845485b1..00000000000
--- a/mcs/class/System/System.Net/Authorization.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// System.Net.Authorization.cs
-//
-// Author:
-//   Miguel de Icaza (miguel@ximian.com)
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-// (C) Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net {
-
-	public class Authorization {
-		string token;
-		bool complete;
-		string connectionGroupId;
-		string [] protectionRealm;
-		IAuthenticationModule module;
-		
-		public Authorization (string token) : this (token, true)
-		{
-		}
-
-		public Authorization (string token, bool finished) 
-			: this (token, finished, null)
-		{
-		}
-		
-		public Authorization (string token, bool finished, string connectionGroupId)
-		{
-			this.token = token;
-			this.complete = finished;
-			this.connectionGroupId = connectionGroupId;
-		}
-
-		public string Message {
-			get { return token; }
-		}
-
-		public bool Complete {
-			get { return complete; }
-		}
-
-		public string ConnectionGroupId {
-			get { return connectionGroupId; }
-		}	
-		
-		public string[] ProtectionRealm {
-			get { return protectionRealm; }
-			set { protectionRealm = value; }
-		}
-
-		internal IAuthenticationModule Module {
-			get { return module; }
-			set { module = value; }
-		}
-
-		static Exception GetMustImplement ()
-		{
-			return new NotImplementedException ();
-		}
-		
-		[MonoTODO]
-		public bool MutuallyAuthenticated
-		{
-			get {
-				throw GetMustImplement ();
-			}
-			set {
-				throw GetMustImplement ();
-			}
-		}
-	}
-}
diff --git a/mcs/class/System/System.Net/ConnectionModes.cs b/mcs/class/System/System.Net/ConnectionModes.cs
deleted file mode 100644
index 0be4e4d90ed..00000000000
--- a/mcs/class/System/System.Net/ConnectionModes.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// ConnectionModes.cs
-//
-// This code was automatically generated from
-// ECMA CLI XML Library Specification.
-// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
-// Created: Wed, 5 Sep 2001 06:35:39 UTC
-// Source file: all.xml
-// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-namespace System.Net {
-
-
-	/// <summary>
-	/// </summary>
-	enum ConnectionModes {
-
-		/// <summary>
-		/// </summary>
-		Single = 0,
-
-		/// <summary>
-		/// </summary>
-		Persistent = 1,
-
-		/// <summary>
-		/// </summary>
-		Pipeline = 2,
-
-		/// <summary>
-		/// </summary>
-		Mux = 3,
-	} // ConnectionModes
-
-} // System.Net
diff --git a/mcs/class/System/System.Net/CredentialCache.cs b/mcs/class/System/System.Net/CredentialCache.cs
deleted file mode 100644
index 9978daa46d7..00000000000
--- a/mcs/class/System/System.Net/CredentialCache.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-//
-// System.Net.CredentialCache.cs
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Runtime.Serialization;
-
-namespace System.Net {
-	public class CredentialCache : ICredentials, IEnumerable, ICredentialsByHost
-	{
-		static NetworkCredential empty = new NetworkCredential (String.Empty, String.Empty, String.Empty);
-		Hashtable cache;
-		Hashtable cacheForHost;
-
-		public CredentialCache () 
-		{
-			cache = new Hashtable ();
-			cacheForHost = new Hashtable ();
-		}
-		
-		[MonoTODO ("Need EnvironmentPermission implementation first")]
-		public static ICredentials DefaultCredentials {
-			get {
-				// This is used for NTLM, Kerberos and Negotiate under MS
-				return empty;
-			}
-		}
-
-		// MS does might return a special ICredentials which does not allow getting the
-		// username/password information out of it for non-internal classes.
-		public static NetworkCredential DefaultNetworkCredentials {
-			get { return empty; }
-		}
-
-		public NetworkCredential GetCredential (Uri uriPrefix, string authType)
-		{
-			int longestPrefix = -1;
-			NetworkCredential result = null;
-			
-			if (uriPrefix == null || authType == null)
-				return null;
-				
-			string absPath = uriPrefix.AbsolutePath;
-			absPath = absPath.Substring (0, absPath.LastIndexOf ('/'));
-			
-			IDictionaryEnumerator e = cache.GetEnumerator ();
-			while (e.MoveNext ()) {
-				CredentialCacheKey key = e.Key as CredentialCacheKey;
-				
-				if (key.Length <= longestPrefix) 
-					continue;
-				
-				if (String.Compare (key.AuthType, authType, true) != 0)
-					continue;
-				
-				Uri cachedUri = key.UriPrefix;
-				
-				if (cachedUri.Scheme != uriPrefix.Scheme)
-					continue;
-					
-				if (cachedUri.Port != uriPrefix.Port)
-					continue;
-					
-				if (cachedUri.Host != uriPrefix.Host)
-					continue;
-								
-				if (!absPath.StartsWith (key.AbsPath))
-					continue;
-					
-				longestPrefix = key.Length;
-				result = (NetworkCredential) e.Value;
-			}
-			
-			return result;
-		}
-
-		public IEnumerator GetEnumerator ()
-		{
-			return cache.Values.GetEnumerator ();
-		}		
-		
-		public void Add (Uri uriPrefix, string authType, NetworkCredential cred)
-		{
-			if (uriPrefix == null) 
-				throw new ArgumentNullException ("uriPrefix");
-
-			if (authType == null) 
-				throw new ArgumentNullException ("authType");
-			
-			// throws ArgumentException when same key already exists.
-			cache.Add (new CredentialCacheKey (uriPrefix, authType), cred);
-		}
-		
-		public void Remove (Uri uriPrefix, string authType)
-		{
-			if (uriPrefix == null) 
-				throw new ArgumentNullException ("uriPrefix");
-
-			if (authType == null) 
-				throw new ArgumentNullException ("authType");
-
-			cache.Remove (new CredentialCacheKey (uriPrefix, authType));
-		}
-		
-		public NetworkCredential GetCredential (string host, int port, string authenticationType)
-		{
-			NetworkCredential result = null;
-			
-			if (host == null || port < 0 || authenticationType == null)
-				return null;
-
-			IDictionaryEnumerator e = cacheForHost.GetEnumerator ();
-			while (e.MoveNext ()) {
-				CredentialCacheForHostKey key = e.Key as CredentialCacheForHostKey;
-				
-				if (String.Compare (key.AuthType, authenticationType, true) != 0)
-					continue;
-				
-				if (key.Host != host)
-					continue;
-				
-				if (key.Port != port)
-					continue;
-				
-				result = (NetworkCredential) e.Value;
-			}
-			
-			return result;
-		}
-
-		public void Add (string host, int port, string authenticationType, NetworkCredential credential)
-		{
-			if (host == null)
-				throw new ArgumentNullException("host");
-
-			if (port < 0)
-				throw new ArgumentOutOfRangeException("port");
-
-			if (authenticationType == null)
-				throw new ArgumentOutOfRangeException("authenticationType");
-
-			cacheForHost.Add (new CredentialCacheForHostKey (host, port, authenticationType), credential);
-		}
-
-		public void Remove (string host, int port, string authenticationType)
-		{
-			if (host == null)
-				return;
-
-			if (authenticationType == null)
-				return;
-
-			cacheForHost.Remove (new CredentialCacheForHostKey (host, port, authenticationType));
-		}
-
-		class CredentialCacheKey {
-			Uri uriPrefix;
-			string authType;
-			string absPath;
-			int len;
-			int hash;
-			
-			internal CredentialCacheKey (Uri uriPrefix, string authType)
-			{
-				this.uriPrefix = uriPrefix;
-				this.authType = authType;
-				
-				this.absPath = uriPrefix.AbsolutePath;
-				this.absPath = absPath.Substring (0, absPath.LastIndexOf ('/'));				
-
-				this.len = uriPrefix.AbsoluteUri.Length;
-				this.hash = uriPrefix.GetHashCode () 
-				          + authType.GetHashCode ();
-			}
-			
-			public int Length {
-				get { return len; }
-			}			
-			
-			public string AbsPath {
-				get { return absPath; }
-			}
-			
-			public Uri UriPrefix {
-				get { return uriPrefix; }
-			}
-			
-			public string AuthType {
-				get { return authType; }
-			}
-			
-			public override int GetHashCode ()
-			{
-				return hash;
-			}
-			
-			public override bool Equals (object obj)
-			{
-				CredentialCacheKey key = obj as CredentialCacheKey;
-				return ((key != null) && (this.hash == key.hash));
-			}
-			
-			public override string ToString ()
-			{
-				return absPath + " : " + authType + " : len=" + len;
-			}
-		}
-
-		class CredentialCacheForHostKey {
-			string host;
-			int port;
-			string authType;
-			int hash;
-
-			internal CredentialCacheForHostKey (string host, int port, string authType)
-			{
-				this.host = host;
-				this.port = port;
-				this.authType = authType;
-
-				this.hash = host.GetHashCode ()
-					+ port.GetHashCode ()
-					+ authType.GetHashCode ();
-			}
-
-			public string Host {
-				get { return host; }
-			}
-
-			public int Port {
-				get { return port; }
-			}
-
-			public string AuthType {
-				get { return authType; }
-			}
-
-		public override int GetHashCode ()
-		{
-			return hash;
-		}
-
-		public override bool Equals (object obj)
-		{
-			CredentialCacheForHostKey key = obj as CredentialCacheForHostKey;
-			return ((key != null) && (this.hash == key.hash));
-		}
-
-		public override string ToString ()
-		{
-			return host + " : " + authType;
-		}
-	}
-}
-}
-
-
diff --git a/mcs/class/System/System.Net/DnsEndPoint.cs b/mcs/class/System/System.Net/DnsEndPoint.cs
deleted file mode 100644
index a7f119e60b9..00000000000
--- a/mcs/class/System/System.Net/DnsEndPoint.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// System.Net.DnsEndPoint
-//
-// Authors:
-//	Stephane Delcroix  <stephane@delcroix.org>
-//
-// (c) 2007, 2009 Novell, Inc. (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System.Net.Sockets;
-
-namespace System.Net { 
-
-#if NET_2_1
-	sealed
-#endif
-	public class DnsEndPoint : EndPoint {
-		string host;
-		int port;
-		AddressFamily addressFamily = AddressFamily.Unspecified;
-
-		public DnsEndPoint (string host, int port)
-		{
-			if (host == null)
-				throw new ArgumentNullException ("host");
-			if (host == String.Empty)
-				throw new ArgumentException ("host parameter contains an empty string");
-			if (port < 0 || port > 0xffff)
-				throw new ArgumentOutOfRangeException ("port is less than 0 or greater than 0xffff");
-
-			this.host = host;
-			this.port = port;
-		}
-
-		public DnsEndPoint (string host, int port, AddressFamily addressFamily) : this (host, port)
-		{
-			switch (addressFamily) {
-			case AddressFamily.InterNetwork:
-			case AddressFamily.InterNetworkV6:
-			case AddressFamily.Unspecified:
-				this.addressFamily = addressFamily;
-				break;
-			default:
-				// throw for Unknown or any invalid value
-				throw new ArgumentException ("addressFamily");
-			}
-		}
-
-		public override bool Equals (object comparand)
-		{
-			DnsEndPoint dep = (comparand as DnsEndPoint);
-			return (comparand != null) && Equals (dep);
-		}
-
-		private bool Equals (DnsEndPoint other)
-		{
-			if (port != other.port || addressFamily != other.addressFamily|| host != other.host)
-				return false;
-			return true;
-		}
-
-		public override int GetHashCode ()
-		{
-			return port ^ (int)addressFamily ^ host.GetHashCode ();
-		}
-
-		public override string ToString ()
-		{
-			return String.Format ("{0}/{1}:{2}", addressFamily, host, port);
-		}
-
-		public override AddressFamily AddressFamily {
-			get { return addressFamily; }
-		}
-
-		public string Host {
-			get { return host; }
-		}
-
-		public int Port {
-			get { return port; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net/DownloadProgressChangedEventHandler.cs b/mcs/class/System/System.Net/DownloadProgressChangedEventHandler.cs
deleted file mode 100644
index 1f28234772d..00000000000
--- a/mcs/class/System/System.Net/DownloadProgressChangedEventHandler.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// DownloadProgressChangedEventHandler.cs
-//
-// Author:
-//	Atsushi Enomoto  <atsushi@ximian.com>
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net
-{
-	public delegate void DownloadProgressChangedEventHandler (object sender, DownloadProgressChangedEventArgs e);
-}
-
diff --git a/mcs/class/System/System.Net/EndPoint.cs b/mcs/class/System/System.Net/EndPoint.cs
deleted file mode 100644
index 6e1f4483b81..00000000000
--- a/mcs/class/System/System.Net/EndPoint.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// System.Net.EndPoint.cs
-//
-// Author:
-//   Dick Porter (dick@ximian.com)
-//
-// (C) Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Net.Sockets;
-
-namespace System.Net {
-	[Serializable]
-	public abstract class EndPoint {
-
-		// NB: These methods really do nothing but throw
-		// NotImplementedException
-		
-		public virtual AddressFamily AddressFamily {
-			get { throw NotImplemented (); }
-		}
-		
-		public virtual EndPoint Create (SocketAddress socketAddress)
-		{
-			throw NotImplemented ();
-		}
-
-		public virtual SocketAddress Serialize ()
-		{
-			throw NotImplemented ();
-		}
-
-		protected EndPoint ()
-		{
-		}
-
-		static Exception NotImplemented ()
-		{
-			// hide the "normal" NotImplementedException from corcompare-like tools
-			return new NotImplementedException ();
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net/EndPointListener.cs b/mcs/class/System/System.Net/EndPointListener.cs
index 5400d73b87e..b7aae27d7f9 100644
--- a/mcs/class/System/System.Net/EndPointListener.cs
+++ b/mcs/class/System/System.Net/EndPointListener.cs
@@ -73,7 +73,8 @@ namespace System.Net {
 			SocketAsyncEventArgs args = new SocketAsyncEventArgs ();
 			args.UserToken = this;
 			args.Completed += OnAccept;
-			Accept (sock, args);
+			Socket dummy = null;
+			Accept (sock, args, ref dummy);
 			prefixes = new Hashtable ();
 			unregistered = new Dictionary<HttpConnection, HttpConnection> ();
 		}
@@ -82,9 +83,21 @@ namespace System.Net {
 			get { return listener; }
 		}
 
-		static void Accept (Socket socket, SocketAsyncEventArgs e) {
+		static void Accept (Socket socket, SocketAsyncEventArgs e, ref Socket accepted) {
 			e.AcceptSocket = null;
-			var asyn = socket.AcceptAsync(e);
+			bool asyn;
+			try {
+				asyn = socket.AcceptAsync(e);
+			} catch {
+				if (accepted != null) {
+					try {
+						accepted.Close ();
+					} catch {
+					}
+					accepted = null;
+				}
+				return;
+			}
 			if (!asyn) {
 				ProcessAccept(e);
 			}
@@ -100,7 +113,7 @@ namespace System.Net {
 			EndPointListener epl = (EndPointListener) args.UserToken;
 
 
-			Accept (epl.sock, args);
+			Accept (epl.sock, args, ref accepted);
 			if (accepted == null)
 				return;
 
diff --git a/mcs/class/System/System.Net/FileWebRequest.cs b/mcs/class/System/System.Net/FileWebRequest.cs
deleted file mode 100644
index 618c09ee145..00000000000
--- a/mcs/class/System/System.Net/FileWebRequest.cs
+++ /dev/null
@@ -1,342 +0,0 @@
-//
-// System.Net.FileWebRequest
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Remoting.Messaging;
-using System.Threading;
-
-namespace System.Net 
-{
-	[Serializable]
-	public class FileWebRequest : WebRequest, ISerializable
-	{
-		private Uri uri;
-		private WebHeaderCollection webHeaders;
-		
-		private ICredentials credentials;
-		private string connectionGroup;
-		private long contentLength;
-		private FileAccess fileAccess = FileAccess.Read;
-		private string method = "GET";
-		private IWebProxy proxy;
-		private bool preAuthenticate;
-		private int timeout = 100000;
-		
-		private Stream requestStream;
-		private FileWebResponse webResponse;
-		private AutoResetEvent requestEndEvent;
-		private bool requesting;
-		private bool asyncResponding;
-		
-		// Constructors
-		
-		internal FileWebRequest (Uri uri) 
-		{ 
-			this.uri = uri;
- 			this.webHeaders = new WebHeaderCollection ();
-		}
-		
-		[Obsolete ("Serialization is obsoleted for this type", false)]
-		protected FileWebRequest (SerializationInfo serializationInfo, StreamingContext streamingContext) 
-		{
-			SerializationInfo info = serializationInfo;
-			webHeaders = (WebHeaderCollection) info.GetValue ("headers", typeof (WebHeaderCollection));
-			proxy = (IWebProxy) info.GetValue ("proxy", typeof (IWebProxy));
-			uri = (Uri) info.GetValue ("uri", typeof (Uri));
-			connectionGroup = info.GetString ("connectionGroupName");
-			method = info.GetString ("method");
-			contentLength = info.GetInt64 ("contentLength");
-			timeout = info.GetInt32 ("timeout");
-			fileAccess = (FileAccess) info.GetValue ("fileAccess", typeof (FileAccess));
-			preAuthenticate = info.GetBoolean ("preauthenticate");
-		}
-		
-		// Properties
-		
-		// currently not used according to spec
-		public override string ConnectionGroupName {
-			get { return connectionGroup; }
-			set { connectionGroup = value; }
-		}
-		
-		public override long ContentLength {
-			get { return contentLength; }
-			set {
-				if (value < 0)
-					throw new ArgumentException ("The Content-Length value must be greater than or equal to zero.", "value");
-				contentLength =  value;
-			}
-		}
-		
-		public override string ContentType { 
-			get { return webHeaders ["Content-Type"]; }
-			set { webHeaders ["Content-Type"] = value; }
-		}
-		
-		public override ICredentials Credentials { 
-			get { return credentials; }
-			set { credentials = value; }
-		}
-		
-		public override WebHeaderCollection Headers { 
-			get { return webHeaders; }
-		}
-		
-		// currently not used according to spec
-		public override string Method { 
-			get { return this.method; }
-			set {
-				if (value == null || value.Length == 0)
-					throw new ArgumentException ("Cannot set null or blank "
-						+ "methods on request.", "value");
-				this.method = value;
-			}
-		}
-		
-		// currently not used according to spec
-		public override bool PreAuthenticate { 
-			get { return preAuthenticate; }
-			set { preAuthenticate = value; }
-		}
-		
-		// currently not used according to spec
-		public override IWebProxy Proxy {
-			get { return proxy; }
-			set { proxy = value; }
-		}
-		
-		public override Uri RequestUri { 
-			get { return this.uri; }
-		}
-		
-		public override int Timeout { 
-			get { return timeout; }
-			set { 
-				if (value < -1)
-					throw new ArgumentOutOfRangeException ("Timeout can be "
-						+ "only set to 'System.Threading.Timeout.Infinite' "
-						+ "or a value >= 0.");
-				timeout = value;
-			}
-		}
-
-		public override bool UseDefaultCredentials
-		{
-			get {
-				throw new NotSupportedException ();
-			}
-			set {
-				throw new NotSupportedException ();
-			}
-		}
-		// Methods
-		
-		private delegate Stream GetRequestStreamCallback ();
-		private delegate WebResponse GetResponseCallback ();
-
-		static Exception GetMustImplement ()
-		{
-			return new NotImplementedException ();
-		}
-		
-		/* LAMESPEC: Docs suggest this was present in 1.1 and
-		 * 1.0 profiles, but the masterinfos say otherwise
-		 */
-		[MonoTODO]
-		public override void Abort ()
-		{
-			throw GetMustImplement ();
-		}
-
-		public override IAsyncResult BeginGetRequestStream (AsyncCallback callback, object state) 
-		{
-			if (string.Compare ("GET", method, true) == 0 ||
-				string.Compare ("HEAD", method, true) == 0 ||
-				string.Compare ("CONNECT", method, true) == 0)
-				throw new ProtocolViolationException ("Cannot send a content-body with this verb-type.");
-			lock (this) {
-				if (asyncResponding || webResponse != null)
-					throw new InvalidOperationException ("This operation cannot be performed after the request has been submitted.");
-				if (requesting)
-					throw new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");
-				requesting = true;
-			}
-			GetRequestStreamCallback c = new GetRequestStreamCallback (this.GetRequestStreamInternal);
-			return c.BeginInvoke (callback, state);
-		}
-		
-		public override Stream EndGetRequestStream (IAsyncResult asyncResult)
-		{
-			if (asyncResult == null)
-				throw new ArgumentNullException ("asyncResult");
-			if (!asyncResult.IsCompleted)
-				asyncResult.AsyncWaitHandle.WaitOne ();
-			AsyncResult async = (AsyncResult) asyncResult;
-			GetRequestStreamCallback cb = (GetRequestStreamCallback) async.AsyncDelegate;
-			return cb.EndInvoke (asyncResult);
-		}
-
-		public override Stream GetRequestStream()
-		{
-			IAsyncResult asyncResult = BeginGetRequestStream (null, null);
-			if (!(asyncResult.AsyncWaitHandle.WaitOne (timeout, false))) {
-				throw new WebException("The request timed out", WebExceptionStatus.Timeout);
-			}
-			return EndGetRequestStream (asyncResult);
-		}
-		
-		internal Stream GetRequestStreamInternal ()
-		{
-			this.requestStream = new FileWebStream (
-						this,
-						FileMode.Create,
-						FileAccess.Write, 
-						FileShare.Read);
-			return this.requestStream;
-		}
-		
-		public override IAsyncResult BeginGetResponse (AsyncCallback callback, object state)
-		{
-			lock (this) {
-				if (asyncResponding)
-					throw new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");
-				asyncResponding = true;
-			}
-			GetResponseCallback c = new GetResponseCallback (this.GetResponseInternal);
-			return c.BeginInvoke (callback, state);
-		}
-		
-		public override WebResponse EndGetResponse (IAsyncResult asyncResult)
-		{
-			if (asyncResult == null)
-				throw new ArgumentNullException ("asyncResult");
-			if (!asyncResult.IsCompleted)
-				asyncResult.AsyncWaitHandle.WaitOne ();
-			AsyncResult async = (AsyncResult) asyncResult;
-			GetResponseCallback cb = (GetResponseCallback) async.AsyncDelegate;
-			FileWebResponse webResponse = (FileWebResponse) cb.EndInvoke(asyncResult);
-			asyncResponding = false;
-			if (webResponse.HasError)
-				throw webResponse.Error;
-			return webResponse;
-		}
-		
-		public override WebResponse GetResponse ()
-		{
-			IAsyncResult asyncResult = BeginGetResponse (null, null);
-			if (!(asyncResult.AsyncWaitHandle.WaitOne (timeout, false))) {
-				throw new WebException("The request timed out", WebExceptionStatus.Timeout);
-			}
-			return EndGetResponse (asyncResult);
-		}
-		
-		WebResponse GetResponseInternal ()
-		{
-			if (webResponse != null)
-				return webResponse;
-			lock (this) {
-				if (requesting) {
-					requestEndEvent = new AutoResetEvent (false);
-				}
-			}
-			if (requestEndEvent != null) {
-				requestEndEvent.WaitOne ();
-			}
-			FileStream fileStream = null;
-			try {
-				fileStream = new FileWebStream (this, FileMode.Open, FileAccess.Read, FileShare.Read);
-				this.webResponse = new FileWebResponse (this.uri, fileStream);
-			} catch (Exception ex) {
-				this.webResponse = new FileWebResponse (this.uri, new WebException (ex.Message, ex));
-			}
-			return this.webResponse;
-		}
-		
-		void ISerializable.GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			GetObjectData (serializationInfo, streamingContext);
-		}
-
-		protected override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			SerializationInfo info = serializationInfo;
-			info.AddValue ("headers", webHeaders, typeof (WebHeaderCollection));
-			info.AddValue ("proxy", proxy, typeof (IWebProxy));
-			info.AddValue ("uri", uri, typeof (Uri));
-			info.AddValue ("connectionGroupName", connectionGroup);
-			info.AddValue ("method", method);
-			info.AddValue ("contentLength", contentLength);
-			info.AddValue ("timeout", timeout);
-			info.AddValue ("fileAccess", fileAccess);
-			info.AddValue ("preauthenticate", false);
-		}
-		
-		internal void Close ()
-		{
-			// already done in class below
-			// if (requestStream != null) {
-			// 	requestStream.Close ();
-			// }
-
-			lock (this) {
-				requesting = false;
-				if (requestEndEvent != null) 
-					requestEndEvent.Set ();
-				// requestEndEvent = null;
-			}
-		}
-		
-		// to catch the Close called on the FileStream
-		internal class FileWebStream : FileStream
-		{
-			FileWebRequest webRequest;
-			
-			internal FileWebStream (FileWebRequest webRequest,    
-					   	FileMode mode,
-					   	FileAccess access,
-					   	FileShare share)
-				: base (webRequest.RequestUri.LocalPath, 
-					mode, access, share)
-			{
-				this.webRequest = webRequest;
-			}
-			
-			public override void Close() 
-			{
-				base.Close ();
-				FileWebRequest req = webRequest;
-				webRequest = null;
-				if (req != null)
-					req.Close ();
-			}
-		}
-	}
-}
diff --git a/mcs/class/System/System.Net/FileWebRequestCreator.cs b/mcs/class/System/System.Net/FileWebRequestCreator.cs
deleted file mode 100644
index 06601bb3d0f..00000000000
--- a/mcs/class/System/System.Net/FileWebRequestCreator.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Net.FileWebRequestCreator
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2003 Ximian, Inc (http://www.ximian.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net
-{
-	class FileWebRequestCreator : IWebRequestCreate
-	{
-		internal FileWebRequestCreator ()
-		{
-		}
-
-		public WebRequest Create (Uri uri)
-		{
-			return new FileWebRequest (uri);
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net/FileWebResponse.cs b/mcs/class/System/System.Net/FileWebResponse.cs
deleted file mode 100644
index 3d8ca215054..00000000000
--- a/mcs/class/System/System.Net/FileWebResponse.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-//
-// System.Net.FileWebResponse
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Runtime.Serialization;
-
-namespace System.Net 
-{
-	[Serializable]
-	public class FileWebResponse : WebResponse, ISerializable, IDisposable
-	{
-		private Uri responseUri;
-		private FileStream fileStream;
-		private long contentLength;
-		private WebHeaderCollection webHeaders;
-		private bool disposed;
-		Exception exception;
-		
-		// Constructors
-		
-		internal FileWebResponse (Uri responseUri, FileStream fileStream)
-		{
-			try {
-				this.responseUri = responseUri;
-				this.fileStream = fileStream;
-				this.contentLength = fileStream.Length;
-				this.webHeaders = new WebHeaderCollection ();
-				this.webHeaders.Add ("Content-Length", Convert.ToString (contentLength));
-				this.webHeaders.Add ("Content-Type", "application/octet-stream");
-			} catch (Exception e) {
-				throw new WebException (e.Message, e);
-			}
-		}
-
-		internal FileWebResponse (Uri responseUri, WebException exception)
-		{
-			this.responseUri = responseUri;
-			this.exception = exception;
-		}
-		
-		[Obsolete ("Serialization is obsoleted for this type", false)]
-		protected FileWebResponse (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			SerializationInfo info = serializationInfo;
-
-			responseUri = (Uri) info.GetValue ("responseUri", typeof (Uri));
-			contentLength = info.GetInt64 ("contentLength");
-			webHeaders = (WebHeaderCollection) info.GetValue ("webHeaders", typeof (WebHeaderCollection));
-		}
-		
-		// Properties
-		internal bool HasError {
-			get { return exception != null; }
-		}
-
-		internal Exception Error {
-			get { return exception; }
-		}
-		
-		public override long ContentLength {
-			get {
-				CheckDisposed ();
-				return this.contentLength;
-			}
-		}
-		
-		public override string ContentType {
-			get {
-				CheckDisposed ();
-				return "application/octet-stream";
-			}
-		}
-		
-		public override WebHeaderCollection Headers {
-			get {
-				CheckDisposed ();
-				return this.webHeaders;
-			}
-		}
-		
-		public override Uri ResponseUri {
-			get {
-				CheckDisposed ();
-				return this.responseUri;
-			}
-		}
-
-		// Methods
-
-		void ISerializable.GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			GetObjectData (serializationInfo, streamingContext);
-		}
-
-		protected override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			SerializationInfo info = serializationInfo;
-
-			info.AddValue ("responseUri", responseUri, typeof (Uri));
-			info.AddValue ("contentLength", contentLength);
-			info.AddValue ("webHeaders", webHeaders, typeof (WebHeaderCollection));
-		}
-
-		public override Stream GetResponseStream()
-		{
-			CheckDisposed ();
-			return this.fileStream;
-		}
-				
-		// Cleaning up stuff
-		
-		~FileWebResponse ()
-		{
-			Dispose (false);
-		}		
-		
-		public override void Close()
-		{
-			((IDisposable) this).Dispose ();
-		}
-
-		void IDisposable.Dispose()
-		{
-			Dispose (true);
-			
-			// see spec, suppress finalization of this object.
-			GC.SuppressFinalize (this);  
-		}
-		
-		protected override
-		void Dispose (bool disposing)
-		{
-			if (this.disposed)
-				return;
-			this.disposed = true;
-			
-			if (disposing) {
-				// release managed resources
-				this.responseUri = null;
-				this.webHeaders = null;
-			}
-			
-			// release unmanaged resources
-			FileStream stream = fileStream;
-			fileStream = null;
-			if (stream != null)
-				stream.Close (); // also closes webRequest
-			base.Dispose (disposing);
-		}
-		
-		private void CheckDisposed ()
-		{
-			if (disposed)
-				throw new ObjectDisposedException (GetType ().FullName);
-		}		
-	}
-}
diff --git a/mcs/class/System/System.Net/FtpStatusCode.cs b/mcs/class/System/System.Net/FtpStatusCode.cs
deleted file mode 100644
index 516124fa3e0..00000000000
--- a/mcs/class/System/System.Net/FtpStatusCode.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// System.Net.FtpStatusCode.cs
-//
-// Author:
-// 	Carlos Alberto Cortez (calberto.oortez@gmail.com)
-//
-// (c) Copyright 2005 Novell, Inc. (http://www.ximian.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net
-{
-	public enum FtpStatusCode
-	{
-		Undefined = 0,
-		RestartMarker = 110,
-		ServiceTemporarilyNotAvailable = 120,
-		DataAlreadyOpen = 125,
-		OpeningData = 150,
-		CommandOK = 200,
-		CommandExtraneous = 202,
-		DirectoryStatus = 212,
-		FileStatus = 213,
-		SystemType = 215,
-		SendUserCommand = 220,
-		ClosingControl = 221,
-		ClosingData = 226,
-		EnteringPassive = 227,
-		LoggedInProceed = 230,
-		ServerWantsSecureSession = 234,
-		FileActionOK = 250,
-		PathnameCreated = 257,
-		SendPasswordCommand = 331,
-		NeedLoginAccount = 332,
-		FileCommandPending = 350,
-		ServiceNotAvailable = 421,
-		CantOpenData = 425,
-		ConnectionClosed = 426,
-		ActionNotTakenFileUnavailableOrBusy = 450,
-		ActionAbortedLocalProcessingError = 451,
-		ActionNotTakenInsufficientSpace = 452,
-		CommandSyntaxError = 500,
-		ArgumentSyntaxError = 501,
-		CommandNotImplemented = 502,
-		BadCommandSequence = 503,
-		NotLoggedIn = 530,
-		AccountNeeded = 532,
-		ActionNotTakenFileUnavailable = 550,
-		ActionAbortedUnknownPageType = 551,
-		FileActionAborted = 552,
-		ActionNotTakenFilenameNotAllowed = 553
-	}
-}
-
-
diff --git a/mcs/class/System/System.Net/FtpWebResponse.cs b/mcs/class/System/System.Net/FtpWebResponse.cs
index 68f06774435..ba47bdfb36b 100644
--- a/mcs/class/System/System.Net/FtpWebResponse.cs
+++ b/mcs/class/System/System.Net/FtpWebResponse.cs
@@ -115,6 +115,12 @@ namespace System.Net
 			}
 		}
 
+		public override bool SupportsHeaders {
+			get {
+				return true;
+			}
+		}
+
 		public string StatusDescription {
 			get {
 				return statusDescription;
diff --git a/mcs/class/System/System.Net/GlobalProxySelection.cs b/mcs/class/System/System.Net/GlobalProxySelection.cs
deleted file mode 100644
index 049f61ccad0..00000000000
--- a/mcs/class/System/System.Net/GlobalProxySelection.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// System.Net.GlobalProxySelection
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Configuration;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Net.Configuration;
-
-namespace System.Net 
-{
-	[ObsoleteAttribute("Use WebRequest.DefaultProxy instead")]
-	public class GlobalProxySelection
-	{
-		// Constructors
-		public GlobalProxySelection() { }
-		
-		// Properties
-
-		public static IWebProxy Select {
-			get { return WebRequest.DefaultWebProxy; }
-			set { WebRequest.DefaultWebProxy = value; }
-		}
-		
-		// Methods
-		
-		public static IWebProxy GetEmptyWebProxy()
-		{
-			// must return a new one each time, as the credentials
-			// can be set
-			return new EmptyWebProxy ();	
-		}
-		
-		// Internal Classes
-		
-		internal class EmptyWebProxy : IWebProxy {
-			private ICredentials credentials = null;
-			
-			internal EmptyWebProxy () { }
-			
-			public ICredentials Credentials {
-				get { return credentials; } 
-				set { credentials = value; }
-			}
-
-			public Uri GetProxy (Uri destination)
-			{
-				return destination;
-			}
-
-			public bool IsBypassed (Uri host)
-			{
-				return true; // pass directly to host
-			}
-		}
-	}		
-}
diff --git a/mcs/class/System/System.Net/HttpListenerException.cs b/mcs/class/System/System.Net/HttpListenerException.cs
deleted file mode 100644
index 684344e366d..00000000000
--- a/mcs/class/System/System.Net/HttpListenerException.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// System.Net.HttpListenerException
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System.ComponentModel;
-using System.Runtime.Serialization;
-namespace System.Net {
-	[Serializable]
-	public class HttpListenerException : Win32Exception
-	{
-		public HttpListenerException ()
-		{
-		}
-
-		public HttpListenerException (int errorCode) : base (errorCode)
-		{
-		}
-
-		public HttpListenerException (int errorCode, string message) : base (errorCode, message)
-		{
-		}
-
-		protected HttpListenerException (SerializationInfo serializationInfo, StreamingContext streamingContext) : base (serializationInfo, streamingContext)
-		{
-		}
-
-		public override int ErrorCode {
-			get { return base.ErrorCode; }
-		}
-	}
-}
-
diff --git a/mcs/class/System/System.Net/HttpListenerRequest.cs b/mcs/class/System/System.Net/HttpListenerRequest.cs
index f1c47802cb9..a9c5bb9ee32 100644
--- a/mcs/class/System/System.Net/HttpListenerRequest.cs
+++ b/mcs/class/System/System.Net/HttpListenerRequest.cs
@@ -146,6 +146,54 @@ namespace System.Net {
 			}
 		}
 
+		static bool MaybeUri (string s)
+		{
+			int p = s.IndexOf (':');
+			if (p == -1)
+				return false;
+
+			if (p >= 10)
+				return false;
+
+			return IsPredefinedScheme (s.Substring (0, p));
+		}
+
+		//
+		// Using a simple block of if's is twice as slow as the compiler generated
+		// switch statement.   But using this tuned code is faster than the
+		// compiler generated code, with a million loops on x86-64:
+		//
+		// With "http": .10 vs .51 (first check)
+		// with "https": .16 vs .51 (second check)
+		// with "foo": .22 vs .31 (never found)
+		// with "mailto": .12 vs .51  (last check)
+		//
+		//
+		static bool IsPredefinedScheme (string scheme)
+		{
+			if (scheme == null || scheme.Length < 3)
+				return false;
+			
+			char c = scheme [0];
+			if (c == 'h')
+				return (scheme == "http" || scheme == "https");
+			if (c == 'f')
+				return (scheme == "file" || scheme == "ftp");
+				
+			if (c == 'n'){
+				c = scheme [1];
+				if (c == 'e')
+					return (scheme == "news" || scheme == "net.pipe" || scheme == "net.tcp");
+				if (scheme == "nntp")
+					return true;
+				return false;
+			}
+			if ((c == 'g' && scheme == "gopher") || (c == 'm' && scheme == "mailto"))
+				return true;
+
+			return false;
+		}
+
 		internal void FinishInitialization ()
 		{
 			string host = UserHostName;
@@ -156,7 +204,7 @@ namespace System.Net {
 
 			string path;
 			Uri raw_uri = null;
-			if (Uri.MaybeUri (raw_url.ToLowerInvariant ()) && Uri.TryCreate (raw_url, UriKind.Absolute, out raw_uri))
+			if (MaybeUri (raw_url.ToLowerInvariant ()) && Uri.TryCreate (raw_url, UriKind.Absolute, out raw_uri))
 				path = raw_uri.PathAndQuery;
 			else
 				path = raw_url;
diff --git a/mcs/class/System/System.Net/HttpListenerResponse.cs b/mcs/class/System/System.Net/HttpListenerResponse.cs
index 807c9dd393a..329c4a2c19a 100644
--- a/mcs/class/System/System.Net/HttpListenerResponse.cs
+++ b/mcs/class/System/System.Net/HttpListenerResponse.cs
@@ -427,7 +427,7 @@ namespace System.Net {
 
 			StreamWriter writer = new StreamWriter (ms, encoding, 256);
 			writer.Write ("HTTP/{0} {1} {2}\r\n", version, status_code, status_description);
-			string headers_str = headers.ToStringMultiValue ();
+			string headers_str = headers.ToString ();
 			writer.Write (headers_str);
 			writer.Flush ();
 			int preamble = (encoding.CodePage == 65001) ? 3 : encoding.GetPreamble ().Length;
diff --git a/mcs/class/System/System.Net/HttpRequestHeader.cs b/mcs/class/System/System.Net/HttpRequestHeader.cs
deleted file mode 100644
index 46bd92bd957..00000000000
--- a/mcs/class/System/System.Net/HttpRequestHeader.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// System.Net.HttpRequestHeader
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net {
-	public enum HttpRequestHeader {
-		CacheControl,
-		Connection,
-		Date,
-		KeepAlive,
-		Pragma,
-		Trailer,
-		TransferEncoding,
-		Upgrade,
-		Via,
-		Warning,
-		Allow,
-		ContentLength,
-		ContentType,
-		ContentEncoding,
-		ContentLanguage,
-		ContentLocation,
-		ContentMd5,
-		ContentRange,
-		Expires,
-		LastModified,
-		Accept,
-		AcceptCharset,
-		AcceptEncoding,
-		AcceptLanguage,
-		Authorization,
-		Cookie,
-		Expect,
-		From,
-		Host,
-		IfMatch,
-		IfModifiedSince,
-		IfNoneMatch,
-		IfRange,
-		IfUnmodifiedSince,
-		MaxForwards,
-		ProxyAuthorization,
-		Referer,
-		Range,
-		Te,
-		Translate,
-		UserAgent
-	}
-}
-
diff --git a/mcs/class/System/System.Net/HttpResponseHeader.cs b/mcs/class/System/System.Net/HttpResponseHeader.cs
deleted file mode 100644
index 2bf820aa66d..00000000000
--- a/mcs/class/System/System.Net/HttpResponseHeader.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// System.Net.HttpResponseHeader
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net {
-	public enum HttpResponseHeader {
-		CacheControl,
-		Connection,
-		Date,
-		KeepAlive,
-		Pragma,
-		Trailer,
-		TransferEncoding,
-		Upgrade,
-		Via,
-		Warning,
-		Allow,
-		ContentLength,
-		ContentType,
-		ContentEncoding,
-		ContentLanguage,
-		ContentLocation,
-		ContentMd5,
-		ContentRange,
-		Expires,
-		LastModified,
-		AcceptRanges,
-		Age,
-		ETag,
-		Location,
-		ProxyAuthenticate,
-		RetryAfter,
-		Server,
-		SetCookie,
-		Vary,
-		WwwAuthenticate
-	}
-}
-
diff --git a/mcs/class/System/System.Net/HttpStatusCode.cs b/mcs/class/System/System.Net/HttpStatusCode.cs
deleted file mode 100644
index 4cc32e7fae8..00000000000
--- a/mcs/class/System/System.Net/HttpStatusCode.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// HttpStatusCode.cs
-//
-// This code was automatically generated from
-// ECMA CLI XML Library Specification.
-// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
-// Created: Wed, 5 Sep 2001 06:32:05 UTC
-// Source file: AllTypes.xml
-// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-namespace System.Net {
-	public enum HttpStatusCode {
-		Continue = 100,
-		SwitchingProtocols = 101,
-		OK = 200,
-		Created = 201,
-		Accepted = 202,
-		NonAuthoritativeInformation = 203,
-		NoContent = 204,
-		ResetContent = 205,
-		PartialContent = 206,
-		MultipleChoices = 300,
-		Ambiguous = 300,
-		MovedPermanently = 301,
-		Moved = 301,
-		Found = 302,
-		Redirect = 302,
-		SeeOther = 303,
-		RedirectMethod = 303,
-		NotModified = 304,
-		UseProxy = 305,
-		Unused = 306,
-		TemporaryRedirect = 307,
-		RedirectKeepVerb = 307,
-		BadRequest = 400,
-		Unauthorized = 401,
-		PaymentRequired = 402,
-		Forbidden = 403,
-		NotFound = 404,
-		MethodNotAllowed = 405,
-		NotAcceptable = 406,
-		ProxyAuthenticationRequired = 407,
-		RequestTimeout = 408,
-		Conflict = 409,
-		Gone = 410,
-		LengthRequired = 411,
-		PreconditionFailed = 412,
-		RequestEntityTooLarge = 413,
-		RequestUriTooLong = 414,
-		UnsupportedMediaType = 415,
-		RequestedRangeNotSatisfiable = 416,
-		ExpectationFailed = 417,
-		UpgradeRequired = 426,
-		InternalServerError = 500,
-		NotImplemented = 501,
-		BadGateway = 502,
-		ServiceUnavailable = 503,
-		GatewayTimeout = 504,
-		HttpVersionNotSupported = 505,
-	} // HttpStatusCode
-
-} // System.Net
-
-
diff --git a/mcs/class/System/System.Net/HttpVersion.cs b/mcs/class/System/System.Net/HttpVersion.cs
deleted file mode 100644
index f44bf70163a..00000000000
--- a/mcs/class/System/System.Net/HttpVersion.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Net.HttpVersion.cs
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Net {
-
-	// <remarks>
-	// </remarks>
-	public class HttpVersion {
-		
-		public static readonly Version Version10 = new Version (1, 0);
-		public static readonly Version Version11 = new Version (1, 1);
-		
-		// pretty useless..
-		public HttpVersion () {}
-	}
-}
diff --git a/mcs/class/System/System.Net/HttpWebRequest.cs b/mcs/class/System/System.Net/HttpWebRequest.cs
index 02688b1a8b6..63d0eb39238 100644
--- a/mcs/class/System/System.Net/HttpWebRequest.cs
+++ b/mcs/class/System/System.Net/HttpWebRequest.cs
@@ -154,8 +154,8 @@ namespace System.Net
 		{
 			this.requestUri = uri;
 			this.actualUri = uri;
-			this.proxy = GlobalProxySelection.Select;
-			this.webHeaders = new WebHeaderCollection (WebHeaderCollection.HeaderInfo.Request);
+			this.proxy = InternalDefaultWebProxy;
+			this.webHeaders = new WebHeaderCollection (WebHeaderCollectionType.HttpWebRequest);
 			ThrowOnError = true;
 			ResetAuthorization ();
 		}
@@ -205,11 +205,19 @@ namespace System.Net
 		
 		// Properties
 
+		void SetSpecialHeaders(string HeaderName, string value) {
+			value = WebHeaderCollection.CheckBadChars(value, true);
+			webHeaders.RemoveInternal(HeaderName);
+			if (value.Length != 0) {
+				webHeaders.AddInternal(HeaderName, value);
+			}
+		}
+
 		public string Accept {
 			get { return webHeaders ["Accept"]; }
 			set {
 				CheckRequestStarted ();
-				webHeaders.RemoveAndAdd ("Accept", value);
+				SetSpecialHeaders ("Accept", value);
 			}
 		}
 		
@@ -306,7 +314,7 @@ namespace System.Net
 				if (keepAlive)
 					value = value + ", Keep-Alive";
 				
-				webHeaders.RemoveAndAdd ("Connection", value);
+				webHeaders.CheckUpdate ("Connection", value);
 			}
 		}		
 		
@@ -336,11 +344,7 @@ namespace System.Net
 		public override string ContentType { 
 			get { return webHeaders ["Content-Type"]; }
 			set {
-				if (value == null || value.Trim().Length == 0) {
-					webHeaders.RemoveInternal ("Content-Type");
-					return;
-				}
-				webHeaders.RemoveAndAdd ("Content-Type", value);
+				SetSpecialHeaders ("Content-Type", value);
 			}
 		}
 		
@@ -367,13 +371,17 @@ namespace System.Net
 				return DateTime.ParseExact (date, "r", CultureInfo.InvariantCulture).ToLocalTime ();
 			}
 			set {
-				if (value.Equals (DateTime.MinValue))
-					webHeaders.RemoveInternal ("Date");
-				else
-					webHeaders.RemoveAndAdd ("Date", value.ToUniversalTime ().ToString ("r", CultureInfo.InvariantCulture));
+				SetDateHeaderHelper ("Date", value);
 			}
 		}
 
+		void SetDateHeaderHelper(string headerName, DateTime dateTime) {
+			if (dateTime == DateTime.MinValue)
+				SetSpecialHeaders(headerName, null); // remove header
+			else
+				SetSpecialHeaders(headerName, HttpProtocolUtils.date2string(dateTime));
+		}
+
 #if !NET_2_1
 		[MonoTODO]
 		public static new RequestCachePolicy DefaultCachePolicy
@@ -414,7 +422,8 @@ namespace System.Net
 				if (val == "100-continue")
 					throw new ArgumentException ("100-Continue cannot be set with this property.",
 								     "value");
-				webHeaders.RemoveAndAdd ("Expect", value);
+
+				webHeaders.CheckUpdate ("Expect", value);
 			}
 		}
 		
@@ -427,12 +436,21 @@ namespace System.Net
 			get { return webHeaders; }
 			set {
 				CheckRequestStarted ();
-				WebHeaderCollection newHeaders = new WebHeaderCollection (WebHeaderCollection.HeaderInfo.Request);
-				int count = value.Count;
-				for (int i = 0; i < count; i++) 
-					newHeaders.Add (value.GetKey (i), value.Get (i));
 
-				webHeaders = newHeaders;
+				WebHeaderCollection webHeaders = value;
+				WebHeaderCollection newWebHeaders = new WebHeaderCollection(WebHeaderCollectionType.HttpWebRequest);
+
+				// Copy And Validate -
+				// Handle the case where their object tries to change
+				//  name, value pairs after they call set, so therefore,
+				//  we need to clone their headers.
+				//
+
+				foreach (String headerName in webHeaders.AllKeys ) {
+					newWebHeaders.Add(headerName,webHeaders[headerName]);
+				}
+
+				webHeaders = newWebHeaders;
 			}
 		}
 		
@@ -664,7 +682,7 @@ namespace System.Net
 				if (!sendChunked)
 					throw new ArgumentException ("SendChunked must be True", "value");
 
-				webHeaders.RemoveAndAdd ("Transfer-Encoding", value);
+				webHeaders.CheckUpdate ("Transfer-Encoding", value);
 			}
 		}
 
@@ -772,7 +790,7 @@ namespace System.Net
 		{
 			if (rangeSpecifier == null)
 				throw new ArgumentNullException ("rangeSpecifier");
-			if (!WebHeaderCollection.IsHeaderValue (rangeSpecifier))
+			if (!WebHeaderCollection.IsValidToken (rangeSpecifier))
 				throw new ArgumentException ("Invalid range specifier", "rangeSpecifier");
 
 			string r = webHeaders ["Range"];
@@ -790,7 +808,7 @@ namespace System.Net
 				r = r + "0" + n;
 			else
 				r = r + n + "-";
-			webHeaders.RemoveAndAdd ("Range", r);
+			webHeaders.ChangeInternal ("Range", r);
 		}
 
 		public
@@ -798,7 +816,7 @@ namespace System.Net
 		{
 			if (rangeSpecifier == null)
 				throw new ArgumentNullException ("rangeSpecifier");
-			if (!WebHeaderCollection.IsHeaderValue (rangeSpecifier))
+			if (!WebHeaderCollection.IsValidToken (rangeSpecifier))
 				throw new ArgumentException ("Invalid range specifier", "rangeSpecifier");
 			if (from > to || from < 0)
 				throw new ArgumentOutOfRangeException ("from");
@@ -812,7 +830,7 @@ namespace System.Net
 				r += ",";
 
 			r = String.Format ("{0}{1}-{2}", r, from, to);
-			webHeaders.RemoveAndAdd ("Range", r);
+			webHeaders.ChangeInternal ("Range", r);
 		}
 
 		
@@ -1198,7 +1216,7 @@ namespace System.Net
 			bool continue100 = false;
 			if (sendChunked) {
 				continue100 = true;
-				webHeaders.RemoveAndAdd ("Transfer-Encoding", "chunked");
+				webHeaders.ChangeInternal ("Transfer-Encoding", "chunked");
 				webHeaders.RemoveInternal ("Content-Length");
 			} else if (contentLength != -1) {
 				if (auth_state.NtlmAuthState == NtlmAuthState.Challenge || proxy_auth_state.NtlmAuthState == NtlmAuthState.Challenge) {
@@ -1221,7 +1239,7 @@ namespace System.Net
 
 			if (actualVersion == HttpVersion.Version11 && continue100 &&
 			    servicePoint.SendContinue) { // RFC2616 8.2.3
-				webHeaders.RemoveAndAdd ("Expect" , "100-continue");
+				webHeaders.ChangeInternal ("Expect" , "100-continue");
 				expectContinue = true;
 			} else {
 				webHeaders.RemoveInternal ("Expect");
@@ -1237,16 +1255,16 @@ namespace System.Net
 			if (keepAlive && (version == HttpVersion.Version10 || spoint10)) {
 				if (webHeaders[connectionHeader] == null
 				    || webHeaders[connectionHeader].IndexOf ("keep-alive", StringComparison.OrdinalIgnoreCase) == -1)
-					webHeaders.RemoveAndAdd (connectionHeader, "keep-alive");
+					webHeaders.ChangeInternal (connectionHeader, "keep-alive");
 			} else if (!keepAlive && version == HttpVersion.Version11) {
-				webHeaders.RemoveAndAdd (connectionHeader, "close");
+				webHeaders.ChangeInternal (connectionHeader, "close");
 			}
 
 			webHeaders.SetInternal ("Host", Host);
 			if (cookieContainer != null) {
 				string cookieHeader = cookieContainer.GetCookieHeader (actualUri);
 				if (cookieHeader != "")
-					webHeaders.RemoveAndAdd ("Cookie", cookieHeader);
+					webHeaders.ChangeInternal ("Cookie", cookieHeader);
 				else
 					webHeaders.RemoveInternal ("Cookie");
 			}
@@ -1257,7 +1275,7 @@ namespace System.Net
 			if ((auto_decomp & DecompressionMethods.Deflate) != 0)
 				accept_encoding = accept_encoding != null ? "gzip, deflate" : "deflate";
 			if (accept_encoding != null)
-				webHeaders.RemoveAndAdd ("Accept-Encoding", accept_encoding);
+				webHeaders.ChangeInternal ("Accept-Encoding", accept_encoding);
 
 			if (!usedPreAuth && preAuthenticate)
 				DoPreAuthenticate ();
@@ -1297,7 +1315,7 @@ namespace System.Net
 					wex = new WebException (msg, status);
 				} else {
 					msg = String.Format ("Error: {0} ({1})", status, exc.Message);
-					wex = new WebException (msg, exc, status);
+					wex = new WebException (msg, status, WebExceptionInternalStatus.RequestFatal, exc);
 				}
 				r.SetCompleted (false, wex);
 				r.DoCallback ();
@@ -1456,7 +1474,7 @@ namespace System.Net
 			if (wce != null) {
 				WebConnection cnc = wce.Connection;
 				cnc.PriorityRequest = this;
-				ICredentials creds = !isProxy ? credentials : proxy.Credentials;
+				ICredentials creds = (!isProxy || proxy == null) ? credentials : proxy.Credentials;
 				if (creds != null) {
 					cnc.NtlmCredential = creds.GetCredential (requestUri, "NTLM");
 					cnc.UnsafeAuthenticatedConnectionSharing = unsafe_auth_blah;
@@ -1513,7 +1531,7 @@ namespace System.Net
 					return;
 				}
 
-				bool isProxy = ProxyQuery && !proxy.IsBypassed (actualUri);
+				bool isProxy = ProxyQuery && proxy != null && !proxy.IsBypassed (actualUri);
 
 				bool redirected;
 				try {
@@ -1616,7 +1634,7 @@ namespace System.Net
 				if (isProxy && (request.proxy == null || request.proxy.Credentials == null))
 					return false;
 
-				string [] authHeaders = response.Headers.GetValues_internal (isProxy ? "Proxy-Authenticate" : "WWW-Authenticate", false);
+				string [] authHeaders = response.Headers.GetValues (isProxy ? "Proxy-Authenticate" : "WWW-Authenticate");
 				if (authHeaders == null || authHeaders.Length == 0)
 					return false;
 
@@ -1631,7 +1649,7 @@ namespace System.Net
 					return false;
 				request.webHeaders [isProxy ? "Proxy-Authorization" : "Authorization"] = auth.Message;
 				isCompleted = auth.Complete;
-				bool is_ntlm = (auth.Module.AuthenticationType == "NTLM");
+				bool is_ntlm = (auth.ModuleAuthenticationType == "NTLM");
 				if (is_ntlm)
 					ntlm_auth_state = (NtlmAuthState)((int) ntlm_auth_state + 1);
 				return true;
@@ -1775,6 +1793,22 @@ namespace System.Net
 		}
 
 		internal WebConnection StoredConnection;
+
+#region referencesource
+        internal static StringBuilder GenerateConnectionGroup(string connectionGroupName, bool unsafeConnectionGroup, bool isInternalGroup)
+        {
+            StringBuilder connectionLine = new StringBuilder(connectionGroupName);
+
+            connectionLine.Append(unsafeConnectionGroup ? "U>" : "S>");
+
+            if (isInternalGroup)
+            {
+                connectionLine.Append("I>");
+            }
+
+            return connectionLine;
+        }
+#endregion
 	}
 }
 
diff --git a/mcs/class/System/System.Net/HttpWebResponse.cs b/mcs/class/System/System.Net/HttpWebResponse.cs
index 32e9c14efbc..6a73ae0f167 100644
--- a/mcs/class/System/System.Net/HttpWebResponse.cs
+++ b/mcs/class/System/System.Net/HttpWebResponse.cs
@@ -244,6 +244,12 @@ namespace System.Net
 			}
 		}
 
+		public override bool SupportsHeaders {
+			get {
+				return true;
+			}
+		}
+
 		// Methods
 		
 		public string GetResponseHeader (string headerName)
diff --git a/mcs/class/System/System.Net/IAuthenticationModule.cs b/mcs/class/System/System.Net/IAuthenticationModule.cs
deleted file mode 100644
index c357cf8b770..00000000000
--- a/mcs/class/System/System.Net/IAuthenticationModule.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Net.IAuthenticationModule.cs
-//
-// Author:
-//   Miguel de Icaza (miguel@ximian.com)
-//
-// (C) Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net {
-
-	// <remarks>
-	//   Authentication interface for Web client authentication modules.
-	// </remarks>
-	public interface IAuthenticationModule {
-		Authorization Authenticate (string challenge, WebRequest request, ICredentials credentials);
-		Authorization PreAuthenticate (WebRequest request, ICredentials credentials);
-		string AuthenticationType { get; }
-		bool CanPreAuthenticate { get; }
-	}
-}
diff --git a/mcs/class/System/System.Net/ICertificatePolicy.cs b/mcs/class/System/System.Net/ICertificatePolicy.cs
deleted file mode 100644
index 739c57ad2a0..00000000000
--- a/mcs/class/System/System.Net/ICertificatePolicy.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Net.ICertificatePolicy.cs
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Security.Cryptography.X509Certificates;
-
-namespace System.Net {
-
-	public interface ICertificatePolicy {
-		bool CheckValidationResult (
-				ServicePoint srvPoint,
-				X509Certificate certificate,
-		   		WebRequest request,
-		   		int certificateProblem
-		);		
-	}
-}
diff --git a/mcs/class/System/System.Net/ICredentialLookup.cs b/mcs/class/System/System.Net/ICredentialLookup.cs
deleted file mode 100644
index c92b151a857..00000000000
--- a/mcs/class/System/System.Net/ICredentialLookup.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Net.ICredential.cs
-//
-// Author:
-//   Miguel de Icaza (miguel@ximian.com)
-//   Duncan Mak (duncan@ximian.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net {
-
-	// <remarks>
-	//   Base authentication interface for Web clients.
-	// </remarks>
-	public interface ICredentials 
-	{
-		NetworkCredential GetCredential (Uri uri, string authType);
-	}
-}
diff --git a/mcs/class/System/System.Net/ICredentialsByHost.cs b/mcs/class/System/System.Net/ICredentialsByHost.cs
deleted file mode 100644
index 281d87b1a51..00000000000
--- a/mcs/class/System/System.Net/ICredentialsByHost.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Net.ICredentialsByHost.cs
-//
-// Author:
-//	Tim Coleman (tim@imtcoleman.com)
-//
-// Copyright (C) Tim Coleman, 2004
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-namespace System.Net {
-	public interface ICredentialsByHost
-	{
-		NetworkCredential GetCredential (string host, int port, string authenticationType);
-	}
-}
diff --git a/mcs/class/System/System.Net/IPAddress.cs b/mcs/class/System/System.Net/IPAddress.cs
deleted file mode 100644
index 0211ad30818..00000000000
--- a/mcs/class/System/System.Net/IPAddress.cs
+++ /dev/null
@@ -1,529 +0,0 @@
-//
-// System.Net.IPAddress.cs
-//
-// Author:
-//   Miguel de Icaza (miguel@ximian.com)
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-// (C) Ximian, Inc.  http://www.ximian.com
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Globalization;
-using System.Net.Sockets;
-using System.Runtime.InteropServices;
-
-namespace System.Net {
-
-	/// <remarks>
-	///   Encapsulates an IP Address.
-	/// </remarks>
-	[Serializable]
-	public class IPAddress {
-		// Don't change the name of this field without also
-		// changing socket-io.c in the runtime
-		// The IP address is stored in little-endian order inside the int, 
-		// meaning the lower order bytes contain the netid
-		private long m_Address;
-		private AddressFamily m_Family;
-		private ushort[] m_Numbers;	/// ip6 Stored in network order (as ip4)
-		private long m_ScopeId;
-
-		public static readonly IPAddress Any = new IPAddress(0);
-		public static readonly IPAddress Broadcast = IPAddress.Parse ("255.255.255.255");
-		public static readonly IPAddress Loopback = IPAddress.Parse ("127.0.0.1");
-		public static readonly IPAddress None = IPAddress.Parse ("255.255.255.255");
-		public static readonly IPAddress IPv6Any = IPAddress.ParseIPV6 ("::");
-		public static readonly IPAddress IPv6Loopback = IPAddress.ParseIPV6 ("::1");
-		public static readonly IPAddress IPv6None = IPAddress.ParseIPV6 ("::");
-
-		private static short SwapShort (short number)
-		{
-			return (short) ( ((number >> 8) & 0xFF) | ((number << 8) & 0xFF00) );
-		}
-
-		private static int SwapInt (int number)
-		{
-			return (((number >> 24) & 0xFF)
-				  | ((number >> 08) & 0xFF00)
-				  | ((number << 08) & 0xFF0000)
-				  | ((number << 24)));
-		}
-
-		private static long SwapLong(long number)
-		{
-			return (((number >> 56) & 0xFF)
-				  | ((number >> 40) & 0xFF00)
-				  | ((number >> 24) & 0xFF0000)
-				  | ((number >> 08) & 0xFF000000)
-				  | ((number << 08) & 0xFF00000000)
-				  | ((number << 24) & 0xFF0000000000)
-				  | ((number << 40) & 0xFF000000000000)
-				  | ((number << 56)));
-		}
-
-		public static short HostToNetworkOrder(short host) {
-			if (!BitConverter.IsLittleEndian)
-				return(host);
-
-			return SwapShort (host);
-		}
-
-		public static int HostToNetworkOrder(int host) {
-			if (!BitConverter.IsLittleEndian)
-				return(host);
-
-			return SwapInt (host);
-		}
-		
-		public static long HostToNetworkOrder(long host) {
-			if (!BitConverter.IsLittleEndian)
-				return(host);
-
-			return SwapLong (host);
-		}
-
-		public static short NetworkToHostOrder(short network) {
-			if (!BitConverter.IsLittleEndian)
-				return(network);
-
-			return SwapShort (network);
-		}
-
-		public static int NetworkToHostOrder(int network) {
-			if (!BitConverter.IsLittleEndian)
-				return(network);
-
-			return SwapInt (network);
-		}
-
-		public static long NetworkToHostOrder(long network) {
-			if (!BitConverter.IsLittleEndian)
-				return(network);
-
-			return SwapLong (network);
-		}
-		
-		/// <summary>
-		///   Constructor from a 32-bit constant with the address bytes in
-		///   little-endian order (the lower order bytes contain the netid)
-		/// </summary>
-		public IPAddress (long newAddress)
-		{
-			m_Address = newAddress;
-			m_Family = AddressFamily.InterNetwork;
-		}
-
-		public IPAddress (byte[] address)
-		{
-			if (address == null)
-				throw new ArgumentNullException ("address");
-
-			int len = address.Length;
-
-			if (len != 16 && len != 4)
-				throw new ArgumentException ("An invalid IP address was specified.",
-					"address");
-
-			if (len == 16) {
-				m_Numbers = new ushort [8];
-				Buffer.BlockCopy(address, 0, m_Numbers, 0, 16);
-				m_Family = AddressFamily.InterNetworkV6;
-				m_ScopeId = 0;
-			} else {
-				m_Address = ((uint) address [3] << 24) + (address [2] << 16) +
-					(address [1] << 8) + address [0];
-				m_Family = AddressFamily.InterNetwork;
-			}
-		}
-
-		public IPAddress(byte[] address, long scopeid)
-		{
-			if (address == null)
-				throw new ArgumentNullException ("address");
-
-			if (address.Length != 16)
-				throw new ArgumentException ("An invalid IP address was specified.",
-					"address");
-
-			m_Numbers = new ushort [8];
-			Buffer.BlockCopy(address, 0, m_Numbers, 0, 16);
-			m_Family = AddressFamily.InterNetworkV6;
-			m_ScopeId = scopeid;
-		}
-
-		internal IPAddress(ushort[] address, long scopeId)
-		{
-			m_Numbers = address;
-
-			for(int i=0; i<8; i++)
-				m_Numbers[i] = (ushort)HostToNetworkOrder((short)m_Numbers[i]);
-
-			m_Family = AddressFamily.InterNetworkV6;
-			m_ScopeId = scopeId;
-		}
-
-		public static IPAddress Parse (string ipString)
-		{
-            if (ipString == null)
-                throw new ArgumentNullException("ipString");
-
-			IPAddress ret;
-			if (TryParse (ipString, out ret))
-				return ret;
-			throw new FormatException ("An invalid IP address was specified.");
-		}
-
-		public static bool TryParse (string ipString, out IPAddress address)
-		{
-			if (ipString == null)
-			{
-				address = null;
-				return false;
-			}
-
-			if ((address = ParseIPV4 (ipString)) == null)
-				if ((address = ParseIPV6 (ipString)) == null)
-					return false;
-			return true;
-		}
-
-		private static IPAddress ParseIPV4 (string ip)
-		{
-
-			int pos = ip.IndexOf (' ');
-			if (pos != -1) {
-				string [] nets = ip.Substring (pos + 1).Split (new char [] {'.'});
-				if (nets.Length > 0) {
-					string lastNet = nets [nets.Length - 1];
-					if (lastNet.Length == 0)
-						return null;
-					foreach (char c in lastNet)
-						if (!Uri.IsHexDigit (c))
-							return null;
-				}
-				ip = ip.Substring (0, pos);
-			}
-
-			if (ip.Length == 0 || ip [ip.Length - 1] == '.')
-				return null;
-
-			string [] ips = ip.Split (new char [] {'.'});
-			if (ips.Length > 4)
-				return null;
-			
-			// Make the number in network order
-			try {
-				long a = 0;
-				long val = 0;
-				for (int i = 0; i < ips.Length; i++) {
-					string subnet = ips [i];
-					if ((3 <= subnet.Length && subnet.Length <= 4) &&
-					    (subnet [0] == '0') && (subnet [1] == 'x' || subnet [1] == 'X')) {
-						if (subnet.Length == 3)
-							val = (byte) Uri.FromHex (subnet [2]);
-						else 
-							val = (byte) ((Uri.FromHex (subnet [2]) << 4) | Uri.FromHex (subnet [3]));
-					} else if (subnet.Length == 0)
-						return null;
-					else if (subnet [0] == '0') {
-						// octal
-						val = 0;
-						for (int j = 1; j < subnet.Length; j++) {
-							if ('0' <= subnet [j] && subnet [j] <= '7')
-								val = (val << 3) + subnet [j] - '0';
-							else
-								return null;
-						}
-					}
-					else {
-						if (!Int64.TryParse (subnet, NumberStyles.None, null, out val))
-							return null;
-					}
-
-					if (i == (ips.Length - 1)) {
-						if (i != 0  && val >= (256 << ((3 - i) * 8)))
-							return null;
-						else if (val > 0xffffffff)
-							return null;
-						i = 3;
-					} else if (val >= 0x100)
-						return null;
-					for (int j = 0; val > 0; j++, val /= 0x100)
-						a |= (val & 0xFF) << ((i - j) << 3);
-				}
-
-				return (new IPAddress (a));
-			} catch (Exception) {
-				return null;
-			}
-		}
-		
-		private static IPAddress ParseIPV6 (string ip)
-		{
-			IPv6Address newIPv6Address;
-
-			if (IPv6Address.TryParse(ip, out newIPv6Address))
-				return  new IPAddress (newIPv6Address.Address, newIPv6Address.ScopeId);
-			return null;
-		}
-
-		[Obsolete("This property is obsolete. Use GetAddressBytes.")]
-		public long Address 
-		{
-			get {
-				if(m_Family != AddressFamily.InterNetwork)
-					throw new Exception("The attempted operation is not supported for the type of object referenced");
-
-				return m_Address;
-			}
-			set {
-				/* no need to do this test, ms.net accepts any value.
-				if (value < 0 || value > 0x00000000FFFFFFFF)
-					throw new ArgumentOutOfRangeException (
-						"the address must be between 0 and 0xFFFFFFFF");
-				*/
-
-				if(m_Family != AddressFamily.InterNetwork)
-					throw new Exception("The attempted operation is not supported for the type of object referenced");
-
-				m_Address = value;
-			}
-		}
-
-		internal long InternalIPv4Address {
-			get { return m_Address; }
-		}
-
-		public bool IsIPv6LinkLocal {
-			get {
-				if (m_Family == AddressFamily.InterNetwork)
-					return false;
-				int v = NetworkToHostOrder ((short) m_Numbers [0]) & 0xFFF0;
-				return 0xFE80 <= v && v < 0xFEC0;
-			}
-		}
-
-		public bool IsIPv6SiteLocal {
-			get {
-				if (m_Family == AddressFamily.InterNetwork)
-					return false;
-				int v = NetworkToHostOrder ((short) m_Numbers [0]) & 0xFFF0;
-				return 0xFEC0 <= v && v < 0xFF00;
-			}
-		}
-
-		public bool IsIPv6Multicast {
-			get {
-				return m_Family != AddressFamily.InterNetwork &&
-					((ushort) NetworkToHostOrder ((short) m_Numbers [0]) & 0xFF00) == 0xFF00;
-			}
-		}
-
-		public bool IsIPv6Teredo {
-			get {
-				return m_Family != AddressFamily.InterNetwork &&
-					NetworkToHostOrder ((short) m_Numbers [0]) == 0x2001 &&
-					m_Numbers[1] == 0;
-			}
-		}
-
-		public long ScopeId {
-			get {
-				if (m_Family != AddressFamily.InterNetworkV6)
-					throw new SocketException ((int) SocketError.OperationNotSupported);
-
-				return m_ScopeId;
-			}
-			set {
-				if (m_Family != AddressFamily.InterNetworkV6)
-					throw new SocketException ((int) SocketError.OperationNotSupported);
-				if ((value < 0) || (value > UInt32.MaxValue))
-					throw new ArgumentOutOfRangeException ();
-
-				m_ScopeId = value;
-			}
-		}
-
-		public byte [] GetAddressBytes () 
-		{
-			if(m_Family == AddressFamily.InterNetworkV6) {
-				byte [] addressBytes = new byte [16];
-				Buffer.BlockCopy (m_Numbers, 0, addressBytes, 0, 16);
-				return addressBytes;
-			} else {
-				return new byte [4] { (byte)(m_Address & 0xFF),
-						     (byte)((m_Address >> 8) & 0xFF),
-						     (byte)((m_Address >> 16) & 0xFF),
-						     (byte)(m_Address >> 24) }; 
-			}
-		}
-
-		public AddressFamily AddressFamily 
-		{
-			get {
-				return m_Family;
-			}
-		}
-
-#if NET_4_5
-
-		public IPAddress MapToIPv4 ()
-		{
-			if (AddressFamily == AddressFamily.InterNetwork)
-				return this;
-			if (AddressFamily != AddressFamily.InterNetworkV6)
-				throw new Exception ("Only AddressFamily.InterNetworkV6 can be converted to IPv4");
-
-			//Test for 0000 0000 0000 0000 0000 FFFF xxxx xxxx
-			for (int i = 0; i < 5; i++) {
-				if (m_Numbers [i] != 0x0000)
-					throw new Exception ("Address does not have the ::FFFF prefix");
-			}
-			if (m_Numbers [5] != 0xFFFF)
-				throw new Exception ("Address does not have the ::FFFF prefix");
-
-			//We've got an IPv4 address
-			byte [] ipv4Bytes = new byte [4];
-			Buffer.BlockCopy (m_Numbers, 12, ipv4Bytes, 0, 4);
-			return new IPAddress (ipv4Bytes);
-		}
-
-		public IPAddress MapToIPv6 ()
-		{
-			if (AddressFamily == AddressFamily.InterNetworkV6)
-				return this;
-			if (AddressFamily != AddressFamily.InterNetwork)
-				throw new Exception ("Only AddressFamily.InterNetworkV4 can be converted to IPv6");
-
-			byte [] ipv4Bytes = GetAddressBytes ();
-			byte [] ipv6Bytes = new byte [16] {
-				0,0, 0,0, 0,0, 0,0, 0,0, 0xFF,0xFF,
-				ipv4Bytes [0], ipv4Bytes [1], ipv4Bytes [2], ipv4Bytes [3]
-			};
-			return new IPAddress (ipv6Bytes);
-		}
-
-#endif
-
-		/// <summary>
-		///   Used to tell whether an address is a loopback.
-		///   All IP addresses of the form 127.X.Y.Z, where X, Y, and Z are in 
-		///   the range 0-255, are loopback addresses.
-		/// </summary>
-		/// <param name="addr">Address to compare</param>
-		/// <returns></returns>
-		public static bool IsLoopback (IPAddress address)
-		{
-			if(address.m_Family == AddressFamily.InterNetwork)
-				return (address.m_Address & 0xFF) == 127;
-			else {
-				for(int i=0; i<6; i++) {
-					if(address.m_Numbers[i] != 0)
-						return false;
-				}
-
-				return NetworkToHostOrder((short)address.m_Numbers[7]) == 1;
-			}
-		}
-
-		/// <summary>
-		///   Overrides System.Object.ToString to return
-		///   this object rendered in a quad-dotted notation
-		/// </summary>
-		public override string ToString ()
-		{
-			if(m_Family == AddressFamily.InterNetwork)
-				return ToString (m_Address);
-			else
-			{
-				ushort[] numbers = m_Numbers.Clone() as ushort[];
-
-				for(int i=0; i<numbers.Length; i++)
-					numbers[i] = (ushort)NetworkToHostOrder((short)numbers[i]);
-
-				IPv6Address v6 = new IPv6Address(numbers);
-				v6.ScopeId = ScopeId;
-				return v6.ToString();
-			}
-		}
-
-		/// <summary>
-		///   Returns this object rendered in a quad-dotted notation
-		/// </summary>
-		static string ToString (long addr)
-		{
-			// addr is in network order
-			return  (addr & 0xff).ToString () + "." +
-				((addr >> 8) & 0xff).ToString () + "." +
-				((addr >> 16) & 0xff).ToString () + "." +
-				((addr >> 24) & 0xff).ToString ();
-		}
-
-		/// <returns>
-		///   Whether both objects are equal.
-		/// </returns>
-		public override bool Equals (object comparand)
-		{
-			IPAddress otherAddr = comparand as IPAddress;
-			if (otherAddr != null){
-				if(AddressFamily != otherAddr.AddressFamily)
-					return false;
-
-				if(AddressFamily == AddressFamily.InterNetwork) {
-					return m_Address == otherAddr.m_Address;
-				} else {
-					ushort[] vals = otherAddr.m_Numbers;
-
-					for(int i=0; i<8; i++)
-						if(m_Numbers[i] != vals[i])
-							return false;
-
-					return true;
-				}
-			}
-			return false;
-		}
-
-		public override int GetHashCode ()
-		{
-			if(m_Family == AddressFamily.InterNetwork)
-				return (int)m_Address;
-			else
-				return Hash (((((int) m_Numbers[0]) << 16) + m_Numbers [1]), 
-					((((int) m_Numbers [2]) << 16) + m_Numbers [3]),
-					((((int) m_Numbers [4]) << 16) + m_Numbers [5]),
-					((((int) m_Numbers [6]) << 16) + m_Numbers [7]));
-		}
-
-		private static int Hash (int i, int j, int k, int l) 
-		{
-			return i ^ (j << 13 | j >> 19) ^ (k << 26 | k >> 6) ^ (l << 7 | l >> 25);
-		}
-
-#pragma warning disable 169
-		// Added for serialization compatibility with MS.NET
-		private int m_HashCode;
-#pragma warning restore
-		
-	}
-}
diff --git a/mcs/class/System/System.Net/IPEndPoint.cs b/mcs/class/System/System.Net/IPEndPoint.cs
deleted file mode 100644
index a6982a1ed7a..00000000000
--- a/mcs/class/System/System.Net/IPEndPoint.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-//
-// System.Net.IPEndPoint.cs
-//
-// Author:
-//   Miguel de Icaza (miguel@ximian.com)
-//
-// (C) Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Net.Sockets;
-
-namespace System.Net {
-	[Serializable]
-	public class IPEndPoint : EndPoint {
-
-		private IPAddress address;
-		private int port;
-
-		public const int MaxPort = 65535;
-		public const int MinPort = 0;
-		
-		public IPEndPoint (IPAddress address, int port)
-		{
-			if (address == null)
-				throw new ArgumentNullException ("address");
-
-			Address = address;
-			Port = port;
-		}
-		
-		public IPEndPoint (long address, int port)
-		{
-			Address = new IPAddress (address);
-			Port = port;
-		}
-
-		public IPAddress Address {
-			get {
-				return (address);
-			}
-			set {
-				address=value;
-			}
-		}
-
-		public override AddressFamily AddressFamily {
-			get {
-				return address.AddressFamily;
-			}
-		}
-
-		public int Port {
-			get {
-				return port;
-			}
-			set {
-				// LAMESPEC: no mention of sanity checking
-				// PS: MS controls the range when setting the value
-				if (value < MinPort || value > MaxPort)
-					throw new ArgumentOutOfRangeException ("Invalid port");
-			
-				port = value;
-			}
-		}
-
-		// bytes 2 and 3 store the port, the rest
-		// stores the address
-		public override EndPoint Create (SocketAddress socketAddress)
-		{
-			if (socketAddress == null)
-				throw new ArgumentNullException ("socketAddress");
-
-			if (socketAddress.Family != AddressFamily)
-				throw new ArgumentException ("The IPEndPoint was created using " + AddressFamily + 
-						" AddressFamily but SocketAddress contains " + socketAddress.Family + 
-						" instead, please use the same type.");
-
-			SocketAddress sockaddr = socketAddress;
-			int size =sockaddr.Size;
-			AddressFamily family = sockaddr.Family;
-			int port;
-
-			IPEndPoint ipe = null;
-			switch(family)
-			{
-				case AddressFamily.InterNetwork:
-					if (size < 8) {
-						return(null);
-					}
-					
-					port = (((int)sockaddr[2])<<8) + (int)sockaddr[3];
-					long address=(((long)sockaddr[7])<<24) +
-						(((long)sockaddr[6])<<16) +
-						(((long)sockaddr[5])<<8) +
-						(long)sockaddr[4];
-
-					ipe = new IPEndPoint(address, port);
-					break;
-				case AddressFamily.InterNetworkV6:
-					if (size < 28) {
-						return(null);
-					}
-					
-					port	= (((int)sockaddr[2])<<8) + (int)sockaddr[3];
-
-					/// maybe flowid ?
-					/*
-					int unknown	= (int)sockaddr[4] +
-						(((int)sockaddr[5])<<8) +
-						(((int)sockaddr[6])<<16) +
-						(((int)sockaddr[7])<<24);
-					*/
-
-					int scopeId	= (int)sockaddr[24] +
-						(((int)sockaddr[25])<<8) +
-						(((int)sockaddr[26])<<16) +
-						(((int)sockaddr[27])<<24);
-
-					ushort[] addressData = new ushort[8];
-					for(int i=0; i<8; i++)
-						addressData[i] = (ushort)((sockaddr[8+i*2] << 8) + sockaddr[8+i*2+1]);
-
-					ipe = new IPEndPoint (new IPAddress(addressData, scopeId), port);
-					break;
-				default:
-					return null;
-			}
-
-			return(ipe);
-		}
-
-		public override SocketAddress Serialize() {
-			SocketAddress sockaddr = null;
-
-			switch (address.AddressFamily)
-			{
-				case AddressFamily.InterNetwork:
-					// .net produces a 16 byte buffer, even though
-					// only 8 bytes are used. I guess its just a
-					// holdover from struct sockaddr padding.
-					sockaddr = new SocketAddress(AddressFamily.InterNetwork, 16);
-
-					// bytes 2 and 3 store the port, the rest
-					// stores the address
-					sockaddr [2] = (byte) ((port>>8) & 0xff);
-					sockaddr [3] = (byte) (port & 0xff);
-					long addr = address.InternalIPv4Address;
-					sockaddr [4] = (byte) (addr & 0xff);
-					sockaddr [5] = (byte) ((addr >> 8) & 0xff);
-					sockaddr [6] = (byte) ((addr >> 16) & 0xff);
-					sockaddr [7] = (byte) ((addr >> 24) & 0xff);
-					break;
-
-				case AddressFamily.InterNetworkV6:
-					sockaddr = new SocketAddress(AddressFamily.InterNetworkV6, 28);
-
-					sockaddr [2] = (byte) ((port>>8) & 0xff);
-					sockaddr [3] = (byte) (port & 0xff);
-
-					byte[] addressBytes = address.GetAddressBytes();
-					for(int i=0; i<16; i++)
-						sockaddr[8+i] = addressBytes[i];
-					
-					sockaddr [24] = (byte) (address.ScopeId & 0xff);
-					sockaddr [25] = (byte) ((address.ScopeId >> 8) & 0xff);
-					sockaddr [26] = (byte) ((address.ScopeId >> 16) & 0xff);
-					sockaddr [27] = (byte) ((address.ScopeId >> 24) & 0xff);
-					break;
-			}
-
-			return(sockaddr);
-		}
-
-		public override string ToString() {
-			return(address.ToString() + ":" + port);
-		}
-
-		public override bool Equals (object comparand)
-		{
-			IPEndPoint p = comparand as IPEndPoint;
-			return p != null && 
-			       p.port == port && 
-			       p.address.Equals (address);
-		}
-
-		public override int GetHashCode ()
-		{
-			return address.GetHashCode () + port;
-		}
-	}
-}
diff --git a/mcs/class/System/System.Net/IPHostEntry.cs b/mcs/class/System/System.Net/IPHostEntry.cs
deleted file mode 100644
index aedcbab7bda..00000000000
--- a/mcs/class/System/System.Net/IPHostEntry.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// System.Net.IPHostEntry.cs
-//
-// Author: Mads Pultz (mpultz@diku.dk)
-//
-// (C) Mads Pultz, 2001
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Net {
-	
-	public class IPHostEntry {
-		private IPAddress[] addressList;
-		private String[] aliases;
-		private String hostName;
-		
-		public IPHostEntry() {
-		}
-		
-		public IPAddress[] AddressList {
-			get { return addressList; }
-			set { addressList = value; }
-		}
-		
-		public string[] Aliases	{
-			get { return aliases; }
-			set { aliases = value; }
-		}
-		
-		public string HostName {
-			get { return hostName; }
-			set { hostName = value; }
-		}
-		
-/* According to the .NET Framework SDK Documentation (beta 2) the following
-   methods from Object are not overrided. I implemented them before realizing
-   this but I leave the implementation here if needed in the future.
-   
-		public override string ToString() {
-			string res = hostName;
-			if (addressList != null && addressList.Length > 0)
-				res += " [" + addressList[0] + "]";
-			return res;
-		}
-		
-		public override bool Equals(object obj) {
-			if (obj is IPHostEntry) {
-				IPHostEntry h = (IPHostEntry)obj;
-				return hostName.Equals(h.HostName) && aliases.Equals(h.Aliases) &&
-					addressList.Equals(h.AddressList);
-			}
-			else
-			  return false;
-		}
-		
-		public override int GetHashCode() {
-			return hostName.GetHashCode();
-		}
-		
-		protected new object MemberwiseClone() {
-			IPHostEntry res = new IPHostEntry();
-			res.AddressList = new IPAddress[addressList.Length];
-			Array.Copy(addressList, res.AddressList, addressList.Length);
-			res.Aliases = new String[aliases.Length];
-			Array.Copy(aliases, res.Aliases, aliases.Length);
-			res.HostName = hostName;
-			return res;
-		}
-*/
-	}
-}
-
diff --git a/mcs/class/System/System.Net/IPv6Address.cs b/mcs/class/System/System.Net/IPv6Address.cs
index d2103b24f79..3592427d41e 100644
--- a/mcs/class/System/System.Net/IPv6Address.cs
+++ b/mcs/class/System/System.Net/IPv6Address.cs
@@ -1,17 +1,9 @@
 //
-// System.Net.IPv6Address.cs
+// System.Net.IPv6AddressFormatter.cs
 //
 // Author:
 //   Lawrence Pit (loz@cable.a2000.nl)
 //
-// Note I: This class is not defined in the specs of .Net
-//
-// Note II : The name of this class is perhaps unfortunate as it turns
-//           out that in ms.net there's an internal class called
-//           IPv6Address in namespace System.
-//
-
-//
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -32,284 +24,35 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-
-using System;
 using System.Globalization;
-using System.Net.Sockets;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace System.Net {
 
-	/// <remarks>
-	///   Encapsulates an IPv6 Address.
-	///   See RFC 2373 for more info on IPv6 addresses.
-	/// </remarks>
-	[Serializable]
-	internal class IPv6Address {
-		private ushort [] address;
-		private int prefixLength;
-		private long scopeId = 0;
-
-		public static readonly IPv6Address Loopback = IPv6Address.Parse ("::1");
-		public static readonly IPv6Address Unspecified = IPv6Address.Parse ("::");
+	struct IPv6AddressFormatter
+	{
+		ushort [] address;
+		long scopeId;
 
-		public IPv6Address (ushort [] addr)
-		{
-			if (addr == null)
-				throw new ArgumentNullException ("addr");	
-			if (addr.Length != 8)	
-				throw new ArgumentException ("addr");
-			address = addr;			
-		}
-		
-		public IPv6Address (ushort [] addr, int prefixLength) : this (addr)
-		{
-			if (prefixLength < 0 || prefixLength > 128)
-				throw new ArgumentException ("prefixLength");
-			this.prefixLength = prefixLength;
-		}
-	
-		public IPv6Address (ushort [] addr, int prefixLength, int scopeId) : this (addr, prefixLength)
+		public IPv6AddressFormatter (ushort[] addr, long scopeId)
 		{
+			this.address = addr;
 			this.scopeId = scopeId;
 		}
 
-		public static IPv6Address Parse (string ipString)
-		{
-			if (ipString == null)
-				throw new ArgumentNullException ("ipString");
-
-			IPv6Address result;
-			if (TryParse (ipString, out result))
-				return result;
-			throw new FormatException ("Not a valid IPv6 address");
-		}
-
-		static int Fill (ushort [] addr, string ipString)
-		{
-			int p = 0;
-			int pdigits = 0;
-			int slot = 0;
-
-			if (ipString.Length == 0)
-				return 0;
-			
-			// Catch double uses of ::
-			if (ipString.IndexOf ("::", StringComparison.Ordinal) != -1)
-				return -1;
-
-			for (int i = 0; i < ipString.Length; i++){
-				char c = ipString [i];
-				int n;
-
-				if (c == ':'){
-					// Leading : is not allowed.
-					if (i == 0)
-                                               return -1;
-				       
-					// Trailing : is not allowed.
-					if (i == ipString.Length-1)
-						return -1;
-					
-					if (slot == 8)
-						return -1;
-					
-					addr [slot++] = (ushort) p;
-					p = 0;
-					pdigits = 0;
-					continue;
-				}
-				pdigits++;
-				if (pdigits > 4)
-					return -1;
-				if ('0' <= c && c <= '9')
-					n = (int) (c - '0');
-				else if ('a' <= c && c <= 'f')
-					n = (int) (c - 'a' + 10);
-				else if ('A' <= c && c <= 'F')
-					n = (int) (c - 'A' + 10);
-				else 
-					return -1;
-				p = (p << 4) + n;
-				if (p > UInt16.MaxValue)
-					return -1;
-			}
-
-			if (slot == 8)
-				return -1;
-			
-			addr [slot++] = (ushort) p;
-
-			return slot;
-		}
-
-		static bool TryParse (string prefix, out int res)
-		{
-			return Int32.TryParse (prefix, NumberStyles.Integer, CultureInfo.InvariantCulture, out res);
-		}
-		
-		public static bool TryParse (string ipString, out IPv6Address result)
-		{
-			result = null;
-			if (ipString == null)
-				return false;
-
-			if (ipString.Length > 2 && 
-			    ipString [0] == '[' && 
-			    ipString [ipString.Length - 1] == ']')
-				ipString = ipString.Substring (1, ipString.Length - 2);
-
-			if (ipString.Length  < 2)
-				return false;
-
-			int prefixLen = 0;
-			int scopeId = 0;
-			int pos = ipString.LastIndexOf ('/');
-			if (pos != -1) {
-				string prefix = ipString.Substring (pos + 1);
-				if (!TryParse (prefix , out prefixLen))
-					prefixLen = -1;
-				if (prefixLen < 0 || prefixLen > 128)
-					return false;
-				ipString = ipString.Substring (0, pos);
-			} else {
-				pos = ipString.LastIndexOf ('%');
-				if (pos != -1) {
-					string prefix = ipString.Substring (pos + 1);
-					if (!TryParse (prefix, out scopeId))
-						scopeId = 0;
-					ipString = ipString.Substring (0, pos);
-				}			
-			}
-
-			//
-			// At this point the prefix/suffixes have been removed
-			// and we only have to deal with the ipv4 or ipv6 addressed
-			//
-			ushort [] addr = new ushort [8];
-
-			//
-			// Is there an ipv4 address at the end?
-			//
-			int pos2 = ipString.LastIndexOf (':');
-			if (pos2 == -1)
-				return false;
-
-			int slots = 0;
-			if (pos2 < (ipString.Length - 1)) {
-				string ipv4Str = ipString.Substring (pos2 + 1);
-				if (ipv4Str.IndexOf ('.') != -1) {
-					IPAddress ip;
-					
-					if (!IPAddress.TryParse (ipv4Str, out ip))
-						return false;
-					
-					long a = ip.InternalIPv4Address;
-					addr [6] = (ushort) (((int) (a & 0xff) << 8) + ((int) ((a >> 8) & 0xff)));
-					addr [7] = (ushort) (((int) ((a >> 16) & 0xff) << 8) + ((int) ((a >> 24) & 0xff)));
-					if (pos2 > 0 && ipString [pos2 - 1] == ':') 
-						ipString = ipString.Substring (0, pos2 + 1);
-					else
-						ipString = ipString.Substring (0, pos2);
-					slots = 2;
-				}
-			}	
-
-			//
-			// Only an ipv6 block remains, either:
-			// "hexnumbers::hexnumbers", "hexnumbers::" or "hexnumbers"
-			//
-			int c = ipString.IndexOf ("::", StringComparison.Ordinal);
-			if (c != -1){
-				int right_slots = Fill (addr, ipString.Substring (c+2));
-				if (right_slots == -1){
-					return false;
-				}
-
-				if (right_slots + slots > 8){
-					return false;
-				}
-
-				int d = 8-slots-right_slots;
-				for (int i = right_slots; i > 0; i--){
-					addr [i+d-1] = addr [i-1];
-					addr [i-1] = 0;
-				}
-				
-				int left_slots = Fill (addr, ipString.Substring (0, c));
-				if (left_slots == -1)
-					return false;
-
-				if (left_slots + right_slots + slots > 7)
-					return false;
-			} else {
-				if (Fill (addr, ipString) != 8-slots)
-					return false;
-			}
-
-			result = new IPv6Address (addr, prefixLen, scopeId);
-			return true;
-		}
-
-		public ushort [] Address {
-			get { return address; }
-		}
-
-		public int PrefixLength {
-			get { return this.prefixLength; }
-		}
-		
-		public long ScopeId {
-			get {
-				return scopeId;
-			}
-			set {
-				scopeId = value;
-			}
-		}
-
-		public ushort this [int index] {
-			get { return address [index]; }
-		}		
-
-		public AddressFamily AddressFamily {
-			get { return AddressFamily.InterNetworkV6; }
-		}
-
-		public static bool IsLoopback (IPv6Address addr)
-		{
-			if (addr.address [7] != 1)
-				return false;
-
-			int x = addr.address [6] >> 8;
-			if (x != 0x7f && x != 0)
-				return false;
-
-			for (int i = 0; i < 4; i++) {
-				if (addr.address [i] != 0)
-					return false;
-			}
-
-			if (addr.address [5] != 0 && addr.address [5] != 0xffff)
-				return false;
-
-			return true;
-		}
-
-		private static ushort SwapUShort (ushort number)
+		static ushort SwapUShort (ushort number)
 		{
 			return (ushort) ( ((number >> 8) & 0xFF) + ((number << 8) & 0xFF00) );
 		}
 
 		// Convert the address into a format expected by the IPAddress (long) ctor
 		// This needs to be unsigned to satisfy the '> 1' test in IsIPv4Compatible()
-		private uint AsIPv4Int ()
+		uint AsIPv4Int ()
 		{
 			return (uint)(SwapUShort (address [7]) << 16) + SwapUShort (address [6]);
 		}			
 
-		public bool IsIPv4Compatible ()
+		bool IsIPv4Compatible ()
 		{
 			for (int i = 0; i < 6; i++) 
 				if (address [i] != 0)
@@ -323,7 +66,7 @@ namespace System.Net {
 			return (AsIPv4Int () > 1);
 		}
 		
-		public bool IsIPv4Mapped ()
+		bool IsIPv4Mapped ()
 		{
 			for (int i = 0; i < 5; i++) 
 				if (address [i] != 0)
@@ -338,10 +81,6 @@ namespace System.Net {
 			return address [5] == 0xffff;
 		}
 		
-		/// <summary>
-		///   Overrides System.Object.ToString to return
-		///   this object rendered in a canonicalized notation
-		/// </summary>
 		public override string ToString ()
 		{
 			StringBuilder s = new StringBuilder ();
@@ -358,112 +97,52 @@ namespace System.Net {
 
 				return s.ToString ();
 			}
-			else
-			{
-				int bestChStart = -1; // Best chain start
-				int bestChLen = 0; // Best chain length
-				int currChLen = 0; // Current chain length
+			
+			int bestChStart = -1; // Best chain start
+			int bestChLen = 0; // Best chain length
+			int currChLen = 0; // Current chain length
 
-				// Looks for the longest zero chain
-				for (int i=0; i<8; i++)
+			// Looks for the longest zero chain
+			for (int i=0; i<8; i++)
+			{
+				if (address[i] != 0)
 				{
-					if (address[i] != 0)
+					if ((currChLen > bestChLen) 
+						&& (currChLen > 1))
 					{
-						if ((currChLen > bestChLen) 
-							&& (currChLen > 1))
-						{
-							bestChLen = currChLen;
-							bestChStart = i - currChLen;
-						}
-						currChLen = 0;
+						bestChLen = currChLen;
+						bestChStart = i - currChLen;
 					}
-					else
-						currChLen++;
-				}
-				if ((currChLen > bestChLen) 
-					&& (currChLen > 1))
-				{
-					bestChLen = currChLen;
-					bestChStart = 8 - currChLen;
+					currChLen = 0;
 				}
+				else
+					currChLen++;
+			}
+			if ((currChLen > bestChLen) 
+				&& (currChLen > 1))
+			{
+				bestChLen = currChLen;
+				bestChStart = 8 - currChLen;
+			}
 
-				// makes the string
-				if (bestChStart == 0)
-					s.Append(":");
-				for (int i=0; i<8; i++)
+			// makes the string
+			if (bestChStart == 0)
+				s.Append(":");
+			for (int i=0; i<8; i++)
+			{
+				if (i == bestChStart)
 				{
-					if (i == bestChStart)
-					{
-						s.Append (":");
-						i += (bestChLen - 1);
-						continue;
-					}
-					s.AppendFormat("{0:x}", address [i]);
-					if (i < 7) s.Append (':');
+					s.Append (":");
+					i += (bestChLen - 1);
+					continue;
 				}
+				s.AppendFormat("{0:x}", address [i]);
+				if (i < 7) s.Append (':');
 			}
+			
 			if (scopeId != 0)
 				s.Append ('%').Append (scopeId);
 			return s.ToString ();
 		}
-
-		public string ToString (bool fullLength)
-		{
-			if (!fullLength)
-				return ToString ();
-
-			StringBuilder sb = new StringBuilder ();
-			for (int i=0; i < address.Length - 1; i++) {
-				sb.AppendFormat ("{0:X4}:", address [i]);
-			}
-			sb.AppendFormat ("{0:X4}", address [address.Length - 1]);
-			return sb.ToString ();
-		}
-
-		/// <returns>
-		///   Whether both objects are equal.
-		/// </returns>
-		public override bool Equals (object other)
-		{
-			System.Net.IPv6Address ipv6 = other as System.Net.IPv6Address;
-			if (ipv6 != null) {
-				for (int i = 0; i < 8; i++) 
-					if (this.address [i] != ipv6.address [i])
-						return false;
-				return true;
-			}
-			
-			System.Net.IPAddress ipv4 = other as System.Net.IPAddress;
-			if (ipv4 != null) {
-				for (int i = 0; i < 5; i++) 
-					if (address [i] != 0)
-						return false;
-
-				if (address [5] != 0 && address [5] != 0xffff)
-					return false;
-
-				long a = ipv4.InternalIPv4Address;
-				if (address [6] != (ushort) (((int) (a & 0xff) << 8) + ((int) ((a >> 8) & 0xff))) ||
-				    address [7] != (ushort) (((int) ((a >> 16) & 0xff) << 8) + ((int) ((a >> 24) & 0xff))))
-					return false;
-
-				return true;
-			}
-			
-			return false;
-		}
-
-		public override int GetHashCode ()
-		{
-			return Hash (((((int) address [0]) << 16) + address [1]), 
-						((((int) address [2]) << 16) + address [3]),
-						((((int) address [4]) << 16) + address [5]),
-						((((int) address [6]) << 16) + address [7]));
-		}
-		
-		private static int Hash (int i, int j, int k, int l) 
-		{
-			return i ^ (j << 13 | j >> 19) ^ (k << 26 | k >> 6) ^ (l << 7 | l >> 25);
-		}
 	}
 }
diff --git a/mcs/class/System/System.Net/IWebProxy.cs b/mcs/class/System/System.Net/IWebProxy.cs
deleted file mode 100644
index 0b0eb65a5f8..00000000000
--- a/mcs/class/System/System.Net/IWebProxy.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Net.IWebProxy.cs
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Net {
-
-	// <remarks>
-	// </remarks>
-	public interface IWebProxy {
-		ICredentials Credentials {
-			get; 
-			set;
-		}
-
-		Uri GetProxy (Uri destination);
-		
-		bool IsBypassed (Uri host);
-	}
-}
diff --git a/mcs/class/System/System.Net/IWebRequestCreate.cs b/mcs/class/System/System.Net/IWebRequestCreate.cs
deleted file mode 100644
index b840dea490a..00000000000
--- a/mcs/class/System/System.Net/IWebRequestCreate.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Net.IWebRequestCreate.cs
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net {
-
-	public interface IWebRequestCreate {
-		WebRequest Create (Uri uri);		
-	}
-}
diff --git a/mcs/class/System/System.Net/NetworkAccess.cs b/mcs/class/System/System.Net/NetworkAccess.cs
deleted file mode 100644
index cc56568c7eb..00000000000
--- a/mcs/class/System/System.Net/NetworkAccess.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// NetworkAccess.cs
-//
-// This code was automatically generated from
-// ECMA CLI XML Library Specification.
-// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
-// Created: Wed, 5 Sep 2001 06:35:58 UTC
-// Source file: all.xml
-// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-namespace System.Net {
-	[Flags]
-	public enum NetworkAccess {
-		Accept = 128,
-
-		Connect = 64,
-	}
-
-} 
diff --git a/mcs/class/System/System.Net/ProtocolViolationException.cs b/mcs/class/System/System.Net/ProtocolViolationException.cs
deleted file mode 100644
index 0587dfe5333..00000000000
--- a/mcs/class/System/System.Net/ProtocolViolationException.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// System.Net.ProtocolViolationException.cs
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Globalization;
-using System.Runtime.Serialization;
-
-namespace System.Net 
-{
-	[Serializable]
-	public class ProtocolViolationException : InvalidOperationException, ISerializable
-	{
-
-		// Constructors
-		public ProtocolViolationException () : base ()
-		{
-		}
-		
-		public ProtocolViolationException (string message) : base (message)
-		{
-		}
-
-		protected ProtocolViolationException (SerializationInfo serializationInfo, StreamingContext streamingContext)
-			: base (serializationInfo, streamingContext)
-		{
-		}
-
-		// Methods
-		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
-		{
-			base.GetObjectData (info, context);
-		}
-
-		public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			base.GetObjectData (serializationInfo, streamingContext);
-		}
-	}
-}
-	
diff --git a/mcs/class/System/System.Net/SecurityProtocolType.cs b/mcs/class/System/System.Net/SecurityProtocolType.cs
deleted file mode 100644
index 69f2fca0a84..00000000000
--- a/mcs/class/System/System.Net/SecurityProtocolType.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Net.SecurityProtocolType.cs
-//
-// Authors
-//	Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net {
-
-	[Flags]
-	public
-	enum SecurityProtocolType {
-		Ssl3 = 48,
-		Tls = 192,
-		Tls11 = 768,
-		Tls12 = 3072
-	}
-}
diff --git a/mcs/class/System/System.Net/ServicePoint.cs b/mcs/class/System/System.Net/ServicePoint.cs
index 13c06ec493f..108de70ffb3 100644
--- a/mcs/class/System/System.Net/ServicePoint.cs
+++ b/mcs/class/System/System.Net/ServicePoint.cs
@@ -42,7 +42,7 @@ namespace System.Net
 {
 	public class ServicePoint
 	{
-		Uri uri;
+		readonly Uri uri;
 		int connectionLimit;
 		int maxIdleTime;
 		int currentConnections;
@@ -345,15 +345,31 @@ namespace System.Net
 				lock (hostE) {
 					string uriHost = uri.Host;
 
-					if (host == null || HasTimedOut) {
-						lastDnsResolve = DateTime.UtcNow;
+					if (host == null) {
+						// Cannot do DNS resolution on literal IP addresses
+						if (uri.HostNameType == UriHostNameType.IPv6 || uri.HostNameType == UriHostNameType.IPv4) {
 
-						try {
-							host = Dns.GetHostEntry (uriHost);
-						}
-						catch (Exception) {
-							return null;
+							if (uri.HostNameType == UriHostNameType.IPv6) {
+								// Remove square brackets
+								uriHost = uriHost.Substring (1, uriHost.Length - 2);
+							}
+
+							// Creates IPHostEntry
+							host = new IPHostEntry();
+							host.AddressList = new IPAddress[] { IPAddress.Parse (uriHost) };
+							return host;
 						}
+					} else {
+						if (!HasTimedOut)
+							return host;
+					}
+
+					lastDnsResolve = DateTime.UtcNow;
+
+					try {
+						host = Dns.GetHostEntry (uriHost);
+					} catch {
+						return null;
 					}
 				}
 
@@ -489,6 +505,11 @@ namespace System.Net
 				return true;
 			}
 		}
+
+		internal Socket GetConnection(PooledStream PooledStream, object owner, bool async, out IPAddress address, ref Socket abortSocket, ref Socket abortSocket6)
+		{
+			throw new NotImplementedException ();
+		}
 	}
 }
 
diff --git a/mcs/class/System/System.Net/ServicePointManager.cs b/mcs/class/System/System.Net/ServicePointManager.cs
index abd23e67270..723125b1e75 100644
--- a/mcs/class/System/System.Net/ServicePointManager.cs
+++ b/mcs/class/System/System.Net/ServicePointManager.cs
@@ -311,7 +311,7 @@ namespace System.Net
 
 		public static ServicePoint FindServicePoint (Uri address) 
 		{
-			return FindServicePoint (address, GlobalProxySelection.Select);
+			return FindServicePoint (address, null);
 		}
 		
 		public static ServicePoint FindServicePoint (string uriString, IWebProxy proxy)
diff --git a/mcs/class/System/System.Net/ServicePointManager.extra.cs b/mcs/class/System/System.Net/ServicePointManager.extra.cs
index 30443637854..d971cdd8412 100644
--- a/mcs/class/System/System.Net/ServicePointManager.extra.cs
+++ b/mcs/class/System/System.Net/ServicePointManager.extra.cs
@@ -7,17 +7,29 @@
 // Copyright 2013-2014 Xamarin Inc.
 //
 
+#if MOBILE
+
 using System;
 using System.Collections.Generic;
 
 namespace System.Net {
 
+	/*
+	 * The idea behind this API was to let the application filter the set of cipher suites received / send to
+	 * the remote side.  This concept does not any longer work with the new native implementations.
+	 */
+
+	[Obsolete ("This API is no longer supported.")]
 	public delegate IEnumerable<string> CipherSuitesCallback (SecurityProtocolType protocol, IEnumerable<string> allCiphers);
 
 	public partial class ServicePointManager {
 
+		[Obsolete ("This API is no longer supported.", true)]
 		public static CipherSuitesCallback ClientCipherSuitesCallback { get; set; }
 
+		[Obsolete ("This API is no longer supported.", true)]
 		public static CipherSuitesCallback ServerCipherSuitesCallback { get; set; }
 	}
-}
-\ No newline at end of file
+}
+
+#endif
diff --git a/mcs/class/System/System.Net/SocketAddress.cs b/mcs/class/System/System.Net/SocketAddress.cs
deleted file mode 100644
index 463f2756a49..00000000000
--- a/mcs/class/System/System.Net/SocketAddress.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// System.Net.SocketAddress.cs
-//
-// Author:
-//   Miguel de Icaza (miguel@ximian.com)
-//   Dick Porter (dick@ximian.com)
-//
-// (C) Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Net.Sockets;
-
-namespace System.Net {
-
-	public class SocketAddress {
-		private byte[] data;
-		
-		public SocketAddress (AddressFamily family, int size)
-		{
-			if(size<2) {
-				throw new ArgumentOutOfRangeException("size is too small");
-			}
-			
-			data=new byte[size];
-			data[0]=(byte)family;
-			data[1]=(byte) ((int) family >> 8);
-		}
-
-		public SocketAddress (AddressFamily family)
-			: this (family, 32)
-		{
-		}
-		
-		//LAMESPEC: the MS doc about this class is wrong. The size is not stored in byte 1. Instead
-		// byte [0] and byte [1] hold the family (little endian).
-		public AddressFamily Family {
-			get {
-				return (AddressFamily) (data [0] + (data [1] << 8));
-			}
-		}
-
-		public int Size {
-			get {
-				return data.Length;
-			}
-		}
-
-		public byte this [ int offset ] {
-			get {
-				return(data[offset]);
-			}
-
-			set {
-				data[offset]=value;
-			}
-		}
-
-		public override string ToString() {
-			string af=((AddressFamily)data[0]).ToString();
-			int size = data.Length;
-			string ret=af+":"+size+":{";
-			
-			for(int i=2; i<size; i++) {
-				int val=(int)data[i];
-				ret=ret+val;
-				if(i<size-1) {
-					ret=ret+",";
-				}
-			}
-			
-			ret=ret+"}";
-			
-			return(ret);
-		}
-
-		public override bool Equals (object comparand)
-		{
-			SocketAddress sa = (comparand as SocketAddress);
-			if ((sa != null) && (sa.data.Length == data.Length)) {
-				byte [] otherData = sa.data;
-				for (int i = 0; i < data.Length; i++)
-					if (otherData [i] != data [i])
-						return false;
-
-				return true;
-			}
-
-			return false;
-		}
-
-		public override int GetHashCode ()
-		{
-			int code = 0;
-
-			for (int i = 0; i < data.Length; i++)
-				code += data [i] + i;
-
-			return code;
-		}
-	}
-}
diff --git a/mcs/class/System/System.Net/TransportContext.cs b/mcs/class/System/System.Net/TransportContext.cs
deleted file mode 100644
index 7685687b47d..00000000000
--- a/mcs/class/System/System.Net/TransportContext.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// TransportContext.cs
-//
-// Authors:
-//	Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2011 Xamarin Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System.Security.Authentication.ExtendedProtection;
-
-namespace System.Net
-{
-	public abstract class TransportContext
-	{
-		public abstract ChannelBinding GetChannelBinding (ChannelBindingKind kind);
-	}
-}
-
diff --git a/mcs/class/System/System.Net/TransportType.cs b/mcs/class/System/System.Net/TransportType.cs
deleted file mode 100644
index d1f9c561e0c..00000000000
--- a/mcs/class/System/System.Net/TransportType.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// TransportType.cs
-//
-// This code was automatically generated from
-// ECMA CLI XML Library Specification.
-// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
-// Created: Wed, 5 Sep 2001 06:32:18 UTC
-// Source file: AllTypes.xml
-// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-namespace System.Net {
-
-
-	/// <summary>
-	/// </summary>
-	public enum TransportType {
-
-		/// <summary>
-		/// </summary>
-		Udp = 1,
-
-		/// <summary>
-		/// </summary>
-		Connectionless = 1,
-
-		/// <summary>
-		/// </summary>
-		Tcp = 2,
-
-		/// <summary>
-		/// </summary>
-		ConnectionOriented = 2,
-
-		/// <summary>
-		/// </summary>
-		All = 3,
-	} // TransportType
-
-} // System.Net
diff --git a/mcs/class/System/System.Net/UploadProgressChangedEventHandler.cs b/mcs/class/System/System.Net/UploadProgressChangedEventHandler.cs
deleted file mode 100644
index af1853e5c60..00000000000
--- a/mcs/class/System/System.Net/UploadProgressChangedEventHandler.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// UploadProgressChangedEventHandler.cs
-//
-// Author:
-//	Atsushi Enomoto  <atsushi@ximian.com>
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Net
-{
-	public delegate void UploadProgressChangedEventHandler (object sender, UploadProgressChangedEventArgs e);
-}
-
diff --git a/mcs/class/System/System.Net/WebConnection.cs b/mcs/class/System/System.Net/WebConnection.cs
index f4f61725fb4..28d89a6065c 100644
--- a/mcs/class/System/System.Net/WebConnection.cs
+++ b/mcs/class/System/System.Net/WebConnection.cs
@@ -261,7 +261,7 @@ namespace System.Net
 					var auth = AuthenticationManager.Authenticate (challenge [i], connect_request, creds);
 					if (auth == null)
 						continue;
-					ntlm = (auth.Module.AuthenticationType == "NTLM");
+					ntlm = (auth.ModuleAuthenticationType == "NTLM");
 					sb.Append ("\r\nProxy-Authorization: ");
 					sb.Append (auth.Message);
 					break;
@@ -292,7 +292,7 @@ namespace System.Net
 				}
 
 				Data.StatusCode = status;
-				Data.Challenge = result.GetValues_internal ("Proxy-Authenticate", false);
+				Data.Challenge = result.GetValues ("Proxy-Authentic");
 				return false;
 			} else if (status != 200) {
 				string msg = String.Format ("The remote server returned a {0} status code.", status);
@@ -659,8 +659,23 @@ namespace System.Net
 					if (!finished)
 						return 0;
 
-					foreach (string s in headers)
-						data.Headers.SetInternal (s);
+					// .NET uses ParseHeaders or ParseHeadersStrict which is much better
+					foreach (string s in headers) {
+
+						int pos_s = s.IndexOf (':');
+						if (pos_s == -1)
+							throw new ArgumentException ("no colon found", "header");
+
+						var header = s.Substring (0, pos_s);
+						var value = s.Substring (pos_s + 1).Trim ();
+
+						var h = data.Headers;
+						if (h.AllowMultiValues (header)) {
+							h.AddInternal (header, value);
+						} else  {
+							h.SetInternal (header, value);
+						}
+					}
 
 					if (data.StatusCode == (int) HttpStatusCode.Continue) {
 						sPoint.SendContinue = true;
diff --git a/mcs/class/System/System.Net/WebConnectionStream.cs b/mcs/class/System/System.Net/WebConnectionStream.cs
index 295ee6757dc..9f8ed04955b 100644
--- a/mcs/class/System/System.Net/WebConnectionStream.cs
+++ b/mcs/class/System/System.Net/WebConnectionStream.cs
@@ -480,7 +480,7 @@ namespace System.Net
 							AsyncCallback cb, object state)
 		{
 			if (request.Aborted)
-				throw new WebException ("The request was canceled.", null, WebExceptionStatus.RequestCanceled);
+				throw new WebException ("The request was canceled.", WebExceptionStatus.RequestCanceled);
 
 			if (isRead)
 				throw new NotSupportedException ("this stream does not allow writing");
@@ -675,7 +675,7 @@ namespace System.Net
 				} catch (WebException e) {
 					result.SetCompleted (false, e);
 				} catch (Exception e) {
-					result.SetCompleted (false, new WebException ("Error writing headers", e, WebExceptionStatus.SendFailure));
+					result.SetCompleted (false, new WebException ("Error writing headers", WebExceptionStatus.SendFailure, WebExceptionInternalStatus.RequestFatal, e));
 				}
 			}, null);
 
@@ -814,7 +814,7 @@ namespace System.Net
 				IOException io = new IOException ("Cannot close the stream until all bytes are written");
 				nextReadCalled = true;
 				cnc.Close (true);
-				throw new WebException ("Request was cancelled.", io, WebExceptionStatus.RequestCanceled);
+				throw new WebException ("Request was cancelled.", WebExceptionStatus.RequestCanceled, WebExceptionInternalStatus.RequestFatal, io);
 			}
 
 			// Commented out the next line to fix xamarin bug #1512
diff --git a/mcs/class/System/System.Net/WebException.cs b/mcs/class/System/System.Net/WebException.cs
deleted file mode 100644
index e6b3c161444..00000000000
--- a/mcs/class/System/System.Net/WebException.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// System.Net.WebException.cs
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Runtime.Serialization;
-
-namespace System.Net 
-{
-	[Serializable]
-	public class WebException : InvalidOperationException, ISerializable {
-		private WebResponse response;
-		private WebExceptionStatus status = WebExceptionStatus.UnknownError;
-
-		// Constructors
-		
-		public WebException () : base ()
-		{
-		}
-		
-		public WebException (string message) : base (message)
-		{
-		}
-
-		protected WebException (SerializationInfo serializationInfo, StreamingContext streamingContext)
-			: base (serializationInfo, streamingContext)
-		{
-		}
-
-		public WebException (string message, Exception innerException)
-			: base (message, innerException)
-		{
-		}
-
-		public WebException (string message, WebExceptionStatus status)
-			: base (message)
-		{
-			this.status = status;
-		}
-		
-		internal WebException (string message, Exception innerException, WebExceptionStatus status)
-			: base (message, innerException)
-		{
-			this.status = status;
-		}
-
-		public WebException(string message, 
-				    Exception innerException,
-		   		    WebExceptionStatus status, 
-		   		    WebResponse response)
-			: base (message, innerException)
-		{
-			this.status = status;
-			this.response = response;
-		}
-		
-		// Properties
-		
-		public WebResponse Response {
-			get { return this.response; }
-		}
-		
-		public WebExceptionStatus Status {
-			get { return this.status; }
-		}
-		
-		// Methods
-		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
-		{
-			base.GetObjectData (info, context);
-		}
-
-		public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			base.GetObjectData (serializationInfo,
-					    streamingContext);
-		}
-	}
-}
diff --git a/mcs/class/System/System.Net/WebExceptionStatus.cs b/mcs/class/System/System.Net/WebExceptionStatus.cs
deleted file mode 100644
index 468a0d5ca6f..00000000000
--- a/mcs/class/System/System.Net/WebExceptionStatus.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// System.Net.WebExceptionStatus.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//   originally autogenerated by Sergey Chaban (serge@wildwestsoftware.com)
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net 
-{
-	public
-	enum WebExceptionStatus 
-	{
-		Success = 0,
-		NameResolutionFailure = 1,
-		ConnectFailure = 2,
-		ReceiveFailure = 3,
-		SendFailure = 4,
-		PipelineFailure = 5,
-		RequestCanceled = 6,
-		ProtocolError = 7,
-		ConnectionClosed = 8,
-		TrustFailure = 9,
-		SecureChannelFailure = 10,
-		ServerProtocolViolation = 11,
-		KeepAliveFailure = 12,
-		Pending = 13,
-		Timeout = 14,
-		ProxyNameResolutionFailure = 15,
-
-
-		UnknownError = 16,
-		MessageLengthLimitExceeded = 17,
-
-		CacheEntryNotFound = 18,
-		RequestProhibitedByCachePolicy = 19,
-		RequestProhibitedByProxy = 20,
-
-	}
-}
diff --git a/mcs/class/System/System.Net/WebHeaderCollection.cs b/mcs/class/System/System.Net/WebHeaderCollection.cs
deleted file mode 100644
index 967a4eb0faf..00000000000
--- a/mcs/class/System/System.Net/WebHeaderCollection.cs
+++ /dev/null
@@ -1,746 +0,0 @@
-//
-// System.Net.WebHeaderCollection
-//
-// Authors:
-// 	Lawrence Pit (loz@cable.a2000.nl)
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//      Miguel de Icaza (miguel@novell.com)
-//	Marek Safar (marek.safar@gmail.com)
-//
-// Copyright 2003 Ximian, Inc. (http://www.ximian.com)
-// Copyright 2007 Novell, Inc. (http://www.novell.com)
-// Copyright (C) 2011 Xamarin Inc (http://www.xamarin.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Runtime.InteropServices;
-using System.Runtime.Serialization;
-using System.Text;
-    
-// See RFC 2068 par 4.2 Message Headers
-    
-namespace System.Net 
-{
-	[Serializable]
-	[ComVisible(true)]
-	public class WebHeaderCollection : NameValueCollection, ISerializable {
-		[Flags]
-		internal enum HeaderInfo
-		{
-			Request = 1,
-			Response = 1 << 1,
-			MultiValue = 1 << 10
-		}
-
-		static readonly bool[] allowed_chars = {
-			false, false, false, false, false, false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, true, false, true, true, true, true, false, false, false, true,
-			true, false, true, true, false, true, true, true, true, true, true, true, true, true, true, false,
-			false, false, false, false, false, false, true, true, true, true, true, true, true, true, true,
-			true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
-			false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true,
-			true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
-			false, true, false
-		};
-
-		static readonly Dictionary<string, HeaderInfo> headers;
-		HeaderInfo? headerRestriction;
-		HeaderInfo? headerConsistency;
-		
-		static WebHeaderCollection () 
-		{
-			headers = new Dictionary<string, HeaderInfo> (StringComparer.OrdinalIgnoreCase) {
-				{ "Allow", HeaderInfo.MultiValue },
-				{ "Accept", HeaderInfo.Request | HeaderInfo.MultiValue },
-				{ "Accept-Charset", HeaderInfo.MultiValue },
-				{ "Accept-Encoding", HeaderInfo.MultiValue },
-				{ "Accept-Language", HeaderInfo.MultiValue },
-				{ "Accept-Ranges", HeaderInfo.MultiValue },
-				{ "Authorization", HeaderInfo.MultiValue },
-				{ "Cache-Control", HeaderInfo.MultiValue },
-				{ "Cookie", HeaderInfo.MultiValue },
-				{ "Connection", HeaderInfo.Request | HeaderInfo.MultiValue },
-				{ "Content-Encoding", HeaderInfo.MultiValue },
-				{ "Content-Length", HeaderInfo.Request | HeaderInfo.Response },
-				{ "Content-Type", HeaderInfo.Request },
-				{ "Content-Language", HeaderInfo.MultiValue },
-				{ "Date", HeaderInfo.Request },
-				{ "Expect", HeaderInfo.Request | HeaderInfo.MultiValue},
-				{ "Host", HeaderInfo.Request },
-				{ "If-Match", HeaderInfo.MultiValue },
-				{ "If-Modified-Since", HeaderInfo.Request },
-				{ "If-None-Match", HeaderInfo.MultiValue },
-				{ "Keep-Alive", HeaderInfo.Response },
-				{ "Pragma", HeaderInfo.MultiValue },
-				{ "Proxy-Authenticate", HeaderInfo.MultiValue },
-				{ "Proxy-Authorization", HeaderInfo.MultiValue },
-				{ "Proxy-Connection", HeaderInfo.Request | HeaderInfo.MultiValue },
-				{ "Range", HeaderInfo.Request | HeaderInfo.MultiValue },
-				{ "Referer", HeaderInfo.Request },
-				{ "Set-Cookie", HeaderInfo.MultiValue },
-				{ "Set-Cookie2", HeaderInfo.MultiValue },
-				{ "TE", HeaderInfo.MultiValue },
-				{ "Trailer", HeaderInfo.MultiValue },
-				{ "Transfer-Encoding", HeaderInfo.Request | HeaderInfo.Response | HeaderInfo.MultiValue },
-				{ "Upgrade", HeaderInfo.MultiValue },
-				{ "User-Agent", HeaderInfo.Request },
-				{ "Vary", HeaderInfo.MultiValue },
-				{ "Via", HeaderInfo.MultiValue },
-				{ "Warning", HeaderInfo.MultiValue },
-				{ "WWW-Authenticate", HeaderInfo.Response | HeaderInfo. MultiValue }
-			};
-		}
-		
-		// Constructors
-		
-		public WebHeaderCollection ()
-		{
-		}
-
-
-        internal WebHeaderCollection(WebHeaderCollectionType type)
-        {
-//            m_Type = type;
-//            if (type == WebHeaderCollectionType.HttpWebResponse)
-//                m_CommonHeaders = new string[s_CommonHeaderNames.Length - 1];  // Minus one for the sentinel.
-        }		
-		
-		protected WebHeaderCollection (SerializationInfo serializationInfo, 
-					       StreamingContext streamingContext)
-		{
-			int count;
-
-			try {
-				count = serializationInfo.GetInt32("Count");
-				for (int i = 0; i < count; i++) 
-					this.Add (serializationInfo.GetString (i.ToString ()),
-						  serializationInfo.GetString ((count + i).ToString ()));
-			} catch (SerializationException){
-				count = serializationInfo.GetInt32("count");
-				for (int i = 0; i < count; i++) 
-					this.Add (serializationInfo.GetString ("k" + i),
-						  serializationInfo.GetString ("v" + i));
-			}
-			
-		}
-
-		internal WebHeaderCollection (HeaderInfo headerRestriction)
-		{
-			this.headerRestriction = headerRestriction;
-		}		
-		
-		// Methods
-		
-		public void Add (string header)
-		{
-			if (header == null)
-				throw new ArgumentNullException ("header");
-			int pos = header.IndexOf (':');
-			if (pos == -1)
-				throw new ArgumentException ("no colon found", "header");
-
-			this.Add (header.Substring (0, pos), header.Substring (pos + 1));
-		}
-		
-		public override void Add (string name, string value)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-
-			CheckRestrictedHeader (name);
-			this.AddWithoutValidate (name, value);
-		}
-
-		protected void AddWithoutValidate (string headerName, string headerValue)
-		{
-			if (!IsHeaderName (headerName))
-				throw new ArgumentException ("invalid header name: " + headerName, "headerName");
-			if (headerValue == null)
-				headerValue = String.Empty;
-			else
-				headerValue = headerValue.Trim ();
-			if (!IsHeaderValue (headerValue))
-				throw new ArgumentException ("invalid header value: " + headerValue, "headerValue");
-			
-			AddValue (headerName, headerValue);
-		}
-			
-		internal void AddValue (string headerName, string headerValue)
-		{
-			base.Add (headerName, headerValue);			
-		}
-
-		internal string [] GetValues_internal (string header, bool split)
-		{
-			if (header == null)
-				throw new ArgumentNullException ("header");
-
-			string [] values = base.GetValues (header);
-			if (values == null || values.Length == 0)
-				return null;
-
-			if (split && IsMultiValue (header)) {
-				List<string> separated = null;
-				foreach (var value in values) {
-					if (value.IndexOf (',') < 0) {
-						if (separated != null)
-							separated.Add (value);
-						
-						continue;
-					}
-
-					if (separated == null) {
-						separated = new List<string> (values.Length + 1);
-						foreach (var v in values) {
-							if (v == value)
-								break;
-
-							separated.Add (v);
-						}
-					}
-
-					var slices = value.Split (',');
-					var slices_length = slices.Length;
-					if (value[value.Length - 1] == ',')
-						--slices_length;
-
-					for (int i = 0; i < slices_length; ++i ) {
-						separated.Add (slices[i].Trim ());
-					}
-				}
-
-				if (separated != null)
-					return separated.ToArray ();
-			}
-
-			return values;
-		}
-
-		public override string [] GetValues (string header)
-		{
-			return GetValues_internal (header, true);
-		}
-
-		public override string[] GetValues (int index)
-		{
-			string[] values = base.GetValues (index);
-
-			if (values == null || values.Length == 0) {
-				return null;
-			}
-			
-			return values;
-		}
-
-		public static bool IsRestricted (string headerName)
-		{
-			return IsRestricted (headerName, false);
-		}
-
-		public static bool IsRestricted (string headerName, bool response)
-		{
-			if (headerName == null)
-				throw new ArgumentNullException ("headerName");
-
-			if (headerName.Length == 0)
-				throw new ArgumentException ("empty string", "headerName");
-
-			if (!IsHeaderName (headerName))
-				throw new ArgumentException ("Invalid character in header");
-
-			HeaderInfo info;
-			if (!headers.TryGetValue (headerName, out info))
-				return false;
-
-			var flag = response ? HeaderInfo.Response : HeaderInfo.Request;
-			return (info & flag) != 0;
-		}
-
-		public override void OnDeserialization (object sender)
-		{
-		}
-
-		public override void Remove (string name)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-
-			CheckRestrictedHeader (name);
-			base.Remove (name);
-		}
-
-		public override void Set (string name, string value)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (!IsHeaderName (name))
-				throw new ArgumentException ("invalid header name");
-			if (value == null)
-				value = String.Empty;
-			else
-				value = value.Trim ();
-			if (!IsHeaderValue (value))
-				throw new ArgumentException ("invalid header value");
-
-			CheckRestrictedHeader (name);
-			base.Set (name, value);			
-		}
-
-		public byte[] ToByteArray ()
-		{
-			return Encoding.UTF8.GetBytes(ToString ());
-		}
-
-		internal string ToStringMultiValue ()
-		{
-			StringBuilder sb = new StringBuilder();
-
-			int count = base.Count;
-			for (int i = 0; i < count ; i++) {
-				string key = GetKey (i);
-				if (IsMultiValue (key)) {
-					foreach (string v in GetValues (i)) {
-						sb.Append (key)
-						  .Append (": ")
-						  .Append (v)
-						  .Append ("\r\n");
-					}
-				} else {
-					sb.Append (key)
-					  .Append (": ")
-					  .Append (Get (i))
-					  .Append ("\r\n");
-				}
-			 }
-			return sb.Append("\r\n").ToString();
-		}
-
-		public override string ToString ()
-		{
-			StringBuilder sb = new StringBuilder();
-
-			int count = base.Count;
-			for (int i = 0; i < count ; i++)
-				sb.Append (GetKey (i))
-				  .Append (": ")
-				  .Append (Get (i))
-				  .Append ("\r\n");
-
-			return sb.Append("\r\n").ToString();
-		}
-		void ISerializable.GetObjectData (SerializationInfo serializationInfo,
-						  StreamingContext streamingContext)
-		{
-			GetObjectData (serializationInfo, streamingContext);
-		}
-		public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			int count = base.Count;
-			serializationInfo.AddValue ("Count", count);
-			for (int i = 0; i < count; i++) {
-				serializationInfo.AddValue (i.ToString (), GetKey (i));
-				serializationInfo.AddValue ((count + i).ToString (), Get (i));
-			}
-		}
-
-		public override string[] AllKeys {
-			get {
-				return base.AllKeys;
-			}
-		}
-		
-		public override int Count {
-			get {
-				return base.Count;
-			}
-		}
-
-		public override KeysCollection Keys {
-			get {
-				return base.Keys;
-			}
-		}
-
-		public override string Get (int index)
-		{
-			return base.Get (index);
-		}
-		
-		public override string Get (string name)
-		{
-			return base.Get (name);
-		}
-		
-		public override string GetKey (int index)
-		{
-			return base.GetKey (index);
-		}
-
-		public void Add (HttpRequestHeader header, string value)
-		{
-			Add (RequestHeaderToString (header), value);
-		}
-
-		public void Remove (HttpRequestHeader header)
-		{
-			Remove (RequestHeaderToString (header));
-		}
-
-		public void Set (HttpRequestHeader header, string value)
-		{
-			Set (RequestHeaderToString (header), value);
-		}
-
-		public void Add (HttpResponseHeader header, string value)
-		{
-			Add (ResponseHeaderToString (header), value);
-		}
-
-		public void Remove (HttpResponseHeader header)
-		{
-			Remove (ResponseHeaderToString (header));
-		}
-
-		public void Set (HttpResponseHeader header, string value)
-		{
-			Set (ResponseHeaderToString (header), value);
-		}
-
-		public string this [HttpRequestHeader header] {
-			get {
-				return Get (RequestHeaderToString (header));
-			}
-			
-			set {
-				Set (header, value);
-			}
-		}
-
-		public string this [HttpResponseHeader header] {
-			get {
-				return Get (ResponseHeaderToString (header));
-			}
-
-			set {
-				Set (header, value);
-			}
-		}
-
-		public override void Clear ()
-		{
-			base.Clear ();
-		}
-
-		public override IEnumerator GetEnumerator ()
-		{
-			return base.GetEnumerator ();
-		}
-
-		// Internal Methods
-		
-		// With this we don't check for invalid characters in header. See bug #55994.
-		internal void SetInternal (string header)
-		{
-			int pos = header.IndexOf (':');
-			if (pos == -1)
-				throw new ArgumentException ("no colon found", "header");				
-
-			SetInternal (header.Substring (0, pos), header.Substring (pos + 1));
-		}
-
-		internal void SetInternal (string name, string value)
-		{
-			if (value == null)
-				value = String.Empty;
-			else
-				value = value.Trim ();
-			if (!IsHeaderValue (value))
-				throw new ArgumentException ("invalid header value");
-
-			if (IsMultiValue (name)) {
-				base.Add (name, value);
-			} else {
-				base.Remove (name);
-				base.Set (name, value);	
-			}
-		}
-
-		internal void RemoveAndAdd (string name, string value)
-		{
-			if (value == null)
-				value = String.Empty;
-			else
-				value = value.Trim ();
-
-			base.Remove (name);
-			base.Set (name, value);
-		}
-
-		internal void RemoveInternal (string name)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			base.Remove (name);
-		}		
-		
-		// Private Methods
-
-		string RequestHeaderToString (HttpRequestHeader value)
-		{
-			CheckHeaderConsistency (HeaderInfo.Request);
-
-			switch (value) {
-			case HttpRequestHeader.CacheControl:
-				return "Cache-Control";
-			case HttpRequestHeader.Connection:
-				return "Connection";
-			case HttpRequestHeader.Date:
-				return "Date";
-			case HttpRequestHeader.KeepAlive:
-				return "Keep-Alive";
-			case HttpRequestHeader.Pragma:
-				return "Pragma";
-			case HttpRequestHeader.Trailer:
-				return "Trailer";
-			case HttpRequestHeader.TransferEncoding:
-				return "Transfer-Encoding";
-			case HttpRequestHeader.Upgrade:
-				return "Upgrade";
-			case HttpRequestHeader.Via:
-				return "Via";
-			case HttpRequestHeader.Warning:
-				return "Warning";
-			case HttpRequestHeader.Allow:
-				return "Allow";
-			case HttpRequestHeader.ContentLength:
-				return "Content-Length";
-			case HttpRequestHeader.ContentType:
-				return "Content-Type";
-			case HttpRequestHeader.ContentEncoding:
-				return "Content-Encoding";
-			case HttpRequestHeader.ContentLanguage:
-				return "Content-Language";
-			case HttpRequestHeader.ContentLocation:
-				return "Content-Location";
-			case HttpRequestHeader.ContentMd5:
-				return "Content-MD5";
-			case HttpRequestHeader.ContentRange:
-				return "Content-Range";
-			case HttpRequestHeader.Expires:
-				return "Expires";
-			case HttpRequestHeader.LastModified:
-				return "Last-Modified";
-			case HttpRequestHeader.Accept:
-				return "Accept";
-			case HttpRequestHeader.AcceptCharset:
-				return "Accept-Charset";
-			case HttpRequestHeader.AcceptEncoding:
-				return "Accept-Encoding";
-			case HttpRequestHeader.AcceptLanguage:
-				return "accept-language";
-			case HttpRequestHeader.Authorization:
-				return "Authorization";
-			case HttpRequestHeader.Cookie:
-				return "Cookie";
-			case HttpRequestHeader.Expect:
-				return "Expect";
-			case HttpRequestHeader.From:
-				return "From";
-			case HttpRequestHeader.Host:
-				return "Host";
-			case HttpRequestHeader.IfMatch:
-				return "If-Match";
-			case HttpRequestHeader.IfModifiedSince:
-				return "If-Modified-Since";
-			case HttpRequestHeader.IfNoneMatch:
-				return "If-None-Match";
-			case HttpRequestHeader.IfRange:
-				return "If-Range";
-			case HttpRequestHeader.IfUnmodifiedSince:
-				return "If-Unmodified-Since";
-			case HttpRequestHeader.MaxForwards:
-				return "Max-Forwards";
-			case HttpRequestHeader.ProxyAuthorization:
-				return "Proxy-Authorization";
-			case HttpRequestHeader.Referer:
-				return "Referer";
-			case HttpRequestHeader.Range:
-				return "Range";
-			case HttpRequestHeader.Te:
-				return "TE";
-			case HttpRequestHeader.Translate:
-				return "Translate";
-			case HttpRequestHeader.UserAgent:
-				return "User-Agent";
-			default:
-				throw new InvalidOperationException ();
-			}
-		}
-
-		string ResponseHeaderToString (HttpResponseHeader value)
-		{
-			CheckHeaderConsistency (HeaderInfo.Response);
-
-			switch (value) {
-			case HttpResponseHeader.CacheControl:
-				return "Cache-Control";
-			case HttpResponseHeader.Connection:
-				return "Connection";
-			case HttpResponseHeader.Date:
-				return "Date";
-			case HttpResponseHeader.KeepAlive:
-				return "Keep-Alive";
-			case HttpResponseHeader.Pragma:
-				return "Pragma";
-			case HttpResponseHeader.Trailer:
-				return "Trailer";
-			case HttpResponseHeader.TransferEncoding:
-				return "Transfer-Encoding";
-			case HttpResponseHeader.Upgrade:
-				return "Upgrade";
-			case HttpResponseHeader.Via:
-				return "Via";
-			case HttpResponseHeader.Warning:
-				return "Warning";
-			case HttpResponseHeader.Allow:
-				return "Allow";
-			case HttpResponseHeader.ContentLength:
-				return "Content-Length";
-			case HttpResponseHeader.ContentType:
-				return "Content-Type";
-			case HttpResponseHeader.ContentEncoding:
-				return "Content-Encoding";
-			case HttpResponseHeader.ContentLanguage:
-				return "Content-Language";
-			case HttpResponseHeader.ContentLocation:
-				return "Content-Location";
-			case HttpResponseHeader.ContentMd5:
-				return "Content-MD5";
-			case HttpResponseHeader.ContentRange:
-				return "Content-Range";
-			case HttpResponseHeader.Expires:
-				return "Expires";
-			case HttpResponseHeader.LastModified:
-				return "Last-Modified";
-			case HttpResponseHeader.AcceptRanges:
-				return "Accept-Ranges";
-			case HttpResponseHeader.Age:
-				return "Age";
-			case HttpResponseHeader.ETag:
-				return "ETag";
-			case HttpResponseHeader.Location:
-				return "Location";
-			case HttpResponseHeader.ProxyAuthenticate:
-				return "Proxy-Authenticate";
-			case HttpResponseHeader.RetryAfter:
-				return "Retry-After";
-			case HttpResponseHeader.Server:
-				return "Server";
-			case HttpResponseHeader.SetCookie:
-				return "Set-Cookie";
-			case HttpResponseHeader.Vary:
-				return "Vary";
-			case HttpResponseHeader.WwwAuthenticate:
-				return "WWW-Authenticate";
-			default:
-				throw new InvalidOperationException ();
-			}
-		}
-
-		void CheckRestrictedHeader (string headerName)
-		{
-			if (!headerRestriction.HasValue)
-				return;
-
-			HeaderInfo info;
-			if (!headers.TryGetValue (headerName, out info))
-				return;
-
-			if ((info & headerRestriction.Value) != 0)
-				throw new ArgumentException ("This header must be modified with the appropriate property.");
-		}
-
-		void CheckHeaderConsistency (HeaderInfo value)
-		{
-			if (!headerConsistency.HasValue) {
-				headerConsistency = value;
-				return;
-			}
-
-			if ((headerConsistency & value) == 0)
-				throw new InvalidOperationException ();
-		}
-		
-		internal static bool IsMultiValue (string headerName)
-		{
-			if (headerName == null)
-				return false;
-
-			HeaderInfo info;
-			return headers.TryGetValue (headerName, out info) && (info & HeaderInfo.MultiValue) != 0;
-		}		
-		
-		internal static bool IsHeaderValue (string value)
-		{
-			// TEXT any 8 bit value except CTL's (0-31 and 127)
-			//      but including \r\n space and \t
-			//      after a newline at least one space or \t must follow
-			//      certain header fields allow comments ()
-				
-			int len = value.Length;
-			for (int i = 0; i < len; i++) {			
-				char c = value [i];
-				if (c == 127)
-					return false;
-				if (c < 0x20 && (c != '\r' && c != '\n' && c != '\t'))
-					return false;
-				if (c == '\n' && ++i < len) {
-					c = value [i];
-					if (c != ' ' && c != '\t')
-						return false;
-				}
-			}
-			
-			return true;
-		}
-		
-		internal static bool IsHeaderName (string name)
-		{
-			if (name == null || name.Length == 0)
-				return false;
-
-			int len = name.Length;
-			for (int i = 0; i < len; i++) {			
-				char c = name [i];
-				if (c > 126 || !allowed_chars [c])
-					return false;
-			}
-			
-			return true;
-		}
-	}
-}
diff --git a/mcs/class/System/System.Net/WebProxy.cs b/mcs/class/System/System.Net/WebProxy.cs
deleted file mode 100644
index 365535a056b..00000000000
--- a/mcs/class/System/System.Net/WebProxy.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-//
-// System.Net.WebProxy.cs
-//
-// Authors:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Globalization;
-using System.Runtime.Serialization;
-using System.Text.RegularExpressions;
-
-namespace System.Net 
-{
-	[Serializable]
-	public class WebProxy : IWebProxy, ISerializable
-	{
-		Uri address;
-		bool bypassOnLocal;
-		ArrayList bypassList;
-		ICredentials credentials;
-		bool useDefaultCredentials;
-
-		// Constructors
-
-		public WebProxy ()
-			: this ((Uri) null, false, null, null) {}
-
-		public WebProxy (string address)
-			: this (ToUri (address), false, null, null) {}
-
-		public WebProxy (Uri address) 
-			: this (address, false, null, null) {}
-
-		public WebProxy (string address, bool bypassOnLocal) 
-			: this (ToUri (address), bypassOnLocal, null, null) {}
-
-		public WebProxy (string host, int port)
-			: this (new Uri ("http://" + host + ":" + port)) {}
-
-		public WebProxy (Uri address, bool bypassOnLocal)
-			: this (address, bypassOnLocal, null, null) {}
-
-		public WebProxy (string address, bool bypassOnLocal, string [] bypassList)
-			: this (ToUri (address), bypassOnLocal, bypassList, null) {}
-
-		public WebProxy (Uri address, bool bypassOnLocal, string [] bypassList)
-			: this (address, bypassOnLocal, bypassList, null) {}
-
-		public WebProxy (string address, bool bypassOnLocal, string [] bypassList,
-				ICredentials credentials)
-			: this (ToUri (address), bypassOnLocal, bypassList, credentials) {}
-
-		public WebProxy (Uri address, bool bypassOnLocal, 
-				 string[] bypassList, ICredentials credentials)
-		{
-			this.address = address;
-			this.bypassOnLocal = bypassOnLocal;
-			if (bypassList != null)
-				this.bypassList = new ArrayList (bypassList);
-			this.credentials = credentials;
-			CheckBypassList ();
-		}
-
-		protected WebProxy (SerializationInfo serializationInfo, StreamingContext streamingContext) 
-		{
-			this.address = (Uri) serializationInfo.GetValue ("_ProxyAddress", typeof (Uri));
-			this.bypassOnLocal = serializationInfo.GetBoolean ("_BypassOnLocal");
-			this.bypassList = (ArrayList) serializationInfo.GetValue ("_BypassList", typeof (ArrayList));
-			this.useDefaultCredentials =  serializationInfo.GetBoolean ("_UseDefaultCredentials");
-			this.credentials = null;
-			CheckBypassList ();
-		}
-
-		// Properties
-		public Uri Address {
-			get { return address; }
-			set { address = value; }
-		}
-
-		public ArrayList BypassArrayList {
-			get {
-				if (bypassList == null)
-					bypassList = new ArrayList ();
-				return bypassList;
-			}
-		}
-
-		public string [] BypassList {
-			get { return (string []) BypassArrayList.ToArray (typeof (string)); }
-			set { 
-				if (value == null)
-					throw new ArgumentNullException ();
-				bypassList = new ArrayList (value); 
-				CheckBypassList ();
-			}
-		}
-
-		public bool BypassProxyOnLocal {
-			get { return bypassOnLocal; }
-			set { bypassOnLocal = value; }
-		}
-
-		public ICredentials Credentials {
-			get { return credentials; }
-			set { credentials = value; }
-		}
-
-		[MonoTODO ("Does not affect Credentials, since CredentialCache.DefaultCredentials is not implemented.")]
-		public bool UseDefaultCredentials {
-			get { return useDefaultCredentials; }
-			set { useDefaultCredentials = value; }
-		}
-
-		// Methods
-		[Obsolete ("This method has been deprecated", false)]
-		[MonoTODO("Can we get this info under windows from the system?")]
-		public static WebProxy GetDefaultProxy ()
-		{
-			// Select gets a WebProxy from config files, if available.
-			IWebProxy p = GlobalProxySelection.Select;
-			if (p is WebProxy)
-				return (WebProxy) p;
-
-			return new WebProxy ();
-		}
-
-		public Uri GetProxy (Uri destination)
-		{
-			if (IsBypassed (destination))
-				return destination;
-
-			return address;
-		}
-
-		public bool IsBypassed (Uri host)
-		{
-			if (host == null)
-				throw new ArgumentNullException ("host");
-
-			if (host.IsLoopback && bypassOnLocal)
-				return true;
-
-			if (address == null)
-				return true;
-
-			string server = host.Host;
-			if (bypassOnLocal && server.IndexOf ('.') == -1)
-				return true;
-
-			// LAMESPEC
-			if (!bypassOnLocal) {
-				if (String.Compare (server, "localhost", true, CultureInfo.InvariantCulture) == 0)
-					return true;
-				if (String.Compare (server, "loopback", true, CultureInfo.InvariantCulture) == 0)
-					return true;
-
-				IPAddress addr = null;
-				if (IPAddress.TryParse (server, out addr) && IPAddress.IsLoopback (addr))
-					return true;
-			}
-
-			if (bypassList == null || bypassList.Count == 0)
-				return false;
-
-			try {
-				string hostStr = host.Scheme + "://" + host.Authority;
-				int i = 0;
-				for (; i < bypassList.Count; i++) {
-					Regex regex = new Regex ((string) bypassList [i], 
-						// TODO: RegexOptions.Compiled |  // not implemented yet by Regex
-						RegexOptions.IgnoreCase |
-						RegexOptions.Singleline);
-
-					if (regex.IsMatch (hostStr))
-						break;
-				}
-
-				if (i == bypassList.Count)
-					return false;
-
-				// continue checking correctness of regular expressions..
-				// will throw expression when an invalid one is found
-				for (; i < bypassList.Count; i++)
-					new Regex ((string) bypassList [i]);
-
-				return true;
-			} catch (ArgumentException) {
-				return false;
-			}
-		}
-
-		protected virtual void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			serializationInfo.AddValue ("_BypassOnLocal", bypassOnLocal);
-			serializationInfo.AddValue ("_ProxyAddress", address);
-			serializationInfo.AddValue ("_BypassList", bypassList);
-			serializationInfo.AddValue ("_UseDefaultCredentials", UseDefaultCredentials);
-		}
-
-		void ISerializable.GetObjectData (SerializationInfo serializationInfo,
-		                                  StreamingContext streamingContext)
-		{
-			GetObjectData (serializationInfo, streamingContext);
-		}
-
-		// Private Methods
-		// this compiles the regular expressions, and will throw
-		// an exception when an invalid one is found.
-		void CheckBypassList ()
-		{
-			if (bypassList == null)
-				return;
-			for (int i = 0; i < bypassList.Count; i++)
-				new Regex ((string) bypassList [i]);
-		}
-
-		static Uri ToUri (string address)
-		{
-			if (address == null)
-				return null;
-				
-			if (address.IndexOf ("://", StringComparison.Ordinal) == -1) 
-				address = "http://" + address;
-
-			return new Uri (address);
-		}
-	}
-}
diff --git a/mcs/class/System/System.Net/WebRequest.cs b/mcs/class/System/System.Net/WebRequest.cs
deleted file mode 100644
index 889398ee6a4..00000000000
--- a/mcs/class/System/System.Net/WebRequest.cs
+++ /dev/null
@@ -1,548 +0,0 @@
-//
-// System.Net.WebRequest
-//
-// Authors:
-//  Lawrence Pit (loz@cable.a2000.nl)
-//	Marek Safar (marek.safar@gmail.com)
-//
-// Copyright 2011 Xamarin Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Configuration;
-using System.IO;
-using System.Reflection;
-using System.Runtime.Serialization;
-using System.Globalization;
-using System.Net.Configuration;
-using System.Net.Security;
-using System.Net.Cache;
-using System.Security.Principal;
-using System.Threading.Tasks;
-using System.Text.RegularExpressions;
-using Mono.Net;
-
-#if NET_2_1
-using ConfigurationException = System.ArgumentException;
-
-namespace System.Net.Configuration {
-	class Dummy {}
-}
-#endif
-
-namespace System.Net 
-{
-	[Serializable]
-	public abstract class WebRequest : MarshalByRefObject, ISerializable {
-		static HybridDictionary prefixes = new HybridDictionary ();
-		static bool isDefaultWebProxySet;
-		static IWebProxy defaultWebProxy;
-		static RequestCachePolicy defaultCachePolicy;
-
-		static WebRequest ()
-		{
-#if MOBILE
-			IWebRequestCreate http = new HttpRequestCreator ();
-			RegisterPrefix ("http", http);
-			RegisterPrefix ("https", http);
-			RegisterPrefix ("file", new FileWebRequestCreator ());
-			RegisterPrefix ("ftp", new FtpRequestCreator ());
-#else
-	#if CONFIGURATION_DEP
-			object cfg = ConfigurationManager.GetSection ("system.net/webRequestModules");
-			WebRequestModulesSection s = cfg as WebRequestModulesSection;
-			if (s != null) {
-				foreach (WebRequestModuleElement el in
-					 s.WebRequestModules)
-					AddPrefix (el.Prefix, el.Type);
-				return;
-			}
-	#endif
-			ConfigurationSettings.GetConfig ("system.net/webRequestModules");
-#endif
-		}
-		
-		protected WebRequest () 
-		{
-		}
-		
-		protected WebRequest (SerializationInfo serializationInfo, StreamingContext streamingContext) 
-		{
-		}
-
-		static Exception GetMustImplement ()
-		{
-			return new NotImplementedException ("This method must be implemented in derived classes");
-		}
-		
-		// Properties
-
-		private AuthenticationLevel authentication_level = AuthenticationLevel.MutualAuthRequested;
-		
-		public AuthenticationLevel AuthenticationLevel
-		{
-			get {
-				return(authentication_level);
-			}
-			set {
-				authentication_level = value;
-			}
-		}
-		
-		public virtual string ConnectionGroupName {
-			get { throw GetMustImplement (); }
-			set { throw GetMustImplement (); }
-		}
-		
-		public virtual long ContentLength { 
-			get { throw GetMustImplement (); }
-			set { throw GetMustImplement (); }
-		}
-		
-		public virtual string ContentType { 
-			get { throw GetMustImplement (); }
-			set { throw GetMustImplement (); }
-		}
-		
-		public virtual ICredentials Credentials { 
-			get { throw GetMustImplement (); }
-			set { throw GetMustImplement (); }
-		}
-
-		[MonoTODO ("Implement the caching system. Currently always returns a policy with the NoCacheNoStore level")]
-		public virtual RequestCachePolicy CachePolicy
-		{
-			get { return DefaultCachePolicy; }
-			set {
-			}
-		}
-		
-		public static RequestCachePolicy DefaultCachePolicy {
-			get {
-				return defaultCachePolicy ?? (defaultCachePolicy = new HttpRequestCachePolicy (HttpRequestCacheLevel.NoCacheNoStore));
-			}
-			set {
-				throw GetMustImplement ();
-			}
-		}
-		
-		public virtual WebHeaderCollection Headers { 
-			get { throw GetMustImplement (); }
-			set { throw GetMustImplement (); }
-		}
-		
-
-		public virtual string Method { 
-			get { throw GetMustImplement (); }
-			set { throw GetMustImplement (); }
-		}
-		
-		public virtual bool PreAuthenticate { 
-			get { throw GetMustImplement (); }
-			set { throw GetMustImplement (); }
-		}
-		
-		public virtual IWebProxy Proxy { 
-			get { throw GetMustImplement (); }
-			set { throw GetMustImplement (); }
-		}
-		
-		public virtual Uri RequestUri { 
-			get { throw GetMustImplement (); }
-		}
-		
-		public virtual int Timeout { 
-			get { throw GetMustImplement (); }
-			set { throw GetMustImplement (); }
-		}
-		
-		public virtual bool UseDefaultCredentials
-		{
-			get {
-				throw GetMustImplement ();
-			}
-			set {
-				throw GetMustImplement ();
-			}
-		}
-
-		public TokenImpersonationLevel ImpersonationLevel { get; set; }
-
-//		volatile static IWebProxy proxy;
-		static readonly object lockobj = new object ();
-		
-		public static IWebProxy DefaultWebProxy {
-			get {
-				if (!isDefaultWebProxySet) {
-					lock (lockobj) {
-						if (defaultWebProxy == null)
-							defaultWebProxy = GetDefaultWebProxy ();
-					}
-				}
-				return defaultWebProxy;
-			}
-			set {
-				/* MS documentation states that a null value would cause an ArgumentNullException
-				 * but that's not the way it behaves:
-				 * https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=304724
-				 */
-				defaultWebProxy = value;
-				isDefaultWebProxySet = true;
-			}
-		}
-
-		internal static IWebProxy InternalDefaultWebProxy {
-			get {
-				return DefaultWebProxy;
-			}
-		}
-
-		
-		[MonoTODO("Needs to respect Module, Proxy.AutoDetect, and Proxy.ScriptLocation config settings")]
-		static IWebProxy GetDefaultWebProxy ()
-		{
-#if CONFIGURATION_DEP
-			DefaultProxySection sec = ConfigurationManager.GetSection ("system.net/defaultProxy") as DefaultProxySection;
-			WebProxy p;
-			
-			if (sec == null)
-				return GetSystemWebProxy ();
-			
-			ProxyElement pe = sec.Proxy;
-			
-			if ((pe.UseSystemDefault != ProxyElement.UseSystemDefaultValues.False) && (pe.ProxyAddress == null)) {
-				IWebProxy proxy = GetSystemWebProxy ();
-				
-				if (!(proxy is WebProxy))
-					return proxy;
-				
-				p = (WebProxy) proxy;
-			} else
-				p = new WebProxy ();
-			
-			if (pe.ProxyAddress != null)
-				p.Address = pe.ProxyAddress;
-			
-			if (pe.BypassOnLocal != ProxyElement.BypassOnLocalValues.Unspecified)
-				p.BypassProxyOnLocal = (pe.BypassOnLocal == ProxyElement.BypassOnLocalValues.True);
-				
-			foreach(BypassElement elem in sec.BypassList)
-				p.BypassArrayList.Add(elem.Address);
-			
-			return p;
-#else
-			return GetSystemWebProxy ();
-#endif
-		}
-
-		// Methods
-		
-		public virtual void Abort()
-		{
-			throw GetMustImplement ();
-		}
-		
-		public virtual IAsyncResult BeginGetRequestStream (AsyncCallback callback, object state) 
-		{
-			throw GetMustImplement ();
-		}
-		
-		public virtual IAsyncResult BeginGetResponse (AsyncCallback callback, object state)
-		{
-			throw GetMustImplement ();
-		}
-
-		public static WebRequest Create (string requestUriString) 
-		{
-			if (requestUriString == null)
-				throw new ArgumentNullException ("requestUriString");
-			return Create (new Uri (requestUriString));
-		}
-				
-		public static WebRequest Create (Uri requestUri) 
-		{
-			if (requestUri == null)
-				throw new ArgumentNullException ("requestUri");
-			return GetCreator (requestUri.AbsoluteUri).Create (requestUri);
-		}
-		
-		public static WebRequest CreateDefault (Uri requestUri)
-		{
-			if (requestUri == null)
-				throw new ArgumentNullException ("requestUri");
-			return GetCreator (requestUri.Scheme).Create (requestUri);
-		}
-		static HttpWebRequest SharedCreateHttp (Uri uri)
-		{
-			if (uri.Scheme != "http" && uri.Scheme != "https")
-				throw new NotSupportedException	("The uri should start with http or https");
-
-			return new HttpWebRequest (uri);
-		}
-
-		public static HttpWebRequest CreateHttp (string requestUriString)
-		{
-			if (requestUriString == null)
-				throw new ArgumentNullException ("requestUriString");
-			return SharedCreateHttp (new Uri (requestUriString));
-		}
-			
-		public static HttpWebRequest CreateHttp (Uri requestUri)
-		{
-			if (requestUri == null)
-				throw new ArgumentNullException ("requestUri");
-			return SharedCreateHttp (requestUri);
-		}
-		public virtual Stream EndGetRequestStream (IAsyncResult asyncResult)
-		{
-			throw GetMustImplement ();
-		}
-		
-		public virtual WebResponse EndGetResponse (IAsyncResult asyncResult)
-		{
-			throw GetMustImplement ();
-		}
-		
-		public virtual Stream GetRequestStream()
-		{
-			throw GetMustImplement ();
-		}
-		
-		public virtual WebResponse GetResponse()
-		{
-			throw GetMustImplement ();
-		}
-		
-		// Takes an ArrayList of fileglob-formatted strings and returns an array of Regex-formatted strings
-		private static string[] CreateBypassList (ArrayList al)
-		{
-			string[] result = al.ToArray (typeof (string)) as string[];
-			for (int c = 0; c < result.Length; c++)
-			{
-				result [c] = "^" +
-					Regex.Escape (result [c]).Replace (@"\*", ".*").Replace (@"\?", ".") +
-					"$";
-			}
-			return result;
-		}
-
-		[MonoTODO("Look in other places for proxy config info")]
-		public static IWebProxy GetSystemWebProxy ()
-		{
-#if MONOTOUCH
-			return CFNetwork.GetDefaultProxy ();
-#else
-#if MONODROID
-			// Return the system web proxy.  This only works for ICS+.
-			var androidProxy = AndroidPlatform.GetDefaultProxy ();
-			if (androidProxy != null)
-				return androidProxy;
-#endif
-#if !NET_2_1
-			if (IsWindows ()) {
-				int iProxyEnable = (int)Microsoft.Win32.Registry.GetValue ("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", "ProxyEnable", 0);
-
-				if (iProxyEnable > 0) {
-					string strHttpProxy = "";					
-					bool bBypassOnLocal = false;
-					ArrayList al = new ArrayList ();
-					
-					string strProxyServer = (string)Microsoft.Win32.Registry.GetValue ("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", "ProxyServer", null);
-					string strProxyOverrride = (string)Microsoft.Win32.Registry.GetValue ("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", "ProxyOverride", null);
-					
-					if (strProxyServer.Contains ("=")) {
-						foreach (string strEntry in strProxyServer.Split (new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
-							if (strEntry.StartsWith ("http=")) {
-								strHttpProxy = strEntry.Substring (5);
-								break;
-							}
-					} else strHttpProxy = strProxyServer;
-					
-					if (strProxyOverrride != null) {						
-						string[] bypassList = strProxyOverrride.Split (new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
-					
-						foreach (string str in bypassList) {
-							if (str != "<local>")
-								al.Add (str);
-							else
-								bBypassOnLocal = true;
-						}
-					}
-					
-					return new WebProxy (strHttpProxy, bBypassOnLocal, CreateBypassList (al));
-				}
-			} else {
-#endif
-				if (Platform.IsMacOS)
-					return CFNetwork.GetDefaultProxy ();
-				
-				string address = Environment.GetEnvironmentVariable ("http_proxy");
-
-				if (address == null)
-					address = Environment.GetEnvironmentVariable ("HTTP_PROXY");
-				
-				if (address != null) {
-					try {
-						if (!address.StartsWith ("http://"))
-							address = "http://" + address;
-
-						Uri uri = new Uri (address);
-						IPAddress ip;
-						
-						if (IPAddress.TryParse (uri.Host, out ip)) {
-							if (IPAddress.Any.Equals (ip)) {
-								UriBuilder builder = new UriBuilder (uri);
-								builder.Host = "127.0.0.1";
-								uri = builder.Uri;
-							} else if (IPAddress.IPv6Any.Equals (ip)) {
-								UriBuilder builder = new UriBuilder (uri);
-								builder.Host = "[::1]";
-								uri = builder.Uri;
-							}
-						}
-						
-						bool bBypassOnLocal = false;						
-						ArrayList al = new ArrayList ();
-						string bypass = Environment.GetEnvironmentVariable ("no_proxy");
-						
-						if (bypass == null)
-							bypass = Environment.GetEnvironmentVariable ("NO_PROXY");
-						
-						if (bypass != null) {
-							string[] bypassList = bypass.Split (new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-						
-							foreach (string str in bypassList) {
-								if (str != "*.local")
-									al.Add (str);
-								else
-									bBypassOnLocal = true;
-							}
-						}
-						
-						return new WebProxy (uri, bBypassOnLocal, CreateBypassList (al));
-					} catch (UriFormatException) {
-					}
-				}
-#if !NET_2_1
-			}
-#endif
-			
-			return new WebProxy ();
-#endif // MONOTOUCH
-		}
-
-		void ISerializable.GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			throw new NotSupportedException ();
-		}
-
-		protected virtual void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			throw GetMustImplement ();
-		}
-
-		public static bool RegisterPrefix (string prefix, IWebRequestCreate creator)
-		{
-			if (prefix == null)
-				throw new ArgumentNullException ("prefix");
-			if (creator == null)
-				throw new ArgumentNullException ("creator");
-			
-			lock (prefixes.SyncRoot) {
-				string lowerCasePrefix = prefix.ToLower (CultureInfo.InvariantCulture);
-				if (prefixes.Contains (lowerCasePrefix))
-					return false;
-				prefixes.Add (lowerCasePrefix, creator);
-			}
-			return true;
-		}
-		
-		private static IWebRequestCreate GetCreator (string prefix)
-		{
-			int longestPrefix = -1;
-			IWebRequestCreate creator = null;
-
-			prefix = prefix.ToLower (CultureInfo.InvariantCulture);
-
-			IDictionaryEnumerator e = prefixes.GetEnumerator ();
-			while (e.MoveNext ()) {
-				string key = e.Key as string;
-
-				if (key.Length <= longestPrefix) 
-					continue;
-				
-				if (!prefix.StartsWith (key))
-					continue;
-					
-				longestPrefix = key.Length;
-				creator = (IWebRequestCreate) e.Value;
-			}
-			
-			if (creator == null) 
-				throw new NotSupportedException (prefix);
-				
-			return creator;
-		}
-		
-		internal static bool IsWindows ()
-		{
-			return (int) Environment.OSVersion.Platform < 4;
-		}
-
-		internal static void ClearPrefixes ()
-		{
-			prefixes.Clear ();
-		}
-
-		internal static void RemovePrefix (string prefix)
-		{
-			prefixes.Remove (prefix);
-		}
-
-		internal static void AddPrefix (string prefix, string typeName)
-		{
-			Type type = Type.GetType (typeName);
-			if (type == null)
-				throw new ConfigurationException (String.Format ("Type {0} not found", typeName));
-			AddPrefix (prefix, type);
-		}
-
-		internal static void AddPrefix (string prefix, Type type)
-		{
-			object o = Activator.CreateInstance (type, true);
-			prefixes [prefix] = o;
-		}
-
-		public virtual Task<Stream> GetRequestStreamAsync ()
-		{
-			return Task<Stream>.Factory.FromAsync (BeginGetRequestStream, EndGetRequestStream, null);
-		}
-
-		public virtual Task<WebResponse> GetResponseAsync ()
-		{
-			return Task<WebResponse>.Factory.FromAsync (BeginGetResponse, EndGetResponse, null);
-		}
-
-	}
-}
diff --git a/mcs/class/System/System.Net/WebRequestMethods.cs b/mcs/class/System/System.Net/WebRequestMethods.cs
deleted file mode 100644
index 1e7a7ac7866..00000000000
--- a/mcs/class/System/System.Net/WebRequestMethods.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// System.Net.WebRequestMethods.cs
-//
-// Author:
-// 	Carlos Alberto Cortez (calberto.oortez@gmail.com)
-//
-// (c) Copyright 2005 Novell, Inc. (http://www.ximian.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Net 
-{
-	public static class WebRequestMethods
-	{
-		public static class File
-		{
-			public const string DownloadFile = "GET";
-			public const string UploadFile = "PUT";
-		}
-
-		public static class Ftp
-		{
-			public const string AppendFile = "APPE";
-			public const string DeleteFile = "DELE";
-			public const string DownloadFile = "RETR";
-			public const string GetFileSize = "SIZE";
-			public const string GetDateTimestamp = "MDTM";
-			public const string ListDirectory = "NLST";
-			public const string ListDirectoryDetails = "LIST";
-			public const string MakeDirectory = "MKD";
-			public const string PrintWorkingDirectory = "PWD";
-			public const string RemoveDirectory = "RMD";
-			public const string Rename = "RENAME";
-			public const string UploadFile = "STOR";
-			public const string UploadFileWithUniqueName = "STOU";
-		}
-
-		public static class Http
-		{
-			public const string Connect = "CONNECT";
-			public const string Get = "GET";
-			public const string Head = "HEAD";
-			public const string MkCol = "MKCOL";
-			public const string Post = "POST";
-			public const string Put = "PUT";
-		}
-	}
-}
-
-
diff --git a/mcs/class/System/System.Net/WebResponse.cs b/mcs/class/System/System.Net/WebResponse.cs
deleted file mode 100644
index f59b24fc1c3..00000000000
--- a/mcs/class/System/System.Net/WebResponse.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// System.Net.WebResponse
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Runtime.Serialization;
-
-namespace System.Net 
-{
-	[Serializable]
-	public abstract class WebResponse : MarshalByRefObject, ISerializable, IDisposable {
-		// Constructors
-		
-		protected WebResponse () { }
-		
-		protected WebResponse (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			throw new NotSupportedException ();
-		}
-		
-		// Properties
-		
-		public virtual long ContentLength {		
-			get { throw new NotSupportedException (); }
-			set { throw new NotSupportedException (); }
-		}
-		
-		public virtual string ContentType {		
-			get { throw new NotSupportedException (); }
-			set { throw new NotSupportedException (); }
-		}
-		
-		public virtual WebHeaderCollection Headers {		
-			get { throw new NotSupportedException (); }
-		}
-
-		static Exception GetMustImplement ()
-		{
-			return new NotImplementedException ();
-		}
-		
-		[MonoTODO]
-		public virtual bool IsFromCache
-		{
-			get {
-				return false;
-				// Better to return false than to kill the application
-				// throw GetMustImplement ();
-			}
-		}
-		
-		[MonoTODO]
-		public virtual bool IsMutuallyAuthenticated
-		{
-			get {
-				throw GetMustImplement ();
-			}
-		}
-		
-		public virtual Uri ResponseUri {		
-			get { throw new NotSupportedException (); }
-		}		
-
-		public virtual bool SupportsHeaders {
-			get {
-				// The managed stack always returns this as true, it is only
-				// the Silverlight stack that does not support this.
-				return true;
-			}
-		}
-		// Methods
-		
-		public virtual void Close()
-		{
-			throw new NotSupportedException ();
-		}
-		
-		public virtual Stream GetResponseStream()
-		{
-			throw new NotSupportedException ();
-		}
-		public void Dispose ()
-		{
-			Dispose (true);
-		}
-		
-		protected virtual void Dispose (bool disposing)
-		{
-			if (disposing)
-				Close ();
-		}
-
-		void ISerializable.GetObjectData
-			(SerializationInfo serializationInfo,
-		   				  StreamingContext streamingContext)
-		{
-			throw new NotSupportedException ();
-		}
-
-		[MonoTODO]
-		protected virtual void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			throw GetMustImplement ();
-		}
-	}
-}
diff --git a/mcs/class/System/System.Security.AccessControl/SemaphoreSecurity.cs b/mcs/class/System/System.Security.AccessControl/SemaphoreSecurity.cs
index f0bdac661cb..ac6db80037d 100644
--- a/mcs/class/System/System.Security.AccessControl/SemaphoreSecurity.cs
+++ b/mcs/class/System/System.Security.AccessControl/SemaphoreSecurity.cs
@@ -133,7 +133,7 @@ namespace System.Security.AccessControl
 			SetAuditRule((AuditRule)rule);
 		}
 		
-		internal new void PersistModifications (SafeHandle handle)
+		internal new void Persist (SafeHandle handle)
 		{
 			WriteLock();
 			try {
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs
index 695f5e82220..98f5dfc4ab5 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs
@@ -147,7 +147,8 @@ namespace System.Security.Cryptography.X509Certificates {
 
 				certArray = FromIntPtrs (secCerts);
 
-				host = CFStringCreateWithCharacters (IntPtr.Zero, hostName, (IntPtr) hostName.Length);
+				if (!string.IsNullOrEmpty (hostName))
+					host = CFStringCreateWithCharacters (IntPtr.Zero, hostName, (IntPtr) hostName.Length);
 				sslsecpolicy = SecPolicyCreateSSL (true, host);
 
 				int code = SecTrustCreateWithCertificates (certArray, sslsecpolicy, out sectrust);
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
index 86d4aee925e..1dc234575b8 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
@@ -35,7 +35,8 @@ namespace System.Security.Cryptography.X509Certificates {
 
 		private OidCollection apps;
 		private OidCollection cert;
-		private X509Certificate2Collection store;
+		private X509CertificateCollection store;
+		private X509Certificate2Collection store2;
 		private X509RevocationFlag rflag;
 		private X509RevocationMode mode;
 		private TimeSpan timeout;
@@ -49,6 +50,24 @@ namespace System.Security.Cryptography.X509Certificates {
 			Reset ();
 		}
 
+		/*
+		 * Lazy-init ExtraStore from X509CertificateCollection.
+		 * This is called from Mono.Net.Security.SystemCertificateValidator.CreateX509Chain.
+		 *
+		 * AppleTLS supports a lazily-initialized X509Certificate, but not X509Certificate2 so
+		 * we need to fall-back to using Mono.Security.X509 whenever we need an X509Certificate2.
+		 * To avoid unnecessary fallbacks, the private Mono.Net.Security APIs use X509Certificate
+		 * instead of X509Certificate2.
+		 *
+		 * Since 'ExtraStore' returns X509Certificate2Collection, we need to convert these to
+		 * X509Certificate2.
+		 */
+		internal X509ChainPolicy (X509CertificateCollection store)
+		{
+			this.store = store;
+			Reset ();
+		}
+
 		// properties
 
 		public OidCollection ApplicationPolicy {
@@ -60,7 +79,18 @@ namespace System.Security.Cryptography.X509Certificates {
 		}
 
 		public X509Certificate2Collection ExtraStore {
-			get { return store; }
+			get {
+				if (store2 != null)
+					return store2;
+
+				store2 = new X509Certificate2Collection ();
+				if (store != null) {
+					foreach (var cert in store) {
+						store2.Add (new X509Certificate2 (cert));
+					}
+				}
+				return store2;
+			}
 		}
 
 		public X509RevocationFlag RevocationFlag {
@@ -106,7 +136,7 @@ namespace System.Security.Cryptography.X509Certificates {
 		{
 			apps = new OidCollection ();
 			cert = new OidCollection ();
-			store = new X509Certificate2Collection ();
+			store2 = null;
 			rflag = X509RevocationFlag.ExcludeRoot;
 			mode = X509RevocationMode.Online;
 			timeout = TimeSpan.Zero;
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs
index 92007a397d4..681b8ff8be8 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs
@@ -70,7 +70,10 @@ namespace System.Security.Cryptography.X509Certificates {
 
 			_oid = new Oid (oid, friendlyName);
 			base.Critical = critical;
-			_enhKeyUsage = enhancedKeyUsages.ReadOnlyCopy ();
+			_enhKeyUsage = new OidCollection();
+			foreach (Oid o in enhancedKeyUsages) {
+				_enhKeyUsage.Add(o);
+			}
 			RawData = Encode ();
 		}
 
@@ -81,10 +84,14 @@ namespace System.Security.Cryptography.X509Certificates {
 				switch (_status) {
 				case AsnDecodeStatus.Ok:
 				case AsnDecodeStatus.InformationNotAvailable:
-					if (_enhKeyUsage == null)
-						_enhKeyUsage = new OidCollection ();
-					_enhKeyUsage.ReadOnly = true;
-					return _enhKeyUsage;
+
+					OidCollection oids = new OidCollection();
+					if (_enhKeyUsage != null) {
+						foreach(Oid o in _enhKeyUsage) {
+							oids.Add(o);
+						}
+					}
+					return oids;
 				default:
 					throw new CryptographicException ("Badly encoded extension.");
 				}
@@ -143,8 +150,8 @@ namespace System.Security.Cryptography.X509Certificates {
 		internal byte[] Encode ()
 		{
 			ASN1 ex = new ASN1 (0x30);
-			foreach (Oid oid in _enhKeyUsage) {
-				ex.Add (ASN1Convert.FromOid (oid.Value));
+			foreach (Oid o in _enhKeyUsage) {
+				ex.Add (ASN1Convert.FromOid (o.Value));
 			}
 			return ex.GetBytes ();
 		}
diff --git a/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs b/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs
index 99860521102..f6b45dd5e7c 100644
--- a/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs
+++ b/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs
@@ -157,9 +157,9 @@ namespace System.Security.Cryptography {
 				return SubjectKeyIdentifierExtension (multiLine);
 			// other known objects (i.e. supported structure) - 
 			// but without any corresponding framework class
-			case Oid.oidSubjectAltName:
+			case "2.5.29.17": // oidSubjectAltName:
 				return SubjectAltName (multiLine);
-			case Oid.oidNetscapeCertType:
+			case "2.16.840.1.113730.1.1": // oidNetscapeCertType
 				return NetscapeCertType (multiLine);
 			default:
 				return Default (multiLine);
diff --git a/mcs/class/System/System.Security.Cryptography/Oid.cs b/mcs/class/System/System.Security.Cryptography/Oid.cs
deleted file mode 100644
index 7a1e7851bba..00000000000
--- a/mcs/class/System/System.Security.Cryptography/Oid.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-//
-// Oid.cs - System.Security.Cryptography.Oid
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2005 Novell Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if SECURITY_DEP
-
-using System.Security.Cryptography.X509Certificates;
-
-namespace System.Security.Cryptography {
-
-	public sealed class Oid {
-
-		private string _value;
-		private string _name;
-
-		// constructors
-
-		public Oid ()
-		{
-		}
-
-		public Oid (string oid) 
-		{
-			if (oid == null)
-				throw new ArgumentNullException ("oid");
-
-			_value = oid;
-			_name = GetName (oid);
-		}
-
-		public Oid (string value, string friendlyName)
-		{
-			_value = value;
-			_name = friendlyName;
-		}
-
-		public Oid (Oid oid) 
-		{
-			if (oid == null)
-				throw new ArgumentNullException ("oid");
-
-			_value = oid.Value;
-			_name = oid.FriendlyName;
-		}
-
-		// properties
-
-		public string FriendlyName {
-			get { return _name; }
-			set { 
-				_name = value;
-				_value = GetValue (_name);
-			}
-		}
-
-		public string Value { 
-			get { return _value; }
-			set { 
-				_value = value; 
-				_name = GetName (_value);
-			}
-		}
-
-		// internal stuff
-
-		// Known OID/Names not defined anywhere else (by OID order)
-		internal const string oidRSA = "1.2.840.113549.1.1.1";
-		internal const string nameRSA = "RSA";
-		internal const string oidPkcs7Data = "1.2.840.113549.1.7.1";
-		internal const string namePkcs7Data = "PKCS 7 Data";
-		internal const string oidPkcs9ContentType = "1.2.840.113549.1.9.3";
-		internal const string namePkcs9ContentType = "Content Type";
-		internal const string oidPkcs9MessageDigest = "1.2.840.113549.1.9.4";
-		internal const string namePkcs9MessageDigest = "Message Digest";
-		internal const string oidPkcs9SigningTime = "1.2.840.113549.1.9.5";
-		internal const string namePkcs9SigningTime = "Signing Time";
-		internal const string oidMd5 = "1.2.840.113549.2.5";
-		internal const string nameMd5 = "md5";
-		internal const string oid3Des = "1.2.840.113549.3.7";
-		internal const string name3Des = "3des";
-		internal const string oidSha1 = "1.3.14.3.2.26";
-		internal const string nameSha1 = "sha1";
-		internal const string oidSubjectAltName = "2.5.29.17";
-		internal const string nameSubjectAltName = "Subject Alternative Name";
-		internal const string oidAes128 = "2.16.840.1.101.3.4.1.2";
-		internal const string nameAes128 = "aes128";
-		internal const string oidAes256 = "2.16.840.1.101.3.4.1.42";
-		internal const string nameAes256 = "aes256";
-		internal const string oidSha256 = "2.16.840.1.101.3.4.2.1";
-		internal const string nameSha256 = "sha256";
-		internal const string oidSha512 = "2.16.840.1.101.3.4.2.3";
-		internal const string nameSha512 = "sha512";
-		internal const string oidNetscapeCertType = "2.16.840.1.113730.1.1";
-		internal const string nameNetscapeCertType = "Netscape Cert Type";
-
-		// TODO - find the complete list
-		private string GetName (string oid) 
-		{
-			switch (oid) {
-				case oidRSA:
-					return nameRSA;
-				case oidPkcs7Data:
-					return namePkcs7Data;
-				case oidPkcs9ContentType:
-					return namePkcs9ContentType;
-				case oidPkcs9MessageDigest:
-					return namePkcs9MessageDigest;
-				case oidPkcs9SigningTime:
-					return namePkcs9SigningTime;
-				case oid3Des:
-					return name3Des;
-				case X509BasicConstraintsExtension.oid:
-					return X509BasicConstraintsExtension.friendlyName;
-				case X509KeyUsageExtension.oid:
-					return X509KeyUsageExtension.friendlyName;
-				case X509EnhancedKeyUsageExtension.oid:
-					return X509EnhancedKeyUsageExtension.friendlyName;
-				case X509SubjectKeyIdentifierExtension.oid:
-					return X509SubjectKeyIdentifierExtension.friendlyName;
-				case oidSubjectAltName:
-					return nameSubjectAltName;
-				case oidNetscapeCertType:
-					return nameNetscapeCertType;
-				case oidMd5:
-					return nameMd5;
-				case oidAes128:
-					return nameAes128;
-				case oidAes256:
-					return nameAes256;
-				case oidSha1:
-					return nameSha1;
-				case oidSha256:
-					return nameSha256;
-				case oidSha512:
-					return nameSha512;
-				default:
-					return _name;
-			}
-		}
-
-		// TODO - find the complete list
-		private string GetValue (string name) 
-		{
-			switch (name) {
-				case nameRSA:
-					return oidRSA;
-				case namePkcs7Data:
-					return oidPkcs7Data;
-				case namePkcs9ContentType:
-					return oidPkcs9ContentType;
-				case namePkcs9MessageDigest:
-					return oidPkcs9MessageDigest;
-				case namePkcs9SigningTime:
-					return oidPkcs9SigningTime;
-				case name3Des:
-					return oid3Des;
-				case X509BasicConstraintsExtension.friendlyName:
-					return X509BasicConstraintsExtension.oid;
-				case X509KeyUsageExtension.friendlyName:
-					return X509KeyUsageExtension.oid;
-				case X509EnhancedKeyUsageExtension.friendlyName:
-					return X509EnhancedKeyUsageExtension.oid;
-				case X509SubjectKeyIdentifierExtension.friendlyName:
-					return X509SubjectKeyIdentifierExtension.oid;
-				case nameSubjectAltName:
-					return oidSubjectAltName;
-				case nameNetscapeCertType:
-					return oidNetscapeCertType;
-				case nameMd5:
-					return oidMd5;
-				case nameAes128:
-					return oidAes128;
-				case nameAes256:
-					return oidAes256;
-				case nameSha1:
-					return oidSha1;
-				case nameSha256:
-					return oidSha256;
-				case nameSha512:
-					return oidSha512;
-				default:
-					return _value;
-			}
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System/System.Security.Cryptography/OidCollection.cs b/mcs/class/System/System.Security.Cryptography/OidCollection.cs
deleted file mode 100644
index 094582f7afd..00000000000
--- a/mcs/class/System/System.Security.Cryptography/OidCollection.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// OidCollection.cs - System.Security.Cryptography.OidCollection
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2005 Novell Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if SECURITY_DEP
-
-using System.Collections;
-
-namespace System.Security.Cryptography {
-
-	public sealed class OidCollection : ICollection, IEnumerable {
-
-		private ArrayList _list;
-		private bool _readOnly;
-
-		// constructors
-
-		public OidCollection ()
-		{
-			_list = new ArrayList ();
-		}
-
-		// properties
-
-		public int Count {
-			get { return _list.Count; }
-		}
-
-		public bool IsSynchronized {
-			get { return _list.IsSynchronized; }
-		}
-
-		public Oid this [int index] {
-			get { return (Oid) _list [index]; }
-		}
-
-		public Oid this [string oid] {
-			get { 
-				foreach (Oid o in _list) {
-					if (o.Value == oid)
-						return o;
-				}
-				return null; 
-			}
-		}
-
-		public object SyncRoot {
-			get { return _list.SyncRoot; }
-		}
-
-		// methods
-
-		public int Add (Oid oid)
-		{
-			return (_readOnly ? 0 : _list.Add (oid));
-		}
-
-		public void CopyTo (Oid[] array, int index)
-		{
-			_list.CopyTo ((Array)array, index);
-		}
-
-		// to satisfy ICollection - private
-		void ICollection.CopyTo (Array array, int index)
-		{
-			_list.CopyTo (array, index);
-		}
-
-		public OidEnumerator GetEnumerator () 
-		{
-			return new OidEnumerator (this);
-		}
-
-		// to satisfy IEnumerator - private
-		IEnumerator IEnumerable.GetEnumerator () 
-		{
-			return new OidEnumerator (this);
-		}
-
-		// internal stuff
-
-		internal bool ReadOnly {
-			get { return _readOnly; }
-			set { _readOnly = value; }
-		}
-
-		internal OidCollection ReadOnlyCopy ()
-		{
-			OidCollection copy = new OidCollection ();
-			foreach (Oid oid in _list) {
-				copy.Add (oid);
-			}
-			copy._readOnly = true;
-			return copy;
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System/System.Security.Cryptography/OidEnumerator.cs b/mcs/class/System/System.Security.Cryptography/OidEnumerator.cs
deleted file mode 100644
index cfd42141ad2..00000000000
--- a/mcs/class/System/System.Security.Cryptography/OidEnumerator.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// OidEnumerator.cs - System.Security.Cryptography.OidEnumerator
-//
-// Author:
-//	Sebastien Pouliot (spouliot@motus.com)
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2005 Novell Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if SECURITY_DEP
-
-using System.Collections;
-
-namespace System.Security.Cryptography {
-
-	// Note: Match the definition of framework version 1.2.3400.0 on http://longhorn.msdn.microsoft.com
-
-	public sealed class OidEnumerator : IEnumerator {
-
-		private OidCollection _collection;
-		private int _position;
-
-		// note: couldn't reuse the IEnumerator from ArrayList because 
-		// it doesn't throw the same exceptions
-		internal OidEnumerator (OidCollection collection) 
-		{
-			_collection = collection;
-			_position = -1;
-		}
-
-		// properties
-
-		public Oid Current {
-			get {
-				if (_position < 0)
-					throw new ArgumentOutOfRangeException ();
-				return (Oid) _collection [_position];
-			}
-		}
-
-		object IEnumerator.Current {
-			get {
-				if (_position < 0)
-					throw new ArgumentOutOfRangeException ();
-				return _collection [_position];
-			}
-		}
-
-		// methods
-
-		public bool MoveNext () 
-		{
-			if (++_position < _collection.Count)
-				return true;
-			else {
-				// strangely we must always be able to return the last entry 
-				_position = _collection.Count - 1;
-				return false;
-			}
-		}
-
-		public void Reset () 
-		{
-			_position = -1;
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System/System.Security.Cryptography/OidGroup.cs b/mcs/class/System/System.Security.Cryptography/OidGroup.cs
deleted file mode 100644
index 55045d9d4ce..00000000000
--- a/mcs/class/System/System.Security.Cryptography/OidGroup.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// OidGroup.cs:
-//
-// Authors:
-//	Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2015 Xamarin Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Security.Cryptography
-{
-	public enum OidGroup {
-		All                     = 0,
-		HashAlgorithm           = 1,
-		EncryptionAlgorithm     = 2,
-		PublicKeyAlgorithm      = 3,
-		SignatureAlgorithm      = 4,
-		Attribute               = 5,
-		ExtensionOrAttribute    = 6,
-		EnhancedKeyUsage        = 7,
-		Policy                  = 8,
-		Template                = 9,
-		KeyDerivationFunction   = 10
-	}
-}
diff --git a/mcs/class/System/System.Threading/Semaphore.cs b/mcs/class/System/System.Threading/Semaphore.cs
deleted file mode 100644
index 2324fb9b52d..00000000000
--- a/mcs/class/System/System.Threading/Semaphore.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-//
-// System.Threading.Semaphore.cs
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Runtime.ConstrainedExecution;
-using System.Runtime.InteropServices;
-using System.Security.AccessControl;
-using System.Security.Permissions;
-using System.Runtime.CompilerServices;
-using System.IO;
-
-namespace System.Threading {
-
-	[ComVisible (false)]
-	public sealed class Semaphore : WaitHandle {
-
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private static extern IntPtr CreateSemaphore_internal (
-			int initialCount, int maximumCount, string name,
-			out bool createdNew);
-
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private static extern int ReleaseSemaphore_internal (
-			IntPtr handle, int releaseCount, out bool fail);
-
-		[MethodImplAttribute (MethodImplOptions.InternalCall)]
-		private static extern IntPtr OpenSemaphore_internal (string name, SemaphoreRights rights, out MonoIOError error);
-		
-		private Semaphore (IntPtr handle)
-		{
-			Handle = handle;
-		}
-		
-		public Semaphore (int initialCount, int maximumCount)
-			: this (initialCount, maximumCount, null)
-		{
-		}
-
-		public Semaphore (int initialCount, int maximumCount, string name)
-		{
-			if (initialCount < 0)
-				throw new ArgumentOutOfRangeException ("initialCount", "< 0");
-			if (maximumCount < 1)
-				throw new ArgumentOutOfRangeException ("maximumCount", "< 1");
-			if (initialCount > maximumCount)
-				throw new ArgumentException ("initialCount > maximumCount");
-
-			bool created;
-			
-			Handle = CreateSemaphore_internal (initialCount,
-							   maximumCount, name,
-							   out created);
-		}
-
-		public Semaphore (int initialCount, int maximumCount, string name, out bool createdNew)
-			: this (initialCount, maximumCount, name, out createdNew, null)
-		{
-		}
-
-		[MonoTODO ("CreateSemaphore_internal does not support access control, semaphoreSecurity is ignored")]
-		public Semaphore (int initialCount, int maximumCount, string name, out bool createdNew, 
-			SemaphoreSecurity semaphoreSecurity)
-		{
-			if (initialCount < 0)
-				throw new ArgumentOutOfRangeException ("initialCount", "< 0");
-			if (maximumCount < 1)
-				throw new ArgumentOutOfRangeException ("maximumCount", "< 1");
-			if (initialCount > maximumCount)
-				throw new ArgumentException ("initialCount > maximumCount");
-
-			Handle = CreateSemaphore_internal (initialCount,
-							   maximumCount, name,
-							   out createdNew);
-		}
-
-		public SemaphoreSecurity GetAccessControl ()
-		{
-			return new SemaphoreSecurity (SafeWaitHandle,
-						      AccessControlSections.Owner |
-						      AccessControlSections.Group |
-						      AccessControlSections.Access);
-		}
-
-		[PrePrepareMethod]
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		public int Release ()
-		{
-			return (Release (1));
-		}
-
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		public int Release (int releaseCount)
-		{
-			if (releaseCount < 1)
-				throw new ArgumentOutOfRangeException ("releaseCount");
-
-			int ret;
-			bool fail;
-			
-			ret = ReleaseSemaphore_internal (Handle, releaseCount,
-							 out fail);
-
-			if (fail) {
-				throw new SemaphoreFullException ();
-			}
-
-			return (ret);
-		}
-
-		public void SetAccessControl (SemaphoreSecurity semaphoreSecurity)
-		{
-			if (semaphoreSecurity == null)
-				throw new ArgumentNullException ("semaphoreSecurity");
-				
-			semaphoreSecurity.PersistModifications (SafeWaitHandle);
-		}
-
-		// static methods
-
-#if !MOBILE
-		public static Semaphore OpenExisting (string name)
-		{
-			return OpenExisting (name, SemaphoreRights.Synchronize | SemaphoreRights.Modify);
-		}
-
-		public static Semaphore OpenExisting (string name, SemaphoreRights rights)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if ((name.Length ==0) || (name.Length > 260))
-				throw new ArgumentException ("name", Locale.GetText ("Invalid length [1-260]."));
-
-			MonoIOError error;
-			IntPtr handle = OpenSemaphore_internal (name, rights,
-								out error);
-			if (handle == (IntPtr)null) {
-				if (error == MonoIOError.ERROR_FILE_NOT_FOUND) {
-					throw new WaitHandleCannotBeOpenedException (Locale.GetText ("Named Semaphore handle does not exist: ") + name);
-				} else if (error == MonoIOError.ERROR_ACCESS_DENIED) {
-					throw new UnauthorizedAccessException ();
-				} else {
-					throw new IOException (Locale.GetText ("Win32 IO error: ") + error.ToString ());
-				}
-			}
-			
-			return(new Semaphore (handle));
-		}
-
-		[SecurityPermissionAttribute (SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
-		public static bool TryOpenExisting (string name, out Semaphore result)
-		{
-			return TryOpenExisting (name, SemaphoreRights.Synchronize | SemaphoreRights.Modify, out result);
-		}
-
-		[SecurityPermissionAttribute(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
-		public static bool TryOpenExisting (string name, SemaphoreRights rights, out Semaphore result)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if ((name.Length == 0) || (name.Length > 260))
-				throw new ArgumentException ("name", Locale.GetText ("Invalid length [1-260]."));
-			
-			MonoIOError error;
-			IntPtr handle = OpenSemaphore_internal (name, rights, out error);
-
-			if (handle == (IntPtr)null) {
-				result = null;
-				return false;
-			}
-
-			result = new Semaphore (handle);
-			return true;
-		}
-#else
-		public static Semaphore OpenExisting (string name)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public static Semaphore OpenExisting (string name, SemaphoreRights rights)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public static bool TryOpenExisting (string name, out Semaphore result)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public static bool TryOpenExisting (string name, SemaphoreRights rights, out Semaphore result)
-		{
-			throw new NotSupportedException ();
-		}
-#endif
-	}
-}
-
diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources
index 68a9f89f88f..4ff3508c5c2 100644
--- a/mcs/class/System/System.dll.sources
+++ b/mcs/class/System/System.dll.sources
@@ -99,7 +99,6 @@ System.Configuration/SpecialSettingAttribute.cs
 System.Configuration/UriSection.cs
 System.Configuration/UserSettingsGroup.cs
 System.Configuration/UserScopedSettingAttribute.cs
-System/DefaultUriParser.cs
 System.Diagnostics/AlphabeticalEnumConverter.cs
 System.Diagnostics/CounterCreationDataCollection.cs
 System.Diagnostics/CounterCreationData.cs
@@ -162,12 +161,6 @@ System.Diagnostics/TraceImpl.cs
 System.Diagnostics/TraceSourceInfo.cs
 System.Diagnostics/Win32EventLog.cs
 System.Diagnostics.CodeAnalysis/ExcludeFromCodeCoverageAttribute.cs
-System/FileStyleUriParser.cs
-System/FtpStyleUriParser.cs
-System/GenericUriParser.cs
-System/GenericUriParserOptions.cs
-System/GopherStyleUriParser.cs
-System/HttpStyleUriParser.cs
 System/Platform.cs
 System.IO.Compression/CompressionLevel.cs
 System.IO.Compression/CompressionMode.cs
@@ -209,7 +202,6 @@ System.IO/SearchPattern.cs
 System.IO/WaitForChangedResult.cs
 System.IO/WatcherChangeTypes.cs
 System.IO/WindowsWatcher.cs
-System/LdapStyleUriParser.cs
 System.Media/AudioData.cs
 System.Media/AudioDevice.cs
 System.Media/SoundPlayer.cs
@@ -217,9 +209,6 @@ System.Media/SystemSound.cs
 System.Media/SystemSounds.cs
 System.Media/Win32SoundPlayer.cs
 System.Net/AuthenticationManager.cs
-System.Net/AuthenticationSchemes.cs
-System.Net/AuthenticationSchemeSelector.cs
-System.Net/Authorization.cs
 System.Net/BasicClient.cs
 System.Net/BindIPEndPoint.cs
 System.Net/ChunkedInputStream.cs
@@ -258,60 +247,37 @@ System.Net.Configuration/WebRequestModuleElementCollection.cs
 System.Net.Configuration/WebRequestModuleElement.cs
 System.Net.Configuration/WebRequestModuleHandler.cs
 System.Net.Configuration/WebRequestModulesSection.cs
-System.Net/ConnectionModes.cs
-System.Net/CredentialCache.cs
 System.Net/DecompressionMethods.cs
 System.Net/DefaultCertificatePolicy.cs
 System.Net/DigestClient.cs
 System.Net/Dns.cs
-System.Net/DnsEndPoint.cs
 System.Net/DnsPermissionAttribute.cs
 System.Net/DnsPermission.cs
-System.Net/EndPoint.cs
 System.Net/EndPointListener.cs
 System.Net/EndPointManager.cs
 System.Net/EndpointPermission.cs
-System.Net/FileWebRequestCreator.cs
-System.Net/FileWebRequest.cs
-System.Net/FileWebResponse.cs
 System.Net/FtpAsyncResult.cs
 System.Net/FtpDataStream.cs
 System.Net/FtpRequestCreator.cs
-System.Net/FtpStatusCode.cs
 System.Net/FtpWebRequest.cs
 System.Net/FtpStatus.cs
 System.Net/FtpWebResponse.cs
-System.Net/GlobalProxySelection.cs
 System.Net/HttpConnection.cs
 System.Net/HttpListenerBasicIdentity.cs
 System.Net/HttpListenerContext.cs
 System.Net/HttpListener.cs
-System.Net/HttpListenerException.cs
 System.Net/HttpListenerPrefixCollection.cs
 System.Net/HttpListenerRequest.cs
 System.Net/HttpListenerResponse.cs
 System.Net/HttpListenerTimeoutManager.cs
 System.Net/HttpRequestCreator.cs
-System.Net/HttpRequestHeader.cs
-System.Net/HttpResponseHeader.cs
-System.Net/HttpStatusCode.cs
 System.Net/HttpStreamAsyncResult.cs
-System.Net/HttpVersion.cs
 System.Net/HttpWebRequest.cs
 System.Net/HttpWebResponse.cs
-System.Net/IAuthenticationModule.cs
-System.Net/ICertificatePolicy.cs
-System.Net/ICredentialLookup.cs
 System.Net/ICredentialPolicy.cs
-System.Net/ICredentialsByHost.cs
-System.Net/IPAddress.cs
-System.Net/IPEndPoint.cs
-System.Net/IPHostEntry.cs
 System.Net/IPv6Address.cs
-System.Net/IWebProxy.cs
 System.Net/IWebProxyScript.cs
 System.Net/IWebConnectionState.cs
-System.Net/IWebRequestCreate.cs
 System.Net/ListenerAsyncResult.cs
 System.Net/ListenerPrefix.cs
 System.Net.Mail/AlternateViewCollection.cs
@@ -370,59 +336,28 @@ System.Net.Mail/SmtpStatusCode.cs
 System.Net/MacProxy.cs
 System.Net/MonoHttpDate.cs
 System.Net/NetConfig.cs
-System.Net/NetworkAccess.cs
 System.Net/NetworkCredential.cs
-System.Net.NetworkInformation/DuplicateAddressDetectionState.cs
-System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs
-System.Net.NetworkInformation/GatewayIPAddressInformation.cs
 System.Net.NetworkInformation/IcmpV4Statistics.cs
 System.Net.NetworkInformation/IcmpV6Statistics.cs
 System.Net.NetworkInformation/IPAddressCollection.cs
-System.Net.NetworkInformation/IPAddressInformationCollection.cs
-System.Net.NetworkInformation/IPAddressInformation.cs
 System.Net.NetworkInformation/IPGlobalProperties.cs
 System.Net.NetworkInformation/IPGlobalStatistics.cs
 System.Net.NetworkInformation/IPInterfaceProperties.cs
-System.Net.NetworkInformation/IPStatus.cs
 System.Net.NetworkInformation/IPv4InterfaceProperties.cs
 System.Net.NetworkInformation/IPv4InterfaceStatistics.cs
 System.Net.NetworkInformation/IPv6InterfaceProperties.cs
 System.Net.NetworkInformation/LinuxNetworkInterfaceMarshal.cs
 System.Net.NetworkInformation/MacOsNetworkInterfaceMarshal.cs
-System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
-System.Net.NetworkInformation/MulticastIPAddressInformation.cs
-System.Net.NetworkInformation/NetBiosNodeType.cs
-System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
-System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
-System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs
 System.Net.NetworkInformation/NetworkChange.cs
-System.Net.NetworkInformation/NetworkInformationAccess.cs
-System.Net.NetworkInformation/NetworkInformationException.cs
-System.Net.NetworkInformation/NetworkInformationPermissionAttribute.cs
-System.Net.NetworkInformation/NetworkInformationPermission.cs
-System.Net.NetworkInformation/NetworkInterfaceComponent.cs
 System.Net.NetworkInformation/NetworkInterface.cs
-System.Net.NetworkInformation/NetworkInterfaceType.cs
-System.Net.NetworkInformation/OperationalStatus.cs
-System.Net.NetworkInformation/PhysicalAddress.cs
 System.Net.NetworkInformation/PingCompletedEventArgs.cs
 System.Net.NetworkInformation/PingCompletedEventHandler.cs
 System.Net.NetworkInformation/Ping.cs
-System.Net.NetworkInformation/PingException.cs
-System.Net.NetworkInformation/PingOptions.cs
-System.Net.NetworkInformation/PingReply.cs
-System.Net.NetworkInformation/PrefixOrigin.cs
-System.Net.NetworkInformation/SuffixOrigin.cs
-System.Net.NetworkInformation/TcpConnectionInformation.cs
-System.Net.NetworkInformation/TcpState.cs
 System.Net.NetworkInformation/TcpStatistics.cs
 System.Net.NetworkInformation/UdpStatistics.cs
-System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
 System.Net.NetworkInformation/UnicastIPAddressInformation.cs
 System.Net.NetworkInformation/Win32NetworkInterfaceMarshal.cs
 System.Net/NtlmClient.cs
-System/NetPipeStyleUriParser.cs
-System.Net/ProtocolViolationException.cs
 System.Net/RequestStream.cs
 System.Net/ResponseStream.cs
 ../referencesource/System/net/System/Net/SecureProtocols/AuthenticatedStream.cs
@@ -430,7 +365,6 @@ System.Net/ResponseStream.cs
 System.Net.Security/EncryptionPolicy.cs
 System.Net.Security/LocalCertificateSelectionCallback.cs
 System.Net.Security/NegotiateStream.cs
-System.Net/SecurityProtocolType.cs
 System.Net.Security/RemoteCertificateValidationCallback.cs
 System.Net.Security/SslStream.cs
 System.Net.Security/SslPolicyErrors.cs
@@ -438,7 +372,6 @@ System.Net/ServicePoint.cs
 System.Net/ServicePointManager.cs
 System.Net/ServicePointManager.extra.cs
 System.Net/SimpleAsyncResult.cs
-System.Net/SocketAddress.cs
 System.Net/SocketPermissionAttribute.cs
 System.Net/SocketPermission.cs
 ../referencesource/System/net/System/Net/Sockets/AddressFamily.cs
@@ -470,21 +403,11 @@ System.Net.Sockets/TcpListener.cs
 ../referencesource/System/net/System/Net/Sockets/TransmitFileFlags.cs
 System.Net.Sockets/UdpClient.cs
 ../referencesource/System/net/System/Net/Sockets/UdpReceiveResult.cs
-System/NetTcpStyleUriParser.cs
-System.Net/TransportContext.cs
-System.Net/TransportType.cs
 System.Net/WebAsyncResult.cs
 System.Net/WebConnection.cs
 System.Net/WebConnectionData.cs
 System.Net/WebConnectionGroup.cs
 System.Net/WebConnectionStream.cs
-System.Net/WebException.cs
-System.Net/WebExceptionStatus.cs
-System.Net/WebHeaderCollection.cs
-System.Net/WebProxy.cs
-System.Net/WebRequest.cs
-System.Net/WebRequestMethods.cs
-System.Net/WebResponse.cs
 System.Net.WebSockets/ClientWebSocket.cs
 System.Net.WebSockets/ClientWebSocketOptions.cs
 System.Net.WebSockets/HttpListenerWebSocketContext.cs
@@ -496,7 +419,6 @@ System.Net.WebSockets/WebSocketException.cs
 System.Net.WebSockets/WebSocketMessageType.cs
 System.Net.WebSockets/WebSocketReceiveResult.cs
 System.Net.WebSockets/WebSocketState.cs
-System/NewsStyleUriParser.cs
 System.Security.AccessControl/SemaphoreAccessRule.cs
 System.Security.AccessControl/SemaphoreAuditRule.cs
 System.Security.AccessControl/SemaphoreRights.cs
@@ -521,10 +443,6 @@ System.Security.Authentication.ExtendedProtection.Configuration/ServiceNameEleme
 System.Security.Cryptography/AsnEncodedDataCollection.cs
 System.Security.Cryptography/AsnEncodedData.cs
 System.Security.Cryptography/AsnEncodedDataEnumerator.cs
-System.Security.Cryptography/OidCollection.cs
-System.Security.Cryptography/Oid.cs
-System.Security.Cryptography/OidEnumerator.cs
-System.Security.Cryptography/OidGroup.cs
 System.Security.Cryptography.X509Certificates/OpenFlags.cs
 System.Security.Cryptography.X509Certificates/OSX509Certificates.cs
 System.Security.Cryptography.X509Certificates/PublicKey.cs
@@ -571,17 +489,10 @@ System.Security.Permissions/StorePermissionAttribute.cs
 System.Security.Permissions/StorePermission.cs
 System.Security.Permissions/StorePermissionFlags.cs
 System/SRDescriptionAttribute.cs
-System.Threading/Semaphore.cs
 System.Threading/ThreadExceptionEventArgs.cs
 System.Threading/ThreadExceptionEventHandler.cs
 System.Timers/ElapsedEventArgs.cs
-System/UriBuilder.cs
-System/Uri.cs
-System/UriHelper.cs
-System/UriParser.cs
 System/UriTypeConverter.cs
-System/UriElements.cs
-System/UriParseComponents.cs
 System.Web/AspNetHostingPermissionAttribute.cs
 System.Web/AspNetHostingPermission.cs
 System.Web/AspNetHostingPermissionLevel.cs
@@ -598,8 +509,6 @@ System.Runtime.InteropServices.ComTypes/IEnumSTATDATA.cs
 System.Runtime.InteropServices.ComTypes/STATDATA.cs
 System.Runtime.InteropServices.ComTypes/STGMEDIUM.cs
 System.Runtime.InteropServices.ComTypes/TYMED.cs
-System/IUriData.cs
-System/UriData.cs
 Mono.Net.Dns/DnsClass.cs
 Mono.Net.Dns/DnsHeader.cs
 Mono.Net.Dns/DnsOpCode.cs
@@ -642,21 +551,23 @@ Mono.Net.Security/MonoTlsStream.cs
 Mono.Net.Security/NoReflectionHelper.cs
 Mono.Net.Security/SystemCertificateValidator.cs
 
+ReferenceSources/AutoWebProxyScriptEngine.cs
 ReferenceSources/AssertWrapper.cs
 ReferenceSources/BinaryCompatibility.cs
 ReferenceSources/ConfigurationManagerInternalFactory.cs
+ReferenceSources/CAPI.cs
 ReferenceSources/EnvironmentHelpers.cs
 ReferenceSources/Internal.cs
+ReferenceSources/HttpApi.cs
 ReferenceSources/HttpSysSettings.cs
 ReferenceSources/Logging.cs
 ReferenceSources/NativeMethods.cs
+ReferenceSources/RequestCacheProtocol.cs
 ReferenceSources/SettingsSectionInternal.cs
 ReferenceSources/Socket.cs
 ReferenceSources/SR.cs
 ReferenceSources/SR2.cs
 ReferenceSources/SRCategoryAttribute.cs
-ReferenceSources/SystemNetworkCredential.cs
-ReferenceSources/WebHeaderCollectionType.cs
 ReferenceSources/Win32Exception.cs
 
 ReferenceSources/SSPIConfiguration.cs
@@ -1032,37 +943,147 @@ ReferenceSources/_SslStream.cs
 ../referencesource/System/compmod/system/diagnostics/TypedElement.cs
 ../referencesource/System/compmod/system/diagnostics/XmlWriterTraceListener.cs
 
+../referencesource/System/net/System/_DomainName.cs
+../referencesource/System/net/System/_IPv4Address.cs
+../referencesource/System/net/System/_IPv6Address.cs
+../referencesource/System/net/System/_UncName.cs
+../referencesource/System/net/System/_UriSyntax.cs
+../referencesource/System/net/System/GenericUriParser.cs
+../referencesource/System/net/System/IriHelper.cs
+../referencesource/System/net/System/URI.cs
+../referencesource/System/net/System/uribuilder.cs
 ../referencesource/System/net/System/UriEnumTypes.cs
+../referencesource/System/net/System/UriExt.cs
 ../referencesource/System/net/System/URIFormatException.cs
+../referencesource/System/net/System/UriHelper.cs
 ../referencesource/System/net/System/UriHostNameType.cs
+../referencesource/System/net/System/UriParserTemplates.cs
 ../referencesource/System/net/System/URIPartial.cs
+../referencesource/System/net/System/UriScheme.cs
 
 ../referencesource/System/net/System/Net/_BufferOffsetSize.cs
+../referencesource/System/net/System/Net/_Connection.cs
+../referencesource/System/net/System/Net/_emptywebproxy.cs
+../referencesource/System/net/System/Net/_HeaderInfo.cs
+../referencesource/System/net/System/Net/_HeaderInfoTable.cs
+../referencesource/System/net/System/Net/_HTTPDateParse.cs
+../referencesource/System/net/System/Net/_IStreams.cs
+../referencesource/System/net/System/Net/_NetRes.cs
 ../referencesource/System/net/System/Net/_LazyAsyncResult.cs
 ../referencesource/System/net/System/Net/_LoggingObject.cs
+../referencesource/System/net/System/Net/_PooledStream.cs
+../referencesource/System/net/System/Net/_ProxyChain.cs
 ../referencesource/System/net/System/Net/_ScatterGatherBuffers.cs
+../referencesource/System/net/System/Net/_Semaphore.cs
+../referencesource/System/net/System/Net/_TimerThread.cs
+../referencesource/System/net/System/Net/_WebProxyDataBuilder.cs
+../referencesource/System/net/System/Net/AuthenticationScheme.cs
+../referencesource/System/net/System/Net/AuthenticationSchemeSelector.cs
+../referencesource/System/net/System/Net/Authorization.cs
+../referencesource/System/net/System/Net/CredentialCache.cs
 ../referencesource/System/net/System/Net/cookie.cs
 ../referencesource/System/net/System/Net/cookiecollection.cs
 ../referencesource/System/net/System/Net/cookiecontainer.cs
 ../referencesource/System/net/System/Net/cookieexception.cs
+../referencesource/System/net/System/Net/connectionpool.cs
+../referencesource/System/net/System/Net/DnsEndPoint.cs
+../referencesource/System/net/System/Net/EndPoint.cs
+../referencesource/System/net/System/Net/FtpStatusCode.cs
+../referencesource/System/net/System/Net/filewebrequest.cs
+../referencesource/System/net/System/Net/filewebresponse.cs
+../referencesource/System/net/System/Net/GlobalProxySelection.cs
+../referencesource/System/net/System/Net/HttpListenerException.cs
 ../referencesource/System/net/System/Net/HttpListenerRequestUriBuilder.cs
+../referencesource/System/net/System/Net/HttpRequestHeader.cs
+../referencesource/System/net/System/Net/HttpResponseHeader.cs
+../referencesource/System/net/System/Net/HttpStatusCode.cs
+../referencesource/System/net/System/Net/HttpVersion.cs
+../referencesource/System/net/System/Net/IAuthenticationModule.cs
+../referencesource/System/net/System/Net/ICertificatePolicy.cs
+../referencesource/System/net/System/Net/ICredentials.cs
+../referencesource/System/net/System/Net/ICredentialsByHost.cs
 ../referencesource/System/net/System/Net/Internal.cs
+../referencesource/System/net/System/Net/IPAddress.cs
+../referencesource/System/net/System/Net/IPEndPoint.cs
+../referencesource/System/net/System/Net/IPHostEntry.cs
+../referencesource/System/net/System/Net/iwebproxy.cs
+../referencesource/System/net/System/Net/IWebProxyFinder.cs
+../referencesource/System/net/System/Net/IWebRequestCreate.cs
+../referencesource/System/net/System/Net/NetworkAccess.cs
+../referencesource/System/net/System/Net/ProtocolViolationException.cs
+../referencesource/System/net/System/Net/TransportContext.cs
+../referencesource/System/net/System/Net/TransportType.cs
 ../referencesource/System/net/System/Net/UnicodeDecodingConformance.cs
 ../referencesource/System/net/System/Net/UnicodeEncodingConformance.cs
 ../referencesource/System/net/System/Net/ServicePointManager.cs
+../referencesource/System/net/System/Net/SocketAddress.cs
 ../referencesource/System/net/System/Net/webclient.cs
+../referencesource/System/net/System/Net/WebException.cs
+../referencesource/System/net/System/Net/WebExceptionStatus.cs
+../referencesource/System/net/System/Net/WebHeaderCollection.cs
 ../referencesource/System/net/System/Net/WebPermission.cs
+../referencesource/System/net/System/Net/webproxy.cs
+../referencesource/System/net/System/Net/WebRequestMethods.cs
+../referencesource/System/net/System/Net/WebRequest.cs
+../referencesource/System/net/System/Net/WebResponse.cs
 ../referencesource/System/net/System/Net/WebUtility.cs
 ../referencesource/System/net/System/Net/WriteStreamClosedEventArgs.cs
 
+../referencesource/System/net/System/Net/Cache/RequestCache.cs
+../referencesource/System/net/System/Net/Cache/RequestCacheEntry.cs
 ../referencesource/System/net/System/Net/Cache/RequestCachePolicy.cs
+../referencesource/System/net/System/Net/Cache/RequestCacheManager.cs
+
+../referencesource/System/net/System/Net/Configuration/DefaultProxySection.cs
 
 ../referencesource/System/net/System/Net/Sockets/IPProtectionLevel.cs
 ../referencesource/System/net/System/Net/Sockets/NetworkStream.cs
 
+../referencesource/System/net/System/Net/NetworkInformation/DuplicateAddressDetectionState.cs
+../referencesource/System/net/System/Net/NetworkInformation/GatewayIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/GatewayIPAddressInformationCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPAddressCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPAddressInformationCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPGlobalStatistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPInterfaceProperties.cs
 ../referencesource/System/net/System/Net/NetworkInformation/IPInterfaceStatistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPStatus.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPv4InterfaceProperties.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPv6InterfaceProperties.cs
+../referencesource/System/net/System/Net/NetworkInformation/IcmpV4Statistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/IcmpV6Statistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/MulticastIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/MulticastIPAddressInformationCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkAddressChange.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkInformationException.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkInformationPermission.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkInterface.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkInterfaceComponent.cs
+../referencesource/System/net/System/Net/NetworkInformation/OperationalStatus.cs
+../referencesource/System/net/System/Net/NetworkInformation/PhysicalAddress.cs
+../referencesource/System/net/System/Net/NetworkInformation/PingOptions.cs
+../referencesource/System/net/System/Net/NetworkInformation/PingReply.cs
+../referencesource/System/net/System/Net/NetworkInformation/PrefixOrigin.cs
 ../referencesource/System/net/System/Net/NetworkInformation/ScopeLevel.cs
+../referencesource/System/net/System/Net/NetworkInformation/SuffixOrigin.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemGatewayIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemMulticastIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemUnicastIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemTcpConnection.cs
+../referencesource/System/net/System/Net/NetworkInformation/TcpConnection.cs
+../referencesource/System/net/System/Net/NetworkInformation/TcpState.cs
+../referencesource/System/net/System/Net/NetworkInformation/TcpStatistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/UdpStatistics.cs
 ../referencesource/System/net/System/Net/NetworkInformation/UnicastIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/UnicastIPAddressInformationCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/interfacetype.cs
+../referencesource/System/net/System/Net/NetworkInformation/nodetype.cs
+../referencesource/System/net/System/Net/NetworkInformation/pingexception.cs
+
+../referencesource/System/sys/system/IO/ports/InternalResources.cs
 
 ../referencesource/System/sys/system/runtime/interopservices/DefaultParameterValueAttribute.cs
 ../referencesource/System/sys/system/runtime/interopservices/handlecollector.cs
@@ -1070,8 +1091,16 @@ ReferenceSources/_SslStream.cs
 ../referencesource/System/sys/system/runtime/versioning/FrameworkName.cs
 
 ../referencesource/System/sys/system/threading/Barrier.cs
+../referencesource/System/sys/system/threading/semaphore.cs
+
 ../referencesource/System/sys/system/windows/markup/ValueSerializerAttribute.cs
 
+../referencesource/System/security/system/security/Authentication/ExtendedProtection/TokenBinding.cs
+
+../referencesource/System/security/system/security/cryptography/oid.cs
+
+../referencesource/System/security/system/security/cryptography/x509/x509utils.cs
+
 ../referencesource/System/security/system/security/permissions/typedescriptorpermission.cs
 
 ../referencesource/System/services/timers/system/timers/ElapsedEventHandler.cs
diff --git a/mcs/class/System/System/DefaultUriParser.cs b/mcs/class/System/System/DefaultUriParser.cs
deleted file mode 100644
index cd64a37a9fe..00000000000
--- a/mcs/class/System/System/DefaultUriParser.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.DefaultUriParser internal class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	// LAMESPEC: Sadly MS doesn't seems to use all/most? the new Uri
-	// parser classes. See unit tests... :(
-
-	internal class DefaultUriParser : UriParser {
-
-		public DefaultUriParser ()
-		{
-		}
-
-		public DefaultUriParser (string scheme)
-		{
-			scheme_name = scheme;
-		}
-	}
-}
diff --git a/mcs/class/System/System/FileStyleUriParser.cs b/mcs/class/System/System/FileStyleUriParser.cs
deleted file mode 100644
index f7a0fdf7ce1..00000000000
--- a/mcs/class/System/System/FileStyleUriParser.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.FileStyleUriParser class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	public class FileStyleUriParser : UriParser {
-
-		public FileStyleUriParser ()
-		{
-		}
-	}
-}
-
diff --git a/mcs/class/System/System/FtpStyleUriParser.cs b/mcs/class/System/System/FtpStyleUriParser.cs
deleted file mode 100644
index c31d279a1e2..00000000000
--- a/mcs/class/System/System/FtpStyleUriParser.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.FtpStyleUriParser class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	public class FtpStyleUriParser : UriParser {
-
-		public FtpStyleUriParser ()
-		{
-		}
-	}
-}
-
diff --git a/mcs/class/System/System/GenericUriParser.cs b/mcs/class/System/System/GenericUriParser.cs
deleted file mode 100644
index 38ef72808fa..00000000000
--- a/mcs/class/System/System/GenericUriParser.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.GenericUriParser class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-	public class GenericUriParser : UriParser {
-
-		public GenericUriParser (GenericUriParserOptions options)
-		{
-		}
-	}
-}
diff --git a/mcs/class/System/System/GenericUriParserOptions.cs b/mcs/class/System/System/GenericUriParserOptions.cs
deleted file mode 100644
index 91e912775ce..00000000000
--- a/mcs/class/System/System/GenericUriParserOptions.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.GenericUriParserOptions enumeration
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005, 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	[Flags]
-	public enum GenericUriParserOptions {
-
-		Default = 0,
-		GenericAuthority = 1,
-		AllowEmptyAuthority = 2,
-		NoUserInfo = 4,
-		NoPort = 8,
-		NoQuery = 16,
-		NoFragment = 32,
-		DontConvertPathBackslashes = 64,
-		DontCompressPath = 128,
-		DontUnescapePathDotsAndSlashes = 256,
-		Idn = 512,
-		IriParsing = 1024
-	}
-}
diff --git a/mcs/class/System/System/GopherStyleUriParser.cs b/mcs/class/System/System/GopherStyleUriParser.cs
deleted file mode 100644
index 801c1d330db..00000000000
--- a/mcs/class/System/System/GopherStyleUriParser.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.GopherStyleUriParser class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	public class GopherStyleUriParser : UriParser {
-
-		public GopherStyleUriParser ()
-		{
-		}
-	}
-}
-
diff --git a/mcs/class/System/System/HttpStyleUriParser.cs b/mcs/class/System/System/HttpStyleUriParser.cs
deleted file mode 100644
index 15b3fc749f9..00000000000
--- a/mcs/class/System/System/HttpStyleUriParser.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.HttpStyleUriParser class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	public class HttpStyleUriParser : UriParser {
-
-		public HttpStyleUriParser ()
-		{
-		}
-	}
-}
-
diff --git a/mcs/class/System/System/IUriData.cs b/mcs/class/System/System/IUriData.cs
deleted file mode 100644
index 86289d02131..00000000000
--- a/mcs/class/System/System/IUriData.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.IUriData interface
-//
-// Author:
-//	Raja R Harinath <harinath@hurrynot.org>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections;
-using System.Globalization;
-using System.Security.Permissions;
-using System.Text;
-
-namespace System {
-	interface IUriData {
-		string AbsolutePath { get; }
-		string AbsoluteUri { get; }
-		string AbsoluteUri_SafeUnescaped { get; }
-		string Authority { get; }
-		string Fragment { get; }
-		string Host { get; }
-		string PathAndQuery { get; }
-		string StrongPort { get; }
-		string Query { get; }
-		string UserInfo { get; }
-	}
-}
diff --git a/mcs/class/System/System/LdapStyleUriParser.cs b/mcs/class/System/System/LdapStyleUriParser.cs
deleted file mode 100644
index c19bce92809..00000000000
--- a/mcs/class/System/System/LdapStyleUriParser.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.LdapStyleUriParser class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	public class LdapStyleUriParser : UriParser {
-
-		public LdapStyleUriParser ()
-		{
-		}
-	}
-}
-
diff --git a/mcs/class/System/System/NetPipeStyleUriParser.cs b/mcs/class/System/System/NetPipeStyleUriParser.cs
deleted file mode 100644
index b3f6ea863f6..00000000000
--- a/mcs/class/System/System/NetPipeStyleUriParser.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.NetPipeStyleUriParser class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	[MonoTODO]
-	public class NetPipeStyleUriParser : UriParser {
-
-		public NetPipeStyleUriParser ()
-		{
-		}
-	}
-}
-
diff --git a/mcs/class/System/System/NetTcpStyleUriParser.cs b/mcs/class/System/System/NetTcpStyleUriParser.cs
deleted file mode 100644
index 6c4c1d9ff17..00000000000
--- a/mcs/class/System/System/NetTcpStyleUriParser.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.NetTcpStyleUriParser class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	[MonoTODO]
-	public class NetTcpStyleUriParser : UriParser {
-
-		public NetTcpStyleUriParser ()
-		{
-		}
-	}
-}
-
diff --git a/mcs/class/System/System/NewsStyleUriParser.cs b/mcs/class/System/System/NewsStyleUriParser.cs
deleted file mode 100644
index e1f99989aef..00000000000
--- a/mcs/class/System/System/NewsStyleUriParser.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.NewsStyleUriParser class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-
-	[MonoTODO]
-	public class NewsStyleUriParser : UriParser {
-
-		public NewsStyleUriParser ()
-		{
-		}
-	}
-}
-
diff --git a/mcs/class/System/System/Uri.cs b/mcs/class/System/System/Uri.cs
deleted file mode 100644
index 094eb13d0bb..00000000000
--- a/mcs/class/System/System/Uri.cs
+++ /dev/null
@@ -1,2105 +0,0 @@
-//
-// System.Uri
-//
-// Authors:
-//    Lawrence Pit (loz@cable.a2000.nl)
-//    Garrett Rooney (rooneg@electricjellyfish.net)
-//    Ian MacLean (ianm@activestate.com)
-//    Ben Maurer (bmaurer@users.sourceforge.net)
-//    Atsushi Enomoto (atsushi@ximian.com)
-//    Sebastien Pouliot  <sebastien@ximian.com>
-//    Stephane Delcroix  <stephane@delcroix.org>
-//
-// (C) 2001 Garrett Rooney
-// (C) 2003 Ian MacLean
-// (C) 2003 Ben Maurer
-// Copyright (C) 2003,2009 Novell, Inc (http://www.novell.com)
-// Copyright (c) 2009 Stephane Delcroix
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// See RFC 2396 for more info on URI's.
-//
-// TODO: optimize by parsing host string only once
-//
-using System.ComponentModel;
-using System.IO;
-using System.Net;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-
-//
-// Disable warnings on Obsolete methods being used
-//
-#pragma warning disable 612
-
-namespace System {
-
-	[Serializable]
-	[TypeConverter (typeof (UriTypeConverter))]
-	public class Uri : ISerializable {
-		// NOTES:
-		// o  scheme excludes the scheme delimiter
-		// o  port is -1 to indicate no port is defined
-		// o  path is empty or starts with / when scheme delimiter == "://"
-		// o  query is empty or starts with ? char, escaped.
-		// o  fragment is empty or starts with # char, unescaped.
-		// o  all class variables are in escaped format when they are escapable,
-		//    except cachedToString.
-		// o  UNC is supported, as starts with "\\" for windows,
-		//    or "//" with unix.
-
-		private string source;
-		private string scheme = String.Empty;
-		private string host = String.Empty;
-		private int port = -1;
-		private string path = String.Empty;
-		private string query = String.Empty;
-		private string fragment = String.Empty;
-		private string userinfo;
-		private bool isUnc;
-		private bool isAbsoluteUri = true;
-		private long scope_id;
-
-		private List<string> segments;
-		
-		private bool userEscaped;
-		private string cachedAbsoluteUri;
-		private string cachedToString;
-		private string cachedLocalPath;
-		private int cachedHashCode;
-		
-		private static bool s_IriParsing;
-
-		internal static bool IriParsing {
-			get { return s_IriParsing; }
-			set { s_IriParsing = value; }
-		}
-
-		// Do not rename this.
-		// User code might set this to true with reflection.
-		// When set to true an Uri constructed with UriKind.RelativeOrAbsolute 
-		// and paths such as "/foo" is assumed relative.
-		private static bool useDotNetRelativeOrAbsolute;
-
-#if BOOTSTRAP_BASIC
-		private static readonly string hexUpperChars = "0123456789ABCDEF";
-		private static readonly string [] Empty = new string [0];
-		private static bool isWin32 = (Path.DirectorySeparatorChar == '\\');
-#else
-		static readonly char[] hexUpperChars = new [] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-#endif
-	
-		// Fields
-		
-		public static readonly string SchemeDelimiter = "://";
-		public static readonly string UriSchemeFile = "file";
-		public static readonly string UriSchemeFtp = "ftp";
-		public static readonly string UriSchemeGopher = "gopher";
-		public static readonly string UriSchemeHttp = "http";
-		public static readonly string UriSchemeHttps = "https";
-		public static readonly string UriSchemeMailto = "mailto";
-		public static readonly string UriSchemeNews = "news";
-		public static readonly string UriSchemeNntp = "nntp";
-		public static readonly string UriSchemeNetPipe = "net.pipe";
-		public static readonly string UriSchemeNetTcp = "net.tcp";
-
-		internal static readonly string UriSchemeTelnet = "telnet";
-		internal static readonly string UriSchemeLdap = "ldap";
-		internal static readonly string UriSchemeUuid = "uuid";
-
-		private static readonly string [] knownUriSchemes =
-		{
-			UriSchemeFile,
-			UriSchemeFtp,
-			UriSchemeGopher,
-			UriSchemeHttp,
-			UriSchemeHttps,
-			UriSchemeMailto,
-			UriSchemeNews,
-			UriSchemeNntp,
-			UriSchemeNetPipe,
-			UriSchemeNetTcp
-		};
-
-		// Constructors
-
-		static Uri ()
-		{
-			IriParsing = true;
-
-			var iriparsingVar = Environment.GetEnvironmentVariable ("MONO_URI_IRIPARSING");
-			if (iriparsingVar == "true")
-				IriParsing = true;
-			else if (iriparsingVar == "false")
-				IriParsing = false;
-
-			useDotNetRelativeOrAbsolute = Environment.GetEnvironmentVariable ("MONO_URI_DOTNETRELATIVEORABSOLUTE") == "true";
-		}
-
-		public Uri (string uriString) : this (uriString, false) 
-		{
-		}
-
-		protected Uri (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			string uri = serializationInfo.GetString ("AbsoluteUri");
-			if (uri.Length > 0) {
-				source = uri;
-				ParseUri (UriKind.Absolute);
-			} else {
-				uri = serializationInfo.GetString ("RelativeUri");
-				if (uri.Length > 0) {
-					source = uri;
-					ParseUri (UriKind.Relative);
-				} else {
-					throw new ArgumentException ("Uri string was null or empty.");
-				}
-			}
-		}
-
-		// When used instead of UriKind.RelativeOrAbsolute paths such as "/foo" are assumed relative.
-		const UriKind DotNetRelativeOrAbsolute = (UriKind) 300;
-
-		private void ProcessUriKind (string uriString, ref UriKind uriKind)
-		{
-			if (uriString == null)
-			   return;
-		
-			if (uriKind == DotNetRelativeOrAbsolute ||
-				(uriKind == UriKind.RelativeOrAbsolute && useDotNetRelativeOrAbsolute))
-				uriKind = (uriString.StartsWith ("/", StringComparison.Ordinal))? UriKind.Relative : UriKind.RelativeOrAbsolute;
-		}
-
-		public Uri (string uriString, UriKind uriKind)
-		{
-			source = uriString;
-
-			ProcessUriKind (uriString, ref uriKind);
-
-			ParseUri (uriKind);
-
-			switch (uriKind) {
-			case UriKind.Absolute:
-				if (!IsAbsoluteUri)
-					throw new UriFormatException ("Invalid URI: The format of the URI could not be "
-						+ "determined.");
-				break;
-			case UriKind.Relative:
-				if (IsAbsoluteUri)
-					throw new UriFormatException ("Invalid URI: The format of the URI could not be "
-						+ "determined because the parameter 'uriString' represents an absolute URI.");
-				break;
-			case UriKind.RelativeOrAbsolute:
-				break;
-			default:
-				string msg = Locale.GetText ("Invalid UriKind value '{0}'.", uriKind);
-				throw new ArgumentException (msg);
-			}
-		}
-
-		//
-		// An exception-less constructor, returns success
-		// condition on the out parameter `success'.
-		//
-		Uri (string uriString, UriKind uriKind, out bool success)
-		{
-			if (uriString == null) {
-				success = false;
-				return;
-			}
-
-			ProcessUriKind (uriString, ref uriKind);
-
-			if (uriKind != UriKind.RelativeOrAbsolute &&
-				uriKind != UriKind.Absolute &&
-				uriKind != UriKind.Relative) {
-				string msg = Locale.GetText ("Invalid UriKind value '{0}'.", uriKind);
-				throw new ArgumentException (msg);
-			}
-
-			source = uriString;
-			if (ParseNoExceptions (uriKind, uriString) != null)
-				success = false;
-			else {
-				success = true;
-				
-				switch (uriKind) {
-				case UriKind.Absolute:
-					if (!IsAbsoluteUri)
-						success = false;
-					break;
-				case UriKind.Relative:
-					if (IsAbsoluteUri)
-						success = false;
-					break;
-				case UriKind.RelativeOrAbsolute:
-					break;
-				default:
-					success = false;
-					break;
-				}
-
-				if (success && host.Length > 1 && host [0] != '[' && host [host.Length - 1] != ']') {
-					// host name present (but not an IPv6 address)
-					host = host.ToLower (CultureInfo.InvariantCulture);
-				}
-			}
-		}
-
-		public Uri (Uri baseUri, Uri relativeUri)
-		{
-			Merge (baseUri, relativeUri == null ? String.Empty : relativeUri.OriginalString);
-			// FIXME: this should call UriParser.Resolve
-		}
-
-		// note: doc says that dontEscape is always false but tests show otherwise
-		[Obsolete]
-		public Uri (string uriString, bool dontEscape) 
-		{
-			userEscaped = dontEscape;
-			source = uriString;
-			ParseUri (UriKind.Absolute);
-			if (!isAbsoluteUri)
-				throw new UriFormatException ("Invalid URI: The format of the URI could not be "
-					+ "determined: " + uriString);
-		}
-
-		public Uri (Uri baseUri, string relativeUri) 
-		{
-			Merge (baseUri, relativeUri);
-			// FIXME: this should call UriParser.Resolve
-		}
-
-		[Obsolete ("dontEscape is always false")]
-		public Uri (Uri baseUri, string relativeUri, bool dontEscape) 
-		{
-			userEscaped = dontEscape;
-			Merge (baseUri, relativeUri);
-		}
-
-		private void Merge (Uri baseUri, string relativeUri)
-		{
-			if (baseUri == null)
-				throw new ArgumentNullException ("baseUri");
-			if (!baseUri.IsAbsoluteUri)
-				throw new ArgumentOutOfRangeException ("baseUri");
-			if (string.IsNullOrEmpty (relativeUri)) {
-				source = baseUri.OriginalString;
-				ParseUri (UriKind.Absolute);
-				return;
-			}
-
-			string error;
-			bool startsWithSlash = false;
-
-			UriElements baseEl;
-			if (!UriParseComponents.TryParseComponents (baseUri.OriginalString, UriKind.Absolute, out baseEl, out error))
-				throw new UriFormatException (error);
-
-			if (relativeUri.StartsWith (baseEl.scheme + ":", StringComparison.Ordinal))
-				relativeUri = relativeUri.Substring (baseEl.scheme.Length + 1);
-
-			if (relativeUri.Length >= 1 && relativeUri [0] == '/') {
-				if (relativeUri.Length >= 2 && relativeUri [1] == '/') {
-					source = baseEl.scheme + ":" + relativeUri;
-					ParseUri (UriKind.Absolute);
-					return;
-				}
-
-				relativeUri = relativeUri.Substring (1);
-				startsWithSlash = true;
-			}
-
-			UriElements relativeEl;
-			if (!UriParseComponents.TryParseComponents (relativeUri, UriKind.RelativeOrAbsolute, out relativeEl, out error))
-				throw new UriFormatException (error);
-
-			if (relativeEl.isAbsoluteUri) {
-				source = relativeUri;
-				ParseUri (UriKind.Absolute);
-				return;
-			}
-
-			source = baseEl.scheme + baseEl.delimiter;
-
-			if (baseEl.user != null)
-				source += baseEl.user + "@";
-
-			source += baseEl.host;
-
-			if (baseEl.port >= 0)
-				source += ":" + baseEl.port.ToString (CultureInfo.InvariantCulture);
-
-			var canUseBase = true;
-
-			string path;
-			if (!string.IsNullOrEmpty (relativeEl.path) || startsWithSlash) {
-				canUseBase = false;
-				path = relativeEl.path;
-				if (startsWithSlash)
-					path = relativeEl.path;
-				else {
-					var pathEnd = baseEl.path.LastIndexOf ('/');
-					path = (pathEnd > 0)? baseEl.path.Substring (0, pathEnd+1) : "";
-					path += relativeEl.path;
-				}
-			} else {
-				path = baseEl.path;
-			}
-
-			if ((path.Length == 0 || path [0] != '/') && baseEl.delimiter == SchemeDelimiter)
-				path = "/" + path;
-
-			source += UriHelper.Reduce (path, !IriParsing);
-
-			if (relativeEl.query != null) {
-				canUseBase = false;
-				source += "?" + relativeEl.query;
-			} else if (canUseBase && baseEl.query != null)
-				source += "?" + baseEl.query;
-
-			if (relativeEl.fragment != null)
-				source += "#" + relativeEl.fragment;
-			else if (canUseBase && baseEl.fragment != null)
-				source += "#" + baseEl.fragment;
-
-			ParseUri (UriKind.Absolute);
-
-			return;
-		}
-		
-		// Properties
-		
-		public string AbsolutePath { 
-			get {
-				EnsureAbsoluteUri ();
-				if (scheme == "mailto" || scheme == "file")
-					// faster (mailto) and special (file) cases
-					return path;
-				
-				if (path.Length == 0) {
-					string start = scheme + SchemeDelimiter;
-					if (path.StartsWith (start, StringComparison.Ordinal))
-						return "/";
-					else
-						return String.Empty;
-				}
-				return path;
-			}
-		}
-
-		public string AbsoluteUri { 
-			get { 
-				EnsureAbsoluteUri ();
-
-				if (cachedAbsoluteUri == null)
-					cachedAbsoluteUri = GetComponents (UriComponents.AbsoluteUri, UriFormat.UriEscaped);
-
-				return cachedAbsoluteUri;
-			} 
-		}
-
-		public string Authority { 
-			get { 
-				EnsureAbsoluteUri ();
-				return (GetDefaultPort (Scheme) == port)
-				     ? host : host + ":" + port;
-			} 
-		}
-
-		public string Fragment { 
-			get { 
-				EnsureAbsoluteUri ();
-				return fragment; 
-			} 
-		}
-
-		public string Host { 
-			get { 
-				EnsureAbsoluteUri ();
-				return host; 
-			} 
-		}
-
-		public UriHostNameType HostNameType { 
-			get {
-				EnsureAbsoluteUri ();
-				UriHostNameType ret = CheckHostName (Host);
-				if (ret != UriHostNameType.Unknown)
-					return ret;
-
-				if (scheme == "mailto")
-					return UriHostNameType.Basic;
-				return (IsFile) ? UriHostNameType.Basic : ret;
-			} 
-		}
-
-		public bool IsDefaultPort { 
-			get {
-				EnsureAbsoluteUri ();
-				return GetDefaultPort (Scheme) == port;
-			}
-		}
-
-		public bool IsFile { 
-			get {
-				EnsureAbsoluteUri ();
-				return (Scheme == UriSchemeFile);
-			}
-		}
-
-		public bool IsLoopback { 
-			get {
-				EnsureAbsoluteUri ();
-				
-				if (Host.Length == 0) {
-					return IsFile;
-				}
-
-				if (host == "loopback" || host == "localhost") 
-					return true;
-
-				IPAddress result;
-				if (IPAddress.TryParse (host, out result))
-					if (IPAddress.Loopback.Equals (result))
-						return true;
-
-				IPv6Address result6;
-				if (IPv6Address.TryParse (host, out result6)){
-					if (IPv6Address.IsLoopback (result6))
-						return true;
-				}
-
-				return false;
-			} 
-		}
-
-		public bool IsUnc {
-			// rule: This should be true only if
-			//   - uri string starts from "\\", or
-			//   - uri string starts from "//" (Samba way)
-			get { 
-				EnsureAbsoluteUri ();
-				return isUnc; 
-			} 
-		}
-
-		private bool IsLocalIdenticalToAbsolutePath ()
-		{
-			if (IsFile)
-				return false;
-
-			if ((scheme == Uri.UriSchemeNews) || (scheme == Uri.UriSchemeNntp) || (scheme == Uri.UriSchemeFtp))
-				return false;
-
-			return IsWellFormedOriginalString ();
-		}
-
-		public string LocalPath { 
-			get {
-				EnsureAbsoluteUri ();
-				if (cachedLocalPath != null)
-					return cachedLocalPath;
-
-				var formatFlags = UriHelper.FormatFlags.NoSlashReplace;
-
-				if (userEscaped)
-					formatFlags |= UriHelper.FormatFlags.UserEscaped;
-
-				string unescapedPath = UriHelper.FormatAbsolute (path, scheme,
-					UriComponents.Path, UriFormat.Unescaped, formatFlags);
-
-				if (path.StartsWith ("/", StringComparison.Ordinal) &&
-					!unescapedPath.StartsWith ("/", StringComparison.Ordinal))
-					unescapedPath = "/" + unescapedPath;
-
-				if (IsLocalIdenticalToAbsolutePath ()) {
-					cachedLocalPath = unescapedPath;
-					return cachedLocalPath;
-				}
-
-				if (!IsUnc) {
-					bool windows = (path.Length > 3 && path [1] == ':' &&
-						(path [2] == '\\' || path [2] == '/'));
-
-					if (windows)
-						cachedLocalPath = unescapedPath.Replace ('/', '\\');
-					else
-						cachedLocalPath = unescapedPath;
-				} else {
-					// support *nix and W32 styles
-					if (path.Length > 1 && path [1] == ':')
-						cachedLocalPath = unescapedPath.Replace (Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-
-					// LAMESPEC: ok, now we cannot determine
-					// if such URI like "file://foo/bar" is
-					// Windows UNC or unix file path, so
-					// they should be handled differently.
-					else if (System.IO.Path.DirectorySeparatorChar == '\\') {
-						string h = host;
-						if (path.Length > 0) {
-							if ((path.Length > 1) || (path[0] != '/')) {
-								h += unescapedPath.Replace ('/', '\\');
-							}
-						}
-						cachedLocalPath = "\\\\" + h;
-					}  else
-						cachedLocalPath = unescapedPath;
-				}
-				if (cachedLocalPath.Length == 0)
-					cachedLocalPath = Path.DirectorySeparatorChar.ToString ();
-				return cachedLocalPath;
-			} 
-		}
-
-		public string PathAndQuery { 
-			get {
-				EnsureAbsoluteUri ();
-				return path + Query;
-			} 
-		}
-
-		public int Port { 
-			get { 
-				EnsureAbsoluteUri ();
-				return port; 
-			} 
-		}
-
-		public string Query { 
-			get { 
-				EnsureAbsoluteUri ();
-				return query; 
-			}
-		}
-
-		public string Scheme { 
-			get { 
-				EnsureAbsoluteUri ();
-				return scheme; 
-			} 
-		}
-
-		public string [] Segments { 
-			get { 
-				EnsureAbsoluteUri ();
-
-				// return a (pre-allocated) empty array
-				if (path.Length == 0)
-#if BOOTSTRAP_BASIC
-					return Empty;
-#else
-					return EmptyArray<string>.Value;
-#endif
-				// do not return the original array (since items can be changed)
-				if (segments != null)
-					return segments.ToArray ();
-
-				List<string> list = new List<string> ();
-				StringBuilder current = new StringBuilder ();
-				for (int i = 0; i < path.Length; i++) {
-					switch (path [i]) {
-					case '/':
-					case '\\':
-						current.Append (path [i]);
-						list.Add (current.ToString ());
-						current.Length = 0;
-						break;
-					case '%':
-						if ((i < path.Length - 2) && (path [i + 1] == '5' && path [i + 2] == 'C')) {
-							current.Append ("%5C");
-							list.Add (current.ToString ());
-							current.Length = 0;
-							i += 2;
-						} else {
-							current.Append ('%');
-						}
-						break;
-					default:
-						current.Append (path [i]);
-						break;
-					}
-				}
-
-				if (current.Length > 0)
-					list.Add (current.ToString ());
-
-				if (IsFile && (list.Count > 0)) {
-					string first = list [0];
-					if ((first.Length > 1) && (first [1] == ':')) {
-						list.Insert (0, "/");
-					}
-				}
-				segments = list;
-				return segments.ToArray ();
-			} 
-		}
-
-		public bool UserEscaped { 
-			get { return userEscaped; } 
-		}
-
-		public string UserInfo { 
-			get { 
-				EnsureAbsoluteUri ();
-				return userinfo == null ? String.Empty : userinfo;
-			}
-		}
-		
-		public string DnsSafeHost {
-			get {
-				EnsureAbsoluteUri ();
-				string host = Host;
-				if (HostNameType == UriHostNameType.IPv6) {
-					host = Host.Substring (1, Host.Length - 2);
-					if (scope_id != 0)
-						host += "%" + scope_id.ToString ();
-				}
-				return Unescape (host);
-			}
-		}
-
-		public bool IsAbsoluteUri {
-			get { return isAbsoluteUri; }
-		}
-
-		public string OriginalString {
-			get { return source; }
-		}
-
-		// Methods		
-
-		public static UriHostNameType CheckHostName (string name) 
-		{
-			if (name == null || name.Length == 0)
-				return UriHostNameType.Unknown;
-
-			if (IsIPv4Address (name)) 
-				return UriHostNameType.IPv4;
-				
-			if (IsDomainAddress (name))
-				return UriHostNameType.Dns;				
-				
-			IPv6Address addr;
-			if (IPv6Address.TryParse (name, out addr))
-				return UriHostNameType.IPv6;
-			
-			return UriHostNameType.Unknown;
-		}
-		
-		internal static bool IsIPv4Address (string name)
-		{
-			string [] captures = name.Split (new char [] {'.'});
-			if (captures.Length != 4)
-				return false;
-
-			for (int i = 0; i < 4; i++) {
-				int length;
-
-				length = captures [i].Length;
-				if (length == 0)
-					return false;
-				uint number;
-				if (!UInt32.TryParse (captures [i], out number))
-					return false;
-				if (number > 255)
-					return false;
-			}
-			return true;
-		}			
-				
-		internal static bool IsDomainAddress (string name)
-		{
-			int len = name.Length;
-			
-			int count = 0;
-			for (int i = 0; i < len; i++) {
-				char c = name [i];
-				if (count == 0) {
-					if (!Char.IsLetterOrDigit (c))
-						return false;
-				} else if (c == '.') {
-					// www..host.com is bad
-					if (i + 1 < len && name [i + 1] == '.')
-						return false;
-					count = 0;
-					continue;
-				} else if (!Char.IsLetterOrDigit (c) && c != '-' && c != '_') {
-					return false;
-				}
-				if (++count == 64)
-					return false;
-			}
-			
-			return true;
-		}
-#if !NET_2_1
-
-		[Obsolete ("This method does nothing, it has been obsoleted")]
-		protected virtual void Canonicalize ()
-		{
-			//
-			// This is flagged in the Microsoft documentation as used
-			// internally, no longer in use, and Obsolete.
-			//
-		}
-
-		[MonoTODO ("Find out what this should do")]
-		[Obsolete]
-		protected virtual void CheckSecurity ()
-		{
-		}
-
-#endif // NET_2_1
-
-		// defined in RFC3986 as = ALPHA *( ALPHA / DIGIT / "+" / "-" / ".")
-		public static bool CheckSchemeName (string schemeName) 
-		{
-			if (schemeName == null || schemeName.Length == 0)
-				return false;
-			
-			if (!IsAlpha (schemeName [0]))
-				return false;
-
-			int len = schemeName.Length;
-			for (int i = 1; i < len; i++) {
-				char c = schemeName [i];
-				if (!Char.IsDigit (c) && !IsAlpha (c) && c != '.' && c != '+' && c != '-')
-					return false;
-			}
-			
-			return true;
-		}
-
-		private static bool IsAlpha (char c)
-		{
-			// as defined in rfc2234
-			// %x41-5A / %x61-7A (A-Z / a-z)
-			int i = (int) c;
-			return (((i >= 0x41) && (i <= 0x5A)) || ((i >= 0x61) && (i <= 0x7A)));
-		}
-
-		// taken from referencesource/System/net/System/URI.cs
-		private static bool IsAsciiLetter(char character) {
-
-			return  (character >= 'a' && character <= 'z') ||
-					(character >= 'A' && character <= 'Z');
-		}
-
-		internal static bool IsAsciiLetterOrDigit(char character) {
-			return IsAsciiLetter (character) || (character >= '0' && character <= '9');
-		}
-		//
-
-		public override bool Equals (object comparand) 
-		{
-			if (comparand == null) 
-				return false;
-
-			Uri uri = comparand as Uri;
-			if ((object) uri == null) {
-				string s = comparand as String;
-				if (s == null)
-					return false;
-
-				if (!TryCreate (s, UriKind.RelativeOrAbsolute, out uri))
-					return false;
-			}
-
-			return InternalEquals (uri);
-		}
-
-		// Assumes: uri != null
-		bool InternalEquals (Uri uri)
-		{
-			if (this.isAbsoluteUri != uri.isAbsoluteUri)
-				return false;
-			if (!this.isAbsoluteUri)
-				return this.source == uri.source;
-
-			CultureInfo inv = CultureInfo.InvariantCulture;
-			return this.scheme.ToLower (inv) == uri.scheme.ToLower (inv)
-				&& this.host.ToLower (inv) == uri.host.ToLower (inv)
-				&& this.port == uri.port
-				&& this.query == uri.query
-				&& this.path == uri.path;
-		}
-
-		public static bool operator == (Uri uri1, Uri uri2)
-		{
-			return object.Equals (uri1, uri2);
-		}
-
-		public static bool operator != (Uri uri1, Uri uri2)
-		{
-			return !(uri1 == uri2);
-		}
-
-		public override int GetHashCode () 
-		{
-			if (cachedHashCode == 0) {
-				CultureInfo inv = CultureInfo.InvariantCulture;
-				if (isAbsoluteUri) {
-					cachedHashCode = scheme.ToLower (inv).GetHashCode ()
-						^ host.ToLower (inv).GetHashCode ()
-						^ port
-						^ query.GetHashCode ()
-						^ path.GetHashCode ();
-				}
-				else {
-					cachedHashCode = source.GetHashCode ();
-				}
-			}
-			return cachedHashCode;
-		}
-		
-		public string GetLeftPart (UriPartial part) 
-		{
-			EnsureAbsoluteUri ();
-			int defaultPort;
-			switch (part) {				
-			case UriPartial.Scheme : 
-				return scheme + GetOpaqueWiseSchemeDelimiter ();
-			case UriPartial.Authority :
-				if ((scheme == Uri.UriSchemeMailto) || (scheme == Uri.UriSchemeNews))
-					return String.Empty;
-					
-				StringBuilder s = new StringBuilder ();
-				s.Append (scheme);
-				s.Append (GetOpaqueWiseSchemeDelimiter ());
-				if (path.Length > 1 && path [1] == ':' && (Uri.UriSchemeFile == scheme)) 
-					s.Append ('/');  // win32 file
-				if (userinfo != null) 
-					s.Append (userinfo).Append ('@');
-				s.Append (host);
-				defaultPort = GetDefaultPort (scheme);
-				if ((port != -1) && (port != defaultPort))
-					s.Append (':').Append (port);			 
-				return s.ToString ();				
-			case UriPartial.Path :
-				StringBuilder sb = new StringBuilder ();
-				sb.Append (scheme);
-				sb.Append (GetOpaqueWiseSchemeDelimiter ());
-				if (path.Length > 1 && path [1] == ':' && (Uri.UriSchemeFile == scheme)) 
-					sb.Append ('/');  // win32 file
-				if (userinfo != null) 
-					sb.Append (userinfo).Append ('@');
-				sb.Append (host);
-				defaultPort = GetDefaultPort (scheme);
-				if ((port != -1) && (port != defaultPort))
-					sb.Append (':').Append (port);
-
-				if (path.Length > 0) {
-					if (scheme == "mailto" || scheme == "news")
-						sb.Append (path);
-					else 
-						sb.Append (Reduce (path, CompactEscaped (scheme)));
-				}
-				return sb.ToString ();
-			}
-			return null;
-		}
-
-		public static int FromHex (char digit) 
-		{
-			if ('0' <= digit && digit <= '9') {
-				return (int) (digit - '0');
-			}
-				
-			if ('a' <= digit && digit <= 'f')
-				return (int) (digit - 'a' + 10);
-
-			if ('A' <= digit && digit <= 'F')
-				return (int) (digit - 'A' + 10);
-				
-			throw new ArgumentException ("digit");
-		}
-
-		public static string HexEscape (char character) 
-		{
-			if (character > 255) {
-				throw new ArgumentOutOfRangeException ("character");
-			}
-			
-			return "%" + hexUpperChars [((character & 0xf0) >> 4)] 
-			           + hexUpperChars [((character & 0x0f))];
-		}
-
-		public static char HexUnescape (string pattern, ref int index) 
-		{
-			if (pattern == null) 
-				throw new ArgumentException ("pattern");
-				
-			if (index < 0 || index >= pattern.Length)
-				throw new ArgumentOutOfRangeException ("index");
-
-			if (!IsHexEncoding (pattern, index))
-				return pattern [index++];
-
-			index++;
-			int msb = FromHex (pattern [index++]);
-			int lsb = FromHex (pattern [index++]);
-			return (char) ((msb << 4) | lsb);
-		}
-
-		public static bool IsHexDigit (char character) 
-		{
-			return (('0' <= character && character <= '9') ||
-			        ('a' <= character && character <= 'f') ||
-			        ('A' <= character && character <= 'F'));
-		}
-
-		public static bool IsHexEncoding (string pattern, int index) 
-		{
-			if ((index + 3) > pattern.Length)
-				return false;
-
-			return ((pattern [index++] == '%') &&
-			        IsHexDigit (pattern [index++]) &&
-			        IsHexDigit (pattern [index]));
-		}
-
-		//
-		// Implemented by copying most of the MakeRelative code
-		//
-		public Uri MakeRelativeUri (Uri uri)
-		{
-			if (uri == null)
-				throw new ArgumentNullException ("uri");
-			if (Host != uri.Host || Scheme != uri.Scheme)
-				return uri;
-
-			string result = String.Empty;
-			if (this.path != uri.path){
-				string [] segments = this.Segments;
-				string [] segments2 = uri.Segments;
-				
-				int k = 0;
-				int max = Math.Min (segments.Length, segments2.Length);
-				for (; k < max; k++)
-					if (segments [k] != segments2 [k]) 
-						break;
-				
-				for (int i = k; i < segments.Length && segments [i].EndsWith ("/", StringComparison.Ordinal); i++)
-					result += "../";
-				for (int i = k; i < segments2.Length; i++)
-					result += segments2 [i];
-				
-				if (result == string.Empty)
-					result = "./";
-			}
-			uri.AppendQueryAndFragment (ref result);
-
-			return new Uri (result, UriKind.Relative);
-		}
-
-		[Obsolete ("Use MakeRelativeUri(Uri uri) instead.")]
-		public string MakeRelative (Uri toUri) 
-		{
-			if ((this.Scheme != toUri.Scheme) ||
-			    (this.Authority != toUri.Authority))
-				return toUri.ToString ();
-
-			string result = String.Empty;
-			if (this.path != toUri.path){
-				string [] segments = this.Segments;
-				string [] segments2 = toUri.Segments;
-				int k = 0;
-				int max = Math.Min (segments.Length, segments2.Length);
-				for (; k < max; k++)
-					if (segments [k] != segments2 [k]) 
-						break;
-				
-				for (int i = k + 1; i < segments.Length; i++)
-					result += "../";
-				for (int i = k; i < segments2.Length; i++)
-					result += segments2 [i];
-			}
-
-			// Important: MakeRelative does not append fragment or query.
-
-			return result;
-		}
-
-		void AppendQueryAndFragment (ref string result)
-		{
-			if (query.Length > 0) {
-				string q = query [0] == '?' ? '?' + Unescape (query.Substring (1), true, false) : Unescape (query, false);
-				result += q;
-			}
-			if (fragment.Length > 0)
-				result += Unescape (fragment, true, false);
-		}
-		
-		public override string ToString () 
-		{
-			if (cachedToString != null) 
-				return cachedToString;
-
-			if (isAbsoluteUri) {
-				if (Parser is DefaultUriParser)
-					cachedToString = Parser.GetComponentsHelper (this, UriComponents.AbsoluteUri, UriHelper.ToStringUnescape);
-				else
-					cachedToString = Parser.GetComponents (this, UriComponents.AbsoluteUri, UriFormat.SafeUnescaped);
-			} else
-				cachedToString = UriHelper.FormatRelative (source, scheme, UriHelper.ToStringUnescape);
-
-			return cachedToString;
-		}
-
-		protected void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			if (this.isAbsoluteUri) {
-				serializationInfo.AddValue ("AbsoluteUri", this.AbsoluteUri);
-			} else {
-				serializationInfo.AddValue ("AbsoluteUri", String.Empty);
-				serializationInfo.AddValue ("RelativeUri", this.OriginalString);
-			}
-		}
-
-		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
-		{
-			GetObjectData (info, context);
-		}
-
-
-		// Internal Methods		
-
-		[Obsolete]
-		protected virtual void Escape ()
-		{
-			path = EscapeString (path);
-		}
-
-		[Obsolete]
-		protected static string EscapeString (string str) 
-		{
-			return EscapeString (str, Uri.EscapeCommonHexBrackets);
-		}
-
-		private const string EscapeCommon = "<>%\"{}|\\^`";
-		private const string EscapeReserved = ";/?:@&=+$,";
-		private const string EscapeFragment = "#";
-		private const string EscapeBrackets = "[]";
-
-		private const string EscapeNews = EscapeCommon + EscapeBrackets + "?";
-		private const string EscapeCommonHex = EscapeCommon + EscapeFragment;
-		private const string EscapeCommonBrackets = EscapeCommon + EscapeBrackets;
-		internal const string EscapeCommonHexBrackets = EscapeCommon + EscapeFragment + EscapeBrackets;
-		internal const string EscapeCommonHexBracketsQuery = EscapeCommonHexBrackets + "?";
-
-		internal static string EscapeString (string str, string escape)
-		{
-			return EscapeString (str, escape, true);
-		}
-
-		internal static string EscapeString (string str, string escape, bool nonAsciiEscape) 
-		{
-			if (String.IsNullOrEmpty (str))
-				return String.Empty;
-			
-			StringBuilder s = new StringBuilder ();
-			int len = str.Length;	
-			for (int i = 0; i < len; i++) {
-				// reserved    = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | ","
-				// mark        = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
-				// control     = <US-ASCII coded characters 00-1F and 7F hexadecimal>
-				// space       = <US-ASCII coded character 20 hexadecimal>
-				// delims      = "<" | ">" | "#" | "%" | <">
-				// unwise      = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`"
-
-				// check for escape code already placed in str, 
-				// i.e. for encoding that follows the pattern 
-				// "%hexhex" in a string, where "hex" is a digit from 0-9 
-				// or a letter from A-F (case-insensitive).
-				if (IsHexEncoding (str,i)) {
-					// if ,yes , copy it as is
-					s.Append (str.Substring (i, 3));
-					i += 2;
-					continue;
-				}
-
-				char c = str [i];
-				bool outside_limited_ascii = ((c <= 0x20) || (c >= 0x7f));
-				bool needs_escape = (escape.IndexOf (c) != -1);
-				if (nonAsciiEscape && outside_limited_ascii) {
-					byte [] data = Encoding.UTF8.GetBytes (new char [] { c });
-					int length = data.Length;
-					for (int j = 0; j < length; j++) {
-						c = (char) data [j];
-						if (needs_escape || nonAsciiEscape)
-							s.Append (HexEscape (c));
-						else
-							s.Append (c);
-					}
-				} else if (needs_escape) {
-					s.Append (HexEscape (c));
-				} else {
-					s.Append (c);
-				}
-			}
-			
-			return s.ToString ();
-		}
-
-		// On .NET 1.x, this method is called from .ctor(). When overriden, we 
-		// can avoid the "absolute uri" constraints of the .ctor() by
-		// overriding with custom code.
-		[Obsolete("The method has been deprecated. It is not used by the system.")]
-		protected virtual void Parse ()
-		{
-		}
-
-		private void ParseUri (UriKind kind)
-		{
-			Parse (kind, source);
-
-			if (host.Length > 1 && host [0] != '[' && host [host.Length - 1] != ']') {
-				// host name present (but not an IPv6 address)
-				host = host.ToLower (CultureInfo.InvariantCulture);
-			}
-		}
-
-		[Obsolete]
-		protected virtual string Unescape (string path)
-		{
-			var formatFlags = UriHelper.FormatFlags.NoSlashReplace | UriHelper.FormatFlags.NoReduce;
-			return UriHelper.FormatAbsolute (path, scheme, UriComponents.Path, UriFormat.Unescaped, formatFlags);
-		}
-
-		internal static string Unescape (string str, bool excludeSpecial)
-		{
-			return Unescape (str, excludeSpecial, excludeSpecial);
-		}
-		
-		internal static string Unescape (string str, bool excludeSpecial, bool excludeBackslash) 
-		{
-			if (String.IsNullOrEmpty (str))
-				return String.Empty;
-
-			StringBuilder s = new StringBuilder ();
-			int len = str.Length;
-			for (int i = 0; i < len; i++) {
-				char c = str [i];
-				if (c == '%') {
-					char surrogate;
-					char x = HexUnescapeMultiByte (str, ref i, out surrogate);
-					if (excludeSpecial && x == '#')
-						s.Append ("%23");
-					else if (excludeSpecial && x == '%')
-						s.Append ("%25");
-					else if (excludeSpecial && x == '?')
-						s.Append ("%3F");
-					else if (excludeBackslash && x == '\\')
-						s.Append ("%5C");
-					else {
-						s.Append (x);
-						if (surrogate != char.MinValue)
-							s.Append (surrogate);
-					}
-					i--;
-				} else
-					s.Append (c);
-			}
-			return s.ToString ();
-		}
-
-		
-		// Private Methods
-		
-		private void ParseAsWindowsUNC (string uriString)
-		{
-			scheme = UriSchemeFile;
-			port = -1;
-			fragment = String.Empty;
-			query = String.Empty;
-			isUnc = true;
-
-			uriString = uriString.TrimStart (new char [] {'\\'});
-			int pos = uriString.IndexOf ('\\');
-			if (pos > 0) {
-				path = uriString.Substring (pos);
-				host = uriString.Substring (0, pos);
-			} else { // "\\\\server"
-				host = uriString;
-				path = String.Empty;
-			}
-			path = path.Replace ("\\", "/");
-		}
-
-		//
-		// Returns null on success, string with error on failure
-		//
-		private string ParseAsWindowsAbsoluteFilePath (string uriString)
-		{
-			if (uriString.Length > 2 && uriString [2] != '\\' && uriString [2] != '/')
-				return "Relative file path is not allowed.";
-			scheme = UriSchemeFile;
-			host = String.Empty;
-			port = -1;
-			path = uriString.Replace ("\\", "/");
-			fragment = String.Empty;
-			query = String.Empty;
-
-			return null;
-		}
-
-		private void ParseAsUnixAbsoluteFilePath (string uriString)
-		{
-			scheme = UriSchemeFile;
-			port = -1;
-			fragment = String.Empty;
-			query = String.Empty;
-			host = String.Empty;
-			path = null;
-
-			if (uriString.Length >= 2 && uriString [0] == '/' && uriString [1] == '/') {
-				uriString = uriString.TrimStart (new char [] {'/'});
-				// Now we don't regard //foo/bar as "foo" host.
-				/* 
-				int pos = uriString.IndexOf ('/');
-				if (pos > 0) {
-					path = '/' + uriString.Substring (pos + 1);
-					host = uriString.Substring (0, pos);
-				} else { // "///server"
-					host = uriString;
-					path = String.Empty;
-				}
-				*/
-				path = '/' + uriString;
-			}
-			if (path == null)
-				path = uriString;
-		}
-
-		//
-		// This parse method will throw exceptions on failure
-		//  
-		private void Parse (UriKind kind, string uriString)
-		{			
-			if (uriString == null)
-				throw new ArgumentNullException ("uriString");
-
-			string s = ParseNoExceptions (kind, uriString);
-			if (s != null)
-				throw new UriFormatException (s);
-		}
-
-		private bool SupportsQuery ()
-		{
-			return UriHelper.SupportsQuery (scheme);
-		}
-
-
-		private string ParseNoExceptions (UriKind kind, string uriString)
-		{
-			UriElements elements;
-			string error;
-			if (!UriParseComponents.TryParseComponents (source, kind, out elements, out error))
-				return error;
-
-			scheme = elements.scheme;
-			var parser = UriParser.GetParser (scheme);
-			if (parser != null && !(parser is DefaultUriParser)) {
-				userinfo = Parser.GetComponents (this, UriComponents.UserInfo, UriFormat.UriEscaped);
-				host = Parser.GetComponents (this, UriComponents.Host, UriFormat.UriEscaped);
-
-				var portStr = Parser.GetComponents (this, UriComponents.StrongPort, UriFormat.UriEscaped);
-				if (!string.IsNullOrEmpty (portStr))
-					port = int.Parse (portStr);
-
-				path = Parser.GetComponents (this, UriComponents.Path | UriComponents.KeepDelimiter, UriFormat.UriEscaped);
-				query = Parser.GetComponents (this, UriComponents.Query, UriFormat.UriEscaped);
-				fragment = Parser.GetComponents (this, UriComponents.StrongPort, UriFormat.UriEscaped);
-
-				return null;
-			}
-
-			var formatFlags = UriHelper.FormatFlags.None;
-			if (UriHelper.HasCharactersToNormalize (uriString))
-				formatFlags |= UriHelper.FormatFlags.HasUriCharactersToNormalize;
-
-			if (userEscaped)
-				formatFlags |= UriHelper.FormatFlags.UserEscaped;
-
-			if (elements.host != null)
-				formatFlags |= UriHelper.FormatFlags.HasHost;
-
-			userinfo = elements.user;
-
-			if (elements.host != null) {
-				host = UriHelper.FormatAbsolute (elements.host, scheme,
-					UriComponents.Host, UriFormat.UriEscaped, formatFlags);
-			}
-
-			port = elements.port;
-
-			if (port == -1)
-				port = GetDefaultPort (scheme);
-
-			if (elements.path != null) {
-				path = UriHelper.FormatAbsolute (elements.path, scheme,
-					UriComponents.Path, UriFormat.UriEscaped, formatFlags);
-				if (elements.delimiter == SchemeDelimiter && string.IsNullOrEmpty (path))
-					path = "/";
-			}
-
-			if (elements.query != null) {
-				query = "?" + UriHelper.FormatAbsolute (elements.query, scheme,
-					UriComponents.Query, UriFormat.UriEscaped, formatFlags);
-			}
-
-			if (elements.fragment != null) {
-				fragment = "#" + UriHelper.FormatAbsolute (elements.fragment, scheme,
-					UriComponents.Fragment, UriFormat.UriEscaped, formatFlags);
-			}
-
-			isAbsoluteUri = elements.isAbsoluteUri;
-			isUnc = elements.isUnc;
-			scope_id = elements.scopeId;
-
-			return null;
-		}
-		
-		private static string TryGetKnownUriSchemeInstance (string scheme)
-		{
-			foreach (string knownScheme in knownUriSchemes) {
-				if (knownScheme == scheme)
-					return knownScheme;
-			}
-			
-			return scheme;
-		}
-	
-		private static bool CompactEscaped (string scheme)
-		{
-			if (scheme == null || scheme.Length < 4)
-				return false;
-
-			char first = scheme [0];
-			if (first == 'h'){
-				return scheme == "http" || scheme == "https";
-			} else if (first == 'f' && scheme == "file"){
-				return true;
-			} else if (first == 'n')
-				return scheme == "net.pipe" || scheme == "net.tcp";
-
-			return false;
-		}
-
-		// replace '\', %5C ('\') and %2f ('/') into '/'
-		// replace %2e ('.') into '.'
-		private static string NormalizePath (string path)
-		{
-			StringBuilder res = new StringBuilder ();
-			for (int i = 0; i < path.Length; i++) {
-				char c = path [i];
-				switch (c) {
-				case '\\':
-					c = '/';
-					break;
-				case '%':
-					if (i < path.Length - 2) {
-						char c1 = path [i + 1];
-						char c2 = Char.ToUpper (path [i + 2]);
-						if ((c1 == '2') && (c2 == 'E')) {
-							c = '.';
-							i += 2;
-						} else if (((c1 == '2') && (c2 == 'F')) || ((c1 == '5') && (c2 == 'C'))) {
-							c = '/';
-							i += 2;
-						}
-					}
-					break;
-				}
-				res.Append (c);
-			}
-			return res.ToString ();
-		}
-
-		// This is called "compacting" in the MSDN documentation
-		private static string Reduce (string path, bool compact_escaped)
-		{
-			// quick out, allocation-free, for a common case
-			if (path == "/")
-				return path;
-
-			if (compact_escaped && (path.IndexOf ('%') != -1)) {
-				// replace '\', %2f, %5c with '/' and replace %2e with '.'
-				// other escaped values seems to survive this step
-				path = NormalizePath (path);
-			} else {
-				// (always) replace '\' with '/'
-				path = path.Replace ('\\', '/');
-			}
-
-			List<string> result = new List<string> ();
-
-			bool begin = true;
-			for (int startpos = 0; startpos < path.Length; ) {
-				int endpos = path.IndexOf ('/', startpos);
-				if (endpos == -1)
-					endpos = path.Length;
-				string current = path.Substring (startpos, endpos-startpos);
-				startpos = endpos + 1;
-				if ((begin && current.Length == 0) || current == "." ) {
-					begin = false;
-					continue;
-				}
-
-				begin = false;
-				if (current == "..") {
-					int resultCount = result.Count;
-					// in 2.0 profile, skip leading ".." parts
-					if (resultCount == 0) {
-						continue;
-					}
-
-					result.RemoveAt (resultCount - 1);
-					continue;
-				}
-
-				result.Add (current);
-			}
-
-			if (result.Count == 0)
-				return "/";
-
-			StringBuilder res = new StringBuilder ();
-
-			if (path [0] == '/')
-				res.Append ('/');
-
-			bool first = true;
-			foreach (string part in result) {
-				if (first) {
-					first = false;
-				} else {
-					res.Append ('/');
-				}
-				res.Append (part);
-			}
-
-			if (path [path.Length - 1] == '/')
-				res.Append ('/');
-				
-			return res.ToString ();
-		}
-
-		// A variant of HexUnescape() which can decode multi-byte escaped
-		// sequences such as (e.g.) %E3%81%8B into a single character
-		internal static char HexUnescapeMultiByte (string pattern, ref int index, out char surrogate) 
-		{
-			bool invalidEscape;
-			return HexUnescapeMultiByte (pattern, ref index, out surrogate, out invalidEscape);
-		}
-
-		internal static char HexUnescapeMultiByte (string pattern, ref int index, out char surrogate, out bool invalidEscape)
-		{
-			surrogate = char.MinValue;
-			invalidEscape = false;
-
-			if (pattern == null) 
-				throw new ArgumentException ("pattern");
-				
-			if (index < 0 || index >= pattern.Length)
-				throw new ArgumentOutOfRangeException ("index");
-
-			if (!IsHexEncoding (pattern, index))
-				return pattern [index++];
-
-			int orig_index = index++;
-			int msb = FromHex (pattern [index++]);
-			int lsb = FromHex (pattern [index++]);
-
-			// We might be dealing with a multi-byte character:
-			// The number of ones at the top-end of the first byte will tell us
-			// how many bytes will make up this character.
-			int msb_copy = msb;
-			int num_bytes = 0;
-			while ((msb_copy & 0x8) == 0x8) {
-				num_bytes++;
-				msb_copy <<= 1;
-			}
-
-			// We might be dealing with a single-byte character:
-			// If there was only 0 or 1 leading ones then we're not dealing
-			// with a multi-byte character.
-			if (num_bytes <= 1) {
-				var c = (char) ((msb << 4) | lsb);
-				invalidEscape = c > 0x7F;
-				return c;
-			}
-
-			// Now that we know how many bytes *should* follow, we'll check them
-			// to ensure we are dealing with a valid multi-byte character.
-			byte [] chars = new byte [num_bytes];
-			bool all_invalid = false;
-			chars[0] = (byte) ((msb << 4) | lsb);
-
-			for (int i = 1; i < num_bytes; i++) {
-				if (!IsHexEncoding (pattern, index++)) {
-					all_invalid = true;
-					break;
-				}
-
-				// All following bytes must be in the form 10xxxxxx
-				int cur_msb = FromHex (pattern [index++]);
-				if ((cur_msb & 0xc) != 0x8) {
-					all_invalid = true;
-					break;
-				}
-
-				int cur_lsb = FromHex (pattern [index++]);
-				chars[i] = (byte) ((cur_msb << 4) | cur_lsb);
-			}
-
-			// If what looked like a multi-byte character is invalid, then we'll
-			// just return the first byte as a single byte character.
-			if (all_invalid) {
-				invalidEscape = true;
-				index = orig_index + 3;
-				return (char) chars[0];
-			}
-
-			// Otherwise, we're dealing with a valid multi-byte character.
-			// We need to ignore the leading ones from the first byte:
-			byte mask = (byte) 0xFF;
-			mask >>= (num_bytes + 1);
-			int result = chars[0] & mask;
-
-			// The result will now be built up from the following bytes.
-			for (int i = 1; i < num_bytes; i++) {
-				// Ignore upper two bits
-				result <<= 6;
-				result |= (chars[i] & 0x3F);
-			}
-
-			if (result <= 0xFFFF) {
-				return (char) result;
-			} else {
-				// We need to handle this as a UTF16 surrogate (i.e. return
-				// two characters)
-				result -= 0x10000;
-				surrogate = (char) ((result & 0x3FF) | 0xDC00);
-				return (char) ((result >> 10) | 0xD800);
-			}
-		}
-
-		private struct UriScheme 
-		{
-			public string scheme;
-			public string delimiter;
-			public int defaultPort;
-
-			public UriScheme (string s, string d, int p) 
-			{
-				scheme = s;
-				delimiter = d;
-				defaultPort = p;
-			}
-		};
-
-		static UriScheme [] schemes = new UriScheme [] {
-			new UriScheme (UriSchemeHttp, SchemeDelimiter, 80),
-			new UriScheme (UriSchemeHttps, SchemeDelimiter, 443),
-			new UriScheme (UriSchemeFtp, SchemeDelimiter, 21),
-			new UriScheme (UriSchemeFile, SchemeDelimiter, -1),
-			new UriScheme (UriSchemeMailto, ":", 25),
-			new UriScheme (UriSchemeNews, ":", 119),
-			new UriScheme (UriSchemeUuid, ":", -1),
-			new UriScheme (UriSchemeNntp, SchemeDelimiter, 119),
-			new UriScheme (UriSchemeGopher, SchemeDelimiter, 70),
-		};
-				
-		internal static string GetSchemeDelimiter (string scheme) 
-		{
-			for (int i = 0; i < schemes.Length; i++) 
-				if (schemes [i].scheme == scheme)
-					return schemes [i].delimiter;
-			return Uri.SchemeDelimiter;
-		}
-		
-		internal static int GetDefaultPort (string scheme)
-		{
-			UriParser parser = UriParser.GetParser (scheme);
-			if (parser == null)
-				return -1;
-			return parser.DefaultPort;
-		}
-
-		private string GetOpaqueWiseSchemeDelimiter ()
-		{
-			return GetSchemeDelimiter (scheme);
-		}
-
-		[Obsolete]
-		protected virtual bool IsBadFileSystemCharacter (char character)
-		{
-			// It does not always overlap with InvalidPathChars.
-			int chInt = (int) character;
-			if (chInt < 32 || (chInt < 64 && chInt > 57))
-				return true;
-			switch (chInt) {
-			case 0:
-			case 34: // "
-			case 38: // &
-			case 42: // *
-			case 44: // ,
-			case 47: // /
-			case 92: // \
-			case 94: // ^
-			case 124: // |
-				return true;
-			}
-
-			return false;
-		}
-
-		[Obsolete]
-		protected static bool IsExcludedCharacter (char character)
-		{
-			if (character <= 32 || character >= 127)
-				return true;
-			
-			if (character == '"' || character == '#' || character == '%' || character == '<' ||
-			    character == '>' || character == '[' || character == '\\' || character == ']' ||
-			    character == '^' || character == '`' || character == '{' || character == '|' ||
-			    character == '}')
-				return true;
-			return false;
-		}
-
-		internal static bool MaybeUri (string s)
-		{
-			int p = s.IndexOf (':');
-			if (p == -1)
-				return false;
-
-			if (p >= 10)
-				return false;
-
-			return IsPredefinedScheme (s.Substring (0, p));
-		}
-		
-		//
-		// Using a simple block of if's is twice as slow as the compiler generated
-		// switch statement.   But using this tuned code is faster than the
-		// compiler generated code, with a million loops on x86-64:
-		//
-		// With "http": .10 vs .51 (first check)
-		// with "https": .16 vs .51 (second check)
-		// with "foo": .22 vs .31 (never found)
-		// with "mailto": .12 vs .51  (last check)
-		//
-		//
-		private static bool IsPredefinedScheme (string scheme)
-		{
-			if (scheme == null || scheme.Length < 3)
-				return false;
-			
-			char c = scheme [0];
-			if (c == 'h')
-				return (scheme == "http" || scheme == "https");
-			if (c == 'f')
-				return (scheme == "file" || scheme == "ftp");
-				
-			if (c == 'n'){
-				c = scheme [1];
-				if (c == 'e')
-					return (scheme == "news" || scheme == "net.pipe" || scheme == "net.tcp");
-				if (scheme == "nntp")
-					return true;
-				return false;
-			}
-			if ((c == 'g' && scheme == "gopher") || (c == 'm' && scheme == "mailto"))
-				return true;
-
-			return false;
-		}
-
-		[Obsolete]
-		protected virtual bool IsReservedCharacter (char character)
-		{
-			if (character == '$' || character == '&' || character == '+' || character == ',' ||
-			    character == '/' || character == ':' || character == ';' || character == '=' ||
-			    character == '@')
-				return true;
-			return false;
-		}
-
-		[NonSerialized]
-		private UriParser parser;
-
-		private UriParser Parser {
-			get {
-				if (parser == null) {
-					parser = UriParser.GetParser (scheme);
-					// no specific parser ? then use a default one
-					if (parser == null)
-						parser = new DefaultUriParser ("*");
-				}
-				return parser;
-			}
-			set { parser = value; }
-		}
-
-		public string GetComponents (UriComponents components, UriFormat format)
-		{
-			if ((components & UriComponents.SerializationInfoString) == 0)
-				EnsureAbsoluteUri ();
-
-			return Parser.GetComponents (this, components, format);
-		}
-
-		public bool IsBaseOf (Uri uri)
-		{
-			if (uri == null)
-				throw new ArgumentNullException ("uri");
-			return Parser.IsBaseOf (this, uri);
-		}
-
-		public bool IsWellFormedOriginalString ()
-		{
-			// funny, but it does not use the Parser's IsWellFormedOriginalString().
-			// Also, it seems we need to *not* escape hex.
-			return EscapeString (OriginalString, EscapeCommonBrackets) == OriginalString;
-		}
-
-		// static methods
-
-		private const int MaxUriLength = 0xfff0;
-
-		public static int Compare (Uri uri1, Uri uri2, UriComponents partsToCompare, UriFormat compareFormat, StringComparison comparisonType)
-		{
-			if ((comparisonType < StringComparison.CurrentCulture) || (comparisonType > StringComparison.OrdinalIgnoreCase)) {
-				string msg = Locale.GetText ("Invalid StringComparison value '{0}'", comparisonType);
-				throw new ArgumentException ("comparisonType", msg);
-			}
-
-			if ((uri1 == null) && (uri2 == null))
-				return 0;
-			if (uri1 == null)
-				return -1;
-			if (uri2 == null)
-				return 1;
-
-			string s1 = uri1.GetComponents (partsToCompare, compareFormat);
-			string s2 = uri2.GetComponents (partsToCompare, compareFormat);
-			return String.Compare (s1, s2, comparisonType);
-		}
-
-		//
-		// The rules for EscapeDataString
-		//
-		static bool NeedToEscapeDataChar (char b)
-		{
-			if ((b >= 'A' && b <= 'Z') ||
-				(b >= 'a' && b <= 'z') ||
-				(b >= '0' && b <= '9'))
-				return false;
-
-			switch (b) {
-			case '-':
-			case '.':
-			case '_':
-			case '~':
-				return false;
-			}
-
-
-			return true;
-		}
-		
-		public static string EscapeDataString (string stringToEscape)
-		{
-			if (stringToEscape == null)
-				throw new ArgumentNullException ("stringToEscape");
-
-			if (stringToEscape.Length >= MaxUriLength) {
-				throw new UriFormatException (string.Format ("Uri is longer than the maximum {0} characters.", MaxUriLength));
-			}
-
-			bool escape = false;
-			foreach (char c in stringToEscape){
-				if (NeedToEscapeDataChar (c)){
-					escape = true;
-					break;
-				}
-			}
-			if (!escape){
-				return stringToEscape;
-			}
-			
-			StringBuilder sb = new StringBuilder ();
-			byte [] bytes = Encoding.UTF8.GetBytes (stringToEscape);
-			foreach (byte b in bytes){
-				if (NeedToEscapeDataChar ((char) b))
-					sb.Append (HexEscape ((char) b));
-				else
-					sb.Append ((char) b);
-			}
-			return sb.ToString ();
-		}
-
-		//
-		// The rules for EscapeUriString
-		//
-		static bool NeedToEscapeUriChar (char b)
-		{
-			if ((b >= 'A' && b <= 'Z') || (b >= 'a' && b <= 'z') || (b >= '&' && b <= ';'))
-				return false;
-
-			switch (b) {
-			case '!':
-			case '#':
-			case '$':
-			case '=':
-			case '?':
-			case '@':
-			case '_':
-			case '~':
-				return false;
-			case '[':
-			case ']':
-				return false;
-			}
-
-			return true;
-		}
-		
-		public static string EscapeUriString (string stringToEscape)
-		{
-			if (stringToEscape == null)
-				throw new ArgumentNullException ("stringToEscape");
-
-			if (stringToEscape.Length >= MaxUriLength) {
-				throw new UriFormatException (string.Format ("Uri is longer than the maximum {0} characters.", MaxUriLength));
-			}
-
-			bool escape = false;
-			foreach (char c in stringToEscape){
-				if (NeedToEscapeUriChar (c)){
-					escape = true;
-					break;
-				}
-			}
-			if (!escape)
-				return stringToEscape;
-
-			StringBuilder sb = new StringBuilder ();
-			byte [] bytes = Encoding.UTF8.GetBytes (stringToEscape);
-			foreach (byte b in bytes){
-				if (NeedToEscapeUriChar ((char) b))
-					sb.Append (HexEscape ((char) b));
-				else
-					sb.Append ((char) b);
-			}
-			return sb.ToString ();
-		}
-
-		public static bool IsWellFormedUriString (string uriString, UriKind uriKind)
-		{
-			if (uriString == null)
-				return false;
-
-			Uri uri;
-			if (Uri.TryCreate (uriString, uriKind, out uri))
-				return uri.IsWellFormedOriginalString ();
-			return false;
-		}
-
-		public static bool TryCreate (string uriString, UriKind uriKind, out Uri result)
-		{
-			bool success;
-
-			Uri r = new Uri (uriString, uriKind, out success);
-			if (success) {
-				result = r;
-				return true;
-			}
-			result = null;
-			return false;
-		}
-
-		// [MonoTODO ("rework code to avoid exception catching")]
-		public static bool TryCreate (Uri baseUri, string relativeUri, out Uri result)
-		{
-			result = null;
-			if (relativeUri == null)
-				return false;
-
-			try {
-				Uri relative = new Uri (relativeUri, UriKind.RelativeOrAbsolute);
-				if ((baseUri != null) && baseUri.IsAbsoluteUri) {
-					// FIXME: this should call UriParser.Resolve
-					result = new Uri (baseUri, relative);
-				} else if (relative.IsAbsoluteUri) {
-					// special case - see unit tests
-					result = relative;
-				}
-				return (result != null);
-			} catch (UriFormatException) {
-				return false;
-			}
-		}
-
-		//[MonoTODO ("rework code to avoid exception catching")]
-		public static bool TryCreate (Uri baseUri, Uri relativeUri, out Uri result)
-		{
-			result = null;
-			if ((baseUri == null) || !baseUri.IsAbsoluteUri)
-				return false;
-			if (relativeUri == null)
-				return false;
-			try {
-				// FIXME: this should call UriParser.Resolve
-				result = new Uri (baseUri, relativeUri.OriginalString);
-				return true;
-			} catch (UriFormatException) {
-				return false;
-			}
-		}
-
-		public static string UnescapeDataString (string stringToUnescape)
-		{
-			return UnescapeDataString (stringToUnescape, false);
-		}
-
-		internal static string UnescapeDataString (string stringToUnescape, bool safe)
-		{
-			if (stringToUnescape == null)
-				throw new ArgumentNullException ("stringToUnescape");
-
-			if (stringToUnescape.IndexOf ('%') == -1 && stringToUnescape.IndexOf ('+') == -1)
-				return stringToUnescape;
-
-			StringBuilder output = new StringBuilder ();
-			long len = stringToUnescape.Length;
-			MemoryStream bytes = new MemoryStream ();
-			int xchar;
-
-			for (int i = 0; i < len; i++) {
-				if (stringToUnescape [i] == '%' && i + 2 < len && stringToUnescape [i + 1] != '%') {
-					if (stringToUnescape [i + 1] == 'u' && i + 5 < len) {
-						if (bytes.Length > 0) {
-							output.Append (GetChars (bytes, Encoding.UTF8));
-							bytes.SetLength (0);
-						}
-
-						xchar = GetChar (stringToUnescape, i + 2, 4, safe);
-						if (xchar != -1) {
-							output.Append ((char) xchar);
-							i += 5;
-						}
-						else {
-							output.Append ('%');
-						}
-					}
-					else if ((xchar = GetChar (stringToUnescape, i + 1, 2, safe)) != -1) {
-						bytes.WriteByte ((byte) xchar);
-						i += 2;
-					}
-					else {
-						output.Append ('%');
-					}
-					continue;
-				}
-
-				if (bytes.Length > 0) {
-					output.Append (GetChars (bytes, Encoding.UTF8));
-					bytes.SetLength (0);
-				}
-
-				output.Append (stringToUnescape [i]);
-			}
-
-			if (bytes.Length > 0) {
-				output.Append (GetChars (bytes, Encoding.UTF8));
-			}
-
-			bytes = null;
-			return output.ToString ();
-		}
-
-		private static int GetInt (byte b)
-		{
-			char c = (char) b;
-			if (c >= '0' && c <= '9')
-				return c - '0';
-
-			if (c >= 'a' && c <= 'f')
-				return c - 'a' + 10;
-
-			if (c >= 'A' && c <= 'F')
-				return c - 'A' + 10;
-
-			return -1;
-		}
-
-		private static int GetChar (string str, int offset, int length, bool safe)
-		{
-			int val = 0;
-			int end = length + offset;
-			for (int i = offset; i < end; i++) {
-				char c = str [i];
-				if (c > 127)
-					return -1;
-
-				int current = GetInt ((byte) c);
-				if (current == -1)
-					return -1;
-				val = (val << 4) + current;
-			}
-
-			if (!safe)
-				return val;
-
-			switch ((char) val) {
-			case '%':
-			case '#':
-			case '?':
-			case '/':
-			case '\\':
-			case '@':
-			case '&': // not documented
-				return -1;
-			default:
-				return val;
-			}
-		}
-
-		private static char [] GetChars (MemoryStream b, Encoding e)
-		{
-			return e.GetChars (b.GetBuffer (), 0, (int) b.Length);
-		}
-		
-
-		private void EnsureAbsoluteUri ()
-		{
-			if (!IsAbsoluteUri)
-				throw new InvalidOperationException ("This operation is not supported for a relative URI.");
-		}
-	}
-}
diff --git a/mcs/class/System/System/UriBuilder.cs b/mcs/class/System/System/UriBuilder.cs
deleted file mode 100644
index 6d878731991..00000000000
--- a/mcs/class/System/System/UriBuilder.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-//
-// System.UriBuilder
-//
-// Author:
-//   Lawrence Pit (loz@cable.a2000.nl)
-//
-// Copyright (C) 2005, 2010 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Runtime.Serialization;
-using System.Text;
-
-// See RFC 2396 for more info on URI's.
-
-namespace System 
-{
-	public class UriBuilder
-	{
-		private string scheme;
-		private string host;
-		private int port;
-		private string path;
-		private string query;
-		private string fragment;
-		private string username;
-		private string password;
-		
-		private Uri uri;
-		private bool modified;
-		
-		
-		// Constructors
-		
-		public UriBuilder ()
-		{
-			Initialize (Uri.UriSchemeHttp, "localhost", -1, String.Empty, String.Empty);
-		}
-
-		public UriBuilder (string uri)
-		{
-			if (uri == null)
-				throw new ArgumentNullException ("uriString");
-
-			Uri u = null;
-			if (Uri.TryCreate (uri, UriKind.Absolute, out u)) {
-				Initialize (u);
-			} else if (!uri.Contains (Uri.SchemeDelimiter)) {
-				// second chance, UriBuilder parsing is more forgiving than Uri
-				Initialize (new Uri (Uri.UriSchemeHttp + Uri.SchemeDelimiter + uri));
-			} else
-				throw new UriFormatException ();
-		}
-		
-		public UriBuilder (Uri uri)
-		{
-			if (uri == null)
-				throw new ArgumentNullException ("uri");
-			Initialize (uri);
-		}
-		
-		public UriBuilder (string schemeName, string hostName) 
-		{
-			Initialize (schemeName, hostName, -1, String.Empty, String.Empty);
-		}
-
-		public UriBuilder (string scheme, string host, int portNumber) 
-		{
-			Initialize (scheme, host, portNumber, String.Empty, String.Empty);
-		}
-		
-		public UriBuilder (string scheme, string host, int port, string pathValue)
-		{
-			Initialize (scheme, host, port, pathValue, String.Empty);
-		}
-
-		public UriBuilder (string scheme, string host, int port, string path, string extraValue)
-		{
-			Initialize (scheme, host, port, path, extraValue);
-		}
-
-		private void Initialize (Uri uri)
-		{
-			Initialize (uri.Scheme, uri.Host, uri.Port, uri.AbsolutePath, String.Empty);
-			fragment = uri.Fragment;
-			query = uri.Query;
-			username = uri.UserInfo;
-			int pos = username.IndexOf (':');
-			if (pos != -1) {
-				password = username.Substring (pos + 1);
-				username = username.Substring (0, pos);
-			} else {
-				password = String.Empty;
-			}
-		}
-
-		private void Initialize (string scheme, string host, int port, string pathValue, string extraValue)
-		{
-			modified = true;
-
-			Scheme = scheme;
-			Host = host;
-			Port = port;
-			Path = pathValue;
-			query = String.Empty;
-			fragment = String.Empty;
-			Path = pathValue;
-			username = String.Empty;
-			password = String.Empty;
-
-			if (String.IsNullOrEmpty (extraValue))
-				return;
-
-			if (extraValue [0] == '#')
-				Fragment = extraValue.Remove (0, 1);
-			else if (extraValue [0] == '?')
-				Query = extraValue.Remove (0, 1);
-			else
-				throw new ArgumentException ("extraValue");
-		}
-		
-		// Properties
-		
-		public string Fragment {
-			get { return fragment; }
-			set {
-				fragment = value;
-				if (fragment == null)
-					fragment = String.Empty;
-				else if (fragment.Length > 0)
-					fragment = "#" + value.Replace ("%23", "#");
-				modified = true;
-			}
-		}
-
-		public string Host {
-			get { return host; }
-			set {
-				if (String.IsNullOrEmpty (value))
-					host = String.Empty;
-				else if ((value.IndexOf (':') != -1) && (value [0] != '[')) {
-					host = "[" + value + "]";
-				} else {
-					host = value;
-				}
-				modified = true;
-			}
-		}
-
-		public string Password {
-			get { return password; }
-			set {
-				password = (value == null) ? String.Empty : value;
-			}
-		}
-		
-		public string Path {
-			get { return path; }
-			set {
-				if (value == null || value.Length == 0) {
-					path = "/";
-				} else {
-					path = Uri.EscapeString (value.Replace ('\\', '/'), Uri.EscapeCommonHexBracketsQuery);
-				}
-				modified = true;
-			}
-		}
-		
-		public int Port {
-			get { return port; }
-			set {
-				if (value < -1)
-					throw new ArgumentOutOfRangeException ("value");
-				// apparently it is
-				port = value;
-				modified = true;
-			}
-		}
-		
-		public string Query {
-			get { return query; }
-			set {
-				// LAMESPEC: it doesn't say to always prepend a 
-				// question mark to the value.. it does say this 
-				// for fragment.
-				if (value == null || value.Length == 0)
-					query = String.Empty;
-				else
-					query = "?" + value;
-				modified = true;
-			}
-		}
-		
-		public string Scheme {
-			get { return scheme; }
-			set {
-				if (value == null)
-					value = String.Empty;
-				int colonPos = value.IndexOf (':');
-				if (colonPos != -1)
-					value = value.Substring (0, colonPos);
-				scheme = value.ToLower ();
-				modified = true;
-			}
-		}
-		
-		public Uri Uri {
-			get {
-				if (!modified) 
-					return uri;
-				uri = new Uri (ToString ());
-				// some properties are updated once the Uri is created - see unit tests
-				host = uri.Host;
-				path = uri.AbsolutePath;
-				modified = false;
-				return uri;
-			}
-		}
-		
-		public string UserName {
-			get { return username; }
-			set {
-				username = (value == null) ? String.Empty : value;
-				modified = true;
-			}
-		}
-
-		// Methods
-		
-		public override bool Equals (object rparam) 
-		{
-			return (rparam == null) ? false : this.Uri.Equals (rparam.ToString ());
-		}
-		
-		public override int GetHashCode ()
-		{
-			return this.Uri.GetHashCode ();
-		}
-		
-		public override string ToString ()
-		{
-			StringBuilder builder = new StringBuilder ();
-
-			builder.Append (scheme);
-			// note: mailto and news use ':', not "://", as their delimiter
-			if (UriParser.IsKnownScheme(scheme)) {
-				builder.Append (Uri.GetSchemeDelimiter (scheme));
-			}
-			else {
-				builder.Append (host.Length > 0 ? Uri.SchemeDelimiter : ":");
-			}
-
-			if (username != String.Empty) {
-				builder.Append (username);
-				if (password != String.Empty)
-					builder.Append (":" + password);
-				builder.Append ('@');
-			}
-
-			if (host.Length > 0) {
-				builder.Append (host);
-				if (port > 0)
-					builder.Append (":" + port);
-			}
-
-			if (path != String.Empty &&
-			    builder [builder.Length - 1] != '/' &&
-			    path.Length > 0 && path [0] != '/' &&
-				host.Length > 0)
-				builder.Append ('/');
-			builder.Append (path);
-			builder.Append (query);
-			builder.Append (fragment);
-
-			return builder.ToString ();
-		}
-	}
-}
diff --git a/mcs/class/System/System/UriData.cs b/mcs/class/System/System/UriData.cs
deleted file mode 100644
index d23ce33b237..00000000000
--- a/mcs/class/System/System/UriData.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// System.UriData class
-//
-// Author:
-//	Raja R Harinath <harinath@hurrynot.org>
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections;
-using System.Globalization;
-using System.Security.Permissions;
-using System.Text;
-
-namespace System {
-	class UriData : IUriData {
-		Uri uri;
-		UriParser parser;
-
-		public UriData (Uri uri, UriParser parser)
-		{
-			this.uri = uri;
-			this.parser = parser;
-		}
-
-		string Lookup (ref string cache, UriComponents components)
-		{
-			return Lookup (ref cache, components, uri.UserEscaped ? UriFormat.Unescaped : UriFormat.UriEscaped);
-		}
-
-		string Lookup (ref string cache, UriComponents components, UriFormat format)
-		{
-			if (cache == null)
-				cache = parser.GetComponents (uri, components, format);
-			return cache;
-		}
-
-		string absolute_path;
-		public string AbsolutePath {
-			get { return Lookup ( ref absolute_path, UriComponents.Path | UriComponents.KeepDelimiter);
-			}
-		}
-
-		string absolute_uri;
-		public string AbsoluteUri {
-			get { return Lookup (ref absolute_uri, UriComponents.AbsoluteUri); }
-		}
-
-		string absolute_uri_unescaped;
-		public string AbsoluteUri_SafeUnescaped {
-			get { return Lookup (ref absolute_uri_unescaped, UriComponents.AbsoluteUri, UriFormat.SafeUnescaped); }
-		}
-
-		string authority;
-		public string Authority {
-			get { return Lookup (ref authority, UriComponents.Host | UriComponents.Port); }
-		}
-
-		string fragment;
-		public string Fragment {
-			get { return Lookup (ref fragment, UriComponents.Fragment | UriComponents.KeepDelimiter); }
-		}
-
-		string host;
-		public string Host {
-			get { return Lookup (ref host, UriComponents.Host); }
-		}
-
-		string path_and_query;
-		public string PathAndQuery {
-			get { return Lookup (ref path_and_query, UriComponents.PathAndQuery); }
-		}
-
-		string strong_port;
-		public string StrongPort {
-			get { return Lookup (ref strong_port, UriComponents.StrongPort); }
-		}
-
-		string query;
-		public string Query {
-			get { return Lookup (ref query, UriComponents.Query | UriComponents.KeepDelimiter); }
-		}
-
-		string user_info;
-		public string UserInfo {
-			get { return Lookup (ref user_info, UriComponents.UserInfo); }
-		}
-	}
-}
diff --git a/mcs/class/System/System/UriElements.cs b/mcs/class/System/System/UriElements.cs
deleted file mode 100644
index ef810620a41..00000000000
--- a/mcs/class/System/System/UriElements.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Internal UriElements class
-//
-// Author:
-//	Vinicius Jarina  <vinicius.jarina@xamarin.com>
-//
-// Copyright (C) 2012 Xamarin, Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-	
-	internal class UriElements
-	{
-		public UriElements()
-		{
-			scheme = String.Empty;
-			delimiter = String.Empty;
-			host = String.Empty;
-			port = -1;
-			path = String.Empty;
-
-			isAbsoluteUri = true;
-		}
-		
-		public string scheme;
-		public string delimiter;
-		public string user;
-		public string host;
-		public int port;
-		public string path;
-		public string query;
-		public string fragment;
-
-		public bool isAbsoluteUri;
-		public bool isUnixFilePath;
-		public bool isUnc;
-		public long scopeId;
-	}
-}
diff --git a/mcs/class/System/System/UriHelper.cs b/mcs/class/System/System/UriHelper.cs
deleted file mode 100644
index 76a86f86b47..00000000000
--- a/mcs/class/System/System/UriHelper.cs
+++ /dev/null
@@ -1,596 +0,0 @@
-using System;
-using System.Globalization;
-using System.Text;
-using System.Collections.Generic;
-
-namespace System {
-	internal static class UriHelper {
-		internal const UriFormat ToStringUnescape = (UriFormat) 0x7FFF;
-
-		internal static bool IriParsing	{
-			get { return Uri.IriParsing; }
-		}
-
-		[Flags]
-		internal enum FormatFlags {
-			None = 0,
-			HasComponentCharactersToNormalize = 1 << 0,
-			HasUriCharactersToNormalize = 1 << 1,
-			HasHost = 1 << 2,
-			HasFragmentPercentage = 1 << 3,
-			UserEscaped = 1 << 4,
-			IPv6Host = 1 << 5,
-			NoSlashReplace = 1 << 6,
-			NoReduce = 1 << 7,
-			HasWindowsPath = 1 << 8,
-		}
-
-		[Flags]
-		internal enum UriSchemes {
-			Http = 1 << 0,
-			Https = 1 << 1,
-			File = 1 << 2,
-			Ftp = 1 << 3,
-			Gopher = 1 << 4,
-			Ldap = 1 << 5,
-			Mailto = 1 << 6,
-			NetPipe = 1 << 7,
-			NetTcp = 1 << 8,
-			News = 1 << 9,
-			Nntp = 1 << 10,
-			Telnet = 1 << 11,
-			Uuid = 1 << 12,
-			Custom = 1 << 13,
-			CustomWithHost = 1 << 14,
-			All = ~0,
-			None = 0
-		}
-
-		private static UriSchemes GetScheme (string schemeName)
-		{
-			schemeName = schemeName.ToLowerInvariant ();
-
-			if (schemeName == "")
-				return UriSchemes.None;
-			if (schemeName == Uri.UriSchemeHttp)
-				return UriSchemes.Http;
-			if (schemeName == Uri.UriSchemeHttps)
-				return UriSchemes.Https;
-			if (schemeName == Uri.UriSchemeFile)
-				return UriSchemes.File;
-			if (schemeName == Uri.UriSchemeFtp)
-				return UriSchemes.Ftp;
-			if (schemeName == Uri.UriSchemeGopher)
-				return UriSchemes.Gopher;
-			if (schemeName == Uri.UriSchemeLdap)
-				return UriSchemes.Ldap;
-			if (schemeName == Uri.UriSchemeMailto)
-				return UriSchemes.Mailto;
-			if (schemeName == Uri.UriSchemeNetPipe)
-				return UriSchemes.NetPipe;
-			if (schemeName == Uri.UriSchemeNetTcp)
-				return UriSchemes.NetTcp;
-			if (schemeName == Uri.UriSchemeNews)
-				return UriSchemes.News;
-			if (schemeName == Uri.UriSchemeNntp)
-				return UriSchemes.Nntp;
-			if (schemeName == Uri.UriSchemeTelnet)
-				return UriSchemes.Telnet;
-			if (schemeName == Uri.UriSchemeUuid)
-				return UriSchemes.Uuid;
-
-			return UriSchemes.Custom;
-		}
-
-		internal static bool SchemeContains (UriSchemes keys, UriSchemes flag)
-		{
-			return (keys & flag) != 0;
-		}
-
-		internal static bool IsKnownScheme (string scheme)
-		{
-			return GetScheme (scheme) != UriSchemes.Custom;
-		}
-
-		internal static string HexEscapeMultiByte (char character)
-		{
-			const string hex_upper_chars = "0123456789ABCDEF";
-
-			var sb = new StringBuilder ();
-			byte [] bytes = Encoding.UTF8.GetBytes (new [] {character});
-			foreach (byte b in bytes) {
-				sb.Append ("%");
-				sb.Append (hex_upper_chars [(b & 0xf0) >> 4]);
-				sb.Append (hex_upper_chars [b & 0x0f]);
-			}
-
-			return sb.ToString ();
-		}
-
-		internal static bool SupportsQuery (string scheme)
-		{
-			return SupportsQuery (GetScheme (scheme));
-		}
-
-		internal static bool SupportsQuery (UriSchemes scheme)
-		{
-			if (SchemeContains (scheme, UriSchemes.File))
-				return IriParsing;
-
-			return !SchemeContains (scheme, UriSchemes.Ftp | UriSchemes.Gopher | UriSchemes.Nntp | UriSchemes.Telnet | UriSchemes.News);
-		}
-
-		internal static bool HasCharactersToNormalize (string str)
-		{
-			int len = str.Length;
-			for (int i = 0; i < len; i++) {
-				char c = str [i];
-				if (c != '%')
-					continue;
-
-				int iStart = i;
-				char surrogate;
-				char x = Uri.HexUnescapeMultiByte (str, ref i, out surrogate);
-
-				bool isEscaped = i - iStart > 1;
-				if (!isEscaped)
-					continue;
-
-				if ((x >= 'A' && x <= 'Z') || (x >= 'a' && x <= 'z') || (x >= '0' && x <= '9') || 
-					 x == '-' || x == '.' || x == '_' || x == '~')
-					return true;
-
-				if (x > 0x7f)
-					return true;
-			}
-
-			return false;
-		}
-
-		internal static bool HasPercentage (string str)
-		{
-			int len = str.Length;
-			for (int i = 0; i < len; i++) {
-				char c = str [i];
-				if (c != '%')
-					continue;
-
-				int iStart = i;
-				char surrogate;
-				char x = Uri.HexUnescapeMultiByte (str, ref i, out surrogate);
-
-				if (x == '%')
-					return true;
-
-				bool isEscaped = i - iStart > 1;
-				if (!isEscaped)
-					return true;
-			}
-
-			return false;
-		}
-
-		internal static string FormatAbsolute (string str, string schemeName,
-			UriComponents component, UriFormat uriFormat, FormatFlags formatFlags = FormatFlags.None)
-		{
-			return Format (str, schemeName, UriKind.Absolute, component, uriFormat, formatFlags);
-		}
-
-		internal static string FormatRelative (string str, string schemeName, UriFormat uriFormat)
-		{
-			return Format (str, schemeName, UriKind.Relative, UriComponents.Path, uriFormat, FormatFlags.None);
-		}
-
-		private static string Format (string str, string schemeName, UriKind uriKind,
-			UriComponents component, UriFormat uriFormat, FormatFlags formatFlags)
-		{
-			if (string.IsNullOrEmpty (str))
-				return "";
-
-			if (UriHelper.HasCharactersToNormalize (str))
-				formatFlags |= UriHelper.FormatFlags.HasComponentCharactersToNormalize | FormatFlags.HasUriCharactersToNormalize;
-
-			if (component == UriComponents.Fragment && UriHelper.HasPercentage (str))
-				formatFlags |= UriHelper.FormatFlags.HasFragmentPercentage;
-
-			if (component == UriComponents.Host &&
-				str.Length > 1 && str [0] == '[' && str [str.Length - 1] == ']')
-				 formatFlags |= UriHelper.FormatFlags.IPv6Host;
-
-			if (component == UriComponents.Path &&
-				str.Length >= 2 && str [1] != ':' &&
-				('a' <= str [0] && str [0] <= 'z') || ('A' <= str [0] && str [0] <= 'Z'))
-				formatFlags |= UriHelper.FormatFlags.HasWindowsPath;
-
-			UriSchemes scheme = GetScheme (schemeName);
-
-			if (scheme == UriSchemes.Custom && (formatFlags & FormatFlags.HasHost) != 0)
-				scheme = UriSchemes.CustomWithHost;
-
-			var reduceAfter = UriSchemes.Http | UriSchemes.Https | UriSchemes.File | UriSchemes.NetPipe | UriSchemes.NetTcp;
-
-			if (IriParsing) {
-				reduceAfter |= UriSchemes.Ftp;
-			} else if (component == UriComponents.Path &&
-				(formatFlags & FormatFlags.NoSlashReplace) == 0) {
-				if (scheme == UriSchemes.Ftp)
-					str = Reduce (str.Replace ('\\', '/'), !IriParsing);
-				if (scheme == UriSchemes.CustomWithHost)
-					str = Reduce (str.Replace ('\\', '/'), false);
-			}
-
-			str = FormatString (str, scheme, uriKind, component, uriFormat, formatFlags);
-
-			if (component == UriComponents.Path &&
-				(formatFlags & FormatFlags.NoReduce) == 0) {
-				if (SchemeContains (scheme, reduceAfter))
-					str = Reduce (str, !IriParsing);
-				if (IriParsing && scheme == UriSchemes.CustomWithHost)
-					str = Reduce (str, false);
-			}
-
-			return str;
-		}
-
-		private static string FormatString (string str, UriSchemes scheme, UriKind uriKind,
-			UriComponents component, UriFormat uriFormat, FormatFlags formatFlags)
-		{
-			var s = new StringBuilder ();
-			int len = str.Length;
-			for (int i = 0; i < len; i++) {
-				char c = str [i];
-				if (c == '%') {
-					int iStart = i;
-					char surrogate;
-					bool invalidUnescape;
-					char x = Uri.HexUnescapeMultiByte (str, ref i, out surrogate, out invalidUnescape);
-
-
-					if (invalidUnescape
-					) {
-						s.Append (c);
-						i = iStart;
-						continue;
-					}
-
-					string cStr = str.Substring (iStart, i-iStart);
-					s.Append (FormatChar (x, surrogate, cStr, scheme, uriKind, component, uriFormat, formatFlags));
-
-					i--;
-				} else
-					s.Append (FormatChar (c, char.MinValue, "" + c, scheme, uriKind, component, uriFormat, formatFlags));
-			}
-			
-			return s.ToString ();
-		}
-
-		private static string FormatChar (char c, char surrogate, string cStr, UriSchemes scheme, UriKind uriKind,
-			UriComponents component, UriFormat uriFormat, FormatFlags formatFlags)
-		{
-			var isEscaped = cStr.Length != 1;
-
-			var userEscaped = (formatFlags & FormatFlags.UserEscaped) != 0;
-			if (!isEscaped && !userEscaped && NeedToEscape (c, scheme, component, uriKind, uriFormat, formatFlags))
-				return HexEscapeMultiByte (c);
-
-			if (isEscaped && (
-				(userEscaped && c < 0xFF) ||
-				!NeedToUnescape (c, scheme, component, uriKind, uriFormat, formatFlags))) {
-				if (IriParsing &&
-					(c == '<' || c == '>' || c == '^' || c == '{' || c == '|' || c ==  '}' || c > 0x7F) &&
-					(formatFlags & FormatFlags.HasUriCharactersToNormalize) != 0)
-					return cStr.ToUpperInvariant (); //Upper case escape
-
-				return cStr; //Keep original case
-			}
-
-			if ((formatFlags & FormatFlags.NoSlashReplace) == 0 &&
-				c == '\\' && component == UriComponents.Path) {
-				if (!IriParsing && uriFormat != UriFormat.UriEscaped &&
-					SchemeContains (scheme, UriSchemes.Http | UriSchemes.Https))
-					return "/";
-
-				if (SchemeContains (scheme, UriSchemes.Http | UriSchemes.Https | UriSchemes.Ftp | UriSchemes.CustomWithHost))
-					return (isEscaped && uriFormat != UriFormat.UriEscaped) ? "\\" : "/";
-
-				if (SchemeContains (scheme, UriSchemes.NetPipe | UriSchemes.NetTcp | UriSchemes.File))
-					return "/";
-
-				if (SchemeContains (scheme, UriSchemes.Custom) &&
-					(formatFlags & FormatFlags.HasWindowsPath) == 0)
-					return "/";
-			}
-
-			var ret = c.ToString (CultureInfo.InvariantCulture);
-			if (surrogate != char.MinValue)
-				ret += surrogate.ToString (CultureInfo.InvariantCulture);
-
-			return ret;
-		}
-
-		private static bool NeedToUnescape (char c, UriSchemes scheme, UriComponents component, UriKind uriKind,
-			UriFormat uriFormat, FormatFlags formatFlags)
-		{
-			if ((formatFlags & FormatFlags.IPv6Host) != 0)
-				return false;
-
-			if (uriFormat == UriFormat.Unescaped)
-				return true;
-
-			UriSchemes sDecoders = UriSchemes.NetPipe | UriSchemes.NetTcp;
-
-			if (!IriParsing)
-				sDecoders |= UriSchemes.Http | UriSchemes.Https;
-
-			if (c == '/' || c == '\\') {
-				if (!IriParsing && uriKind == UriKind.Absolute && uriFormat != UriFormat.UriEscaped &&
-					uriFormat != UriFormat.SafeUnescaped)
-					return true;
-
-				if (SchemeContains (scheme, UriSchemes.File)) {
-					return component != UriComponents.Fragment &&
-						   (component != UriComponents.Query || !IriParsing);
-				}
-
-				return component != UriComponents.Query && component != UriComponents.Fragment &&
-					   SchemeContains (scheme, sDecoders);
-			}
-
-			if (c == '?') {
-				//Avoid creating new query
-				if (SupportsQuery (scheme) && component == UriComponents.Path)
-					return false;
-
-				if (!IriParsing && uriFormat == ToStringUnescape) {
-					if (SupportsQuery (scheme))
-						return component == UriComponents.Query || component == UriComponents.Fragment;
-
-					return component == UriComponents.Fragment;
-				}
-
-				return false;
-			}
-
-			if (c == '#')
-				return false;
-
-			if (uriFormat == ToStringUnescape && !IriParsing) {
-				if (uriKind == UriKind.Relative)
-					return false;
-
-				switch (c) {
-				case '$':
-				case '&':
-				case '+':
-				case ',':
-				case ';':
-				case '=':
-				case '@':
-					return true;
-				}
-
-				if (c < 0x20 || c == 0x7f)
-					return true;
-			}
-
-			if (uriFormat == UriFormat.SafeUnescaped || uriFormat == ToStringUnescape) {
-				switch (c) {
-				case '-':
-				case '.':
-				case '_':
-				case '~':
-					return true;
-				case ' ':
-				case '!':
-				case '"':
-				case '\'':
-				case '(':
-				case ')':
-				case '*':
-				case '<':
-				case '>':
-				case '^':
-				case '`':
-				case '{':
-				case '}':
-				case '|':
-					return uriKind != UriKind.Relative ||
-						(IriParsing && (formatFlags & FormatFlags.HasUriCharactersToNormalize) != 0);
-				case ':':
-				case '[':
-				case ']':
-					return uriKind != UriKind.Relative;
-				}
-
-				if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9'))
-					return true;
-
-				if (c > 0x7f)
-					return true;
-
-				return false;
-			}
-
-			if (uriFormat == UriFormat.UriEscaped) {
-				if (!IriParsing) {
-					if (c == '.') {
-						if (SchemeContains (scheme, UriSchemes.File))
-							return component != UriComponents.Fragment;
-
-						return component != UriComponents.Query && component != UriComponents.Fragment &&
-							   SchemeContains (scheme, sDecoders);
-					}
-
-					return false;
-				}
-				
-				switch (c) {
-				case '-':
-				case '.':
-				case '_':
-				case '~':
-					return true;
-				}
-
-				if ((formatFlags & FormatFlags.HasUriCharactersToNormalize) != 0) {
-					switch (c) {
-					case '!':
-					case '\'':
-					case '(':
-					case ')':
-					case '*':
-					case ':':
-					case '[':
-					case ']':
-						return true;
-					}
-				}
-
-				if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9'))
-					return true;
-
-				return false;
-			}
-
-			return false;
-		}
-
-		private static bool NeedToEscape (char c, UriSchemes scheme, UriComponents component, UriKind uriKind,
-			UriFormat uriFormat, FormatFlags formatFlags)
-		{
-			if ((formatFlags & FormatFlags.IPv6Host) != 0)
-				return false;
-
-			if (c == '?') {
-				if (uriFormat == UriFormat.Unescaped)
-					return false;
-
-				if (!SupportsQuery (scheme))
-					return component != UriComponents.Fragment;
-
-				return false;
-			}
-
-			if (c == '#') {
-				//Avoid removing fragment
-				if (component == UriComponents.Path || component == UriComponents.Query)
-					return false;
-
-				if (component == UriComponents.Fragment &&
-					(uriFormat == ToStringUnescape || uriFormat == UriFormat.SafeUnescaped) &&
-					(formatFlags & FormatFlags.HasFragmentPercentage) != 0)
-					return true;
-
-				return false;
-			}
-
-			if (uriFormat == UriFormat.SafeUnescaped || uriFormat == ToStringUnescape) {
-				if (c == '%')
-					return uriKind != UriKind.Relative;
-			}
-
-			if (uriFormat == UriFormat.SafeUnescaped) {
-				if (c < 0x20 || c == 0x7F)
-					return true;
-			}
-
-			if (uriFormat == UriFormat.UriEscaped) {
-				if (c < 0x20 || c >= 0x7F)
-					return component != UriComponents.Host;
-
-				switch (c) {
-				case ' ':
-				case '"':
-				case '%':
-				case '<':
-				case '>':
-				case '^':
-				case '`':
-				case '{':
-				case '}':
-				case '|':
-					return true;
-				case '[':
-				case ']':
-					return !IriParsing;
-				case '\\':
-					return component != UriComponents.Path ||
-						   SchemeContains (scheme,
-							   UriSchemes.Gopher | UriSchemes.Ldap | UriSchemes.Mailto | UriSchemes.Nntp |
-							   UriSchemes.Telnet | UriSchemes.News | UriSchemes.Custom);
-				}
-			}
-
-			return false;
-		}
-
-		// This is called "compacting" in the MSDN documentation
-		internal static string Reduce (string path, bool trimDots)
-		{
-			// quick out, allocation-free, for a common case
-			if (path == "/")
-				return path;
-
-			bool endWithSlash = false;
-
-			List<string> result = new List<string> ();
-
-			string[] segments = path.Split ('/');
-			int lastSegmentIndex = segments.Length - 1;
-			for (var i = 0; i <= lastSegmentIndex; i++) {
-				string segment = segments [i];
-
-				if (i == lastSegmentIndex &&
-					(segment.Length == 0 || segment == ".." || segment == "."))
-					endWithSlash = true;
-
-				if ((i == 0 || i == lastSegmentIndex) && segment.Length == 0)
-					continue;
-
-				if (segment == "..") {
-					int resultCount = result.Count;
-					// in 2.0 profile, skip leading ".." parts
-					if (resultCount == 0)
-						continue;
-
-					result.RemoveAt (resultCount - 1);
-					continue;
-				}
-
-				if (segment == "." ||
-					(trimDots && segment.EndsWith (".", StringComparison.Ordinal))) {
-					segment = segment.TrimEnd ('.');
-					if (segment == "" && i < lastSegmentIndex)
-						continue;
-				}
-
-				endWithSlash = false;
-
-				result.Add (segment);
-			}
-
-			if (result.Count == 0)
-				return "/";
-
-			StringBuilder res = new StringBuilder ();
-
-			if (path [0] == '/')
-				res.Append ('/');
-
-			bool first = true;
-			foreach (string part in result) {
-				if (first) {
-					first = false;
-				} else {
-					res.Append ('/');
-				}
-				res.Append (part);
-			}
-
-			if (path [path.Length - 1] == '/' || endWithSlash)
-				res.Append ('/');
-				
-			return res.ToString ();
-		}
-	}
-}
diff --git a/mcs/class/System/System/UriParseComponents.cs b/mcs/class/System/System/UriParseComponents.cs
deleted file mode 100644
index 593ef053eac..00000000000
--- a/mcs/class/System/System/UriParseComponents.cs
+++ /dev/null
@@ -1,566 +0,0 @@
-//
-// Internal UriParseComponents class
-//
-// Author:
-//	Vinicius Jarina  <vinicius.jarina@xamarin.com>
-//
-// Copyright (C) 2012 Xamarin, Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Globalization;
-
-namespace System {
-	
-	internal class ParserState
-	{
-		public ParserState (string uri, UriKind kind)
-		{
-			remaining = uri;
-			this.kind = kind;
-			elements  = new UriElements ();
-		}
-		
-		public string remaining;
-		public UriKind kind;
-		public UriElements elements;
-		public string error;
-	}
-	
-	// Parse Uri components (scheme, userinfo, host, query, fragment)
-	// http://www.ietf.org/rfc/rfc3986.txt
-	internal static class UriParseComponents
-	{
-		public static UriElements ParseComponents (string uri, UriKind kind)
-		{
-			UriElements elements;
-			string error;
-
-			if (!TryParseComponents (uri, kind, out elements, out error))
-				throw new UriFormatException (error);
-
-			return elements;
-		}
-
-		public static bool TryParseComponents (string uri, UriKind kind, out UriElements elements, out string error)
-		{
-			uri = uri.Trim ();
-
-			ParserState state = new ParserState (uri, kind);
-			elements = state.elements;
-			error = null;
-
-			if (uri.Length == 0 && (kind == UriKind.Relative || kind == UriKind.RelativeOrAbsolute)){
-				state.elements.isAbsoluteUri = false;
-				return true;
-			}
-			
-			if (uri.Length <= 1 && kind == UriKind.Absolute) {
-				error = "Absolute URI is too short";
-				return false;
-			}
-
-			bool ok = ParseFilePath (state) &&
-				ParseScheme (state);
-
-			var scheme = state.elements.scheme;
-			UriParser parser = null;
-			if (!string.IsNullOrEmpty (scheme)) {
-				parser = UriParser.GetParser (scheme);
-				if (parser != null && !(parser is DefaultUriParser))
-					return true;
-			}
-
-			ok = ok &&
-				ParseAuthority (state) &&
-				ParsePath (state) &&
-				ParseQuery (state) &&
-				ParseFragment (state);
-
-			if (string.IsNullOrEmpty (state.elements.host) &&
-				(scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeGopher || scheme == Uri.UriSchemeNntp ||
-				scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeFtp))
-				state.error = "Invalid URI: The Authority/Host could not be parsed.";
-
-			if (!string.IsNullOrEmpty (state.elements.host) &&
-				Uri.CheckHostName (state.elements.host) == UriHostNameType.Unknown)
-				state.error = "Invalid URI: The hostname could not be parsed.";
-
-			if (!string.IsNullOrEmpty (state.error)) {
-				elements = null;
-				error = state.error;
-				return false;
-			}
-			
-			return true;
-		}
-
-				// ALPHA
-		private static bool IsAlpha (char ch)
-		{
-			return (('a' <= ch) && (ch <= 'z')) ||
-				   (('A' <= ch) && (ch <= 'Z'));
-		}
-
-		private static bool ParseFilePath (ParserState state)
-		{
-			return ParseWindowsFilePath (state) &&
-				ParseWindowsUNC (state) &&
-				ParseUnixFilePath (state);
-		}
-
-		private static bool ParseWindowsFilePath (ParserState state)
-		{
-			var scheme = state.elements.scheme;
-
-			if (!string.IsNullOrEmpty (scheme) &&
-				 scheme != Uri.UriSchemeFile && UriHelper.IsKnownScheme (scheme))
-				return state.remaining.Length > 0;
-
-			string part = state.remaining;
-
-			if (part.Length > 0 && (part [0] == '/' || part [0] == '\\'))
-				part = part.Substring (1);
-
-			if (part.Length < 2 || part [1] != ':')
-				return state.remaining.Length > 0;
-
-			if (!IsAlpha (part [0])) {
-				if (state.kind == UriKind.Absolute) {
-					state.error = "Invalid URI: The URI scheme is not valid.";
-					return false;
-				}
-				state.elements.isAbsoluteUri = false;
-				state.elements.path = part;
-				return false;
-			}
-
-			if (part.Length > 2 && part [2] != '\\' && part [2] != '/') {
-				state.error = "Relative file path is not allowed.";
-				return false;
-			}
-
-			if (string.IsNullOrEmpty (scheme)) {
-				state.elements.scheme = Uri.UriSchemeFile;
-				state.elements.delimiter = "://";
-			}
-
-			state.elements.path = part.Replace ("\\", "/");
-
-			return false;
-		}
-
-		private static bool ParseWindowsUNC (ParserState state)
-		{
-			string part = state.remaining;
-
-			if (part.Length < 2 || part [0] != '\\' || part [1] != '\\')
-				return state.remaining.Length > 0;
-
-			state.elements.scheme = Uri.UriSchemeFile;
-			state.elements.delimiter = "://";
-			state.elements.isUnc = true;
-
-			part = part.TrimStart ('\\');
-			int pos = part.IndexOf ('\\');
-			if (pos > 0) {
-				state.elements.path = part.Substring (pos);
-				state.elements.host = part.Substring (0, pos);
-			} else { // "\\\\server"
-				state.elements.host = part;
-				state.elements.path = String.Empty;
-			}
-			state.elements.path = state.elements.path.Replace ("\\", "/");
-
-			return false;
-		}
-
-		private static bool ParseUnixFilePath (ParserState state)
-		{
-			string part = state.remaining;
-
-			if (part.Length < 1 || part [0] != '/' || Path.DirectorySeparatorChar != '/')
-				return state.remaining.Length > 0;
-
-			state.elements.scheme = Uri.UriSchemeFile;
-			state.elements.delimiter = "://";
-			state.elements.isUnixFilePath = true;
-			state.elements.isAbsoluteUri = (state.kind == UriKind.Relative)? false : true;
-
-			if (part.Length >= 2 && part [0] == '/' && part [1] == '/') {
-				part = part.TrimStart (new char [] {'/'});
-				state.elements.path = '/' + part;
-			} else
-				state.elements.path = part;
-
-			return false;
-		}
-		
-		// 3.1) scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-		private static bool ParseScheme (ParserState state)
-		{
-			string part = state.remaining;
-			
-			StringBuilder sb = new StringBuilder ();
-			sb.Append (part [0]);
-			
-			int index;
-			for (index = 1; index < part.Length; index++ ) {
-				char ch = part [index];
-				if (ch != '.' && ch != '-' && ch != '+' && !IsAlpha (ch) && !Char.IsDigit (ch))
-					break;
-				
-				sb.Append (ch);
-			}
-			
-			if (index == 0 || index >= part.Length) {
-				if (state.kind == UriKind.Absolute) {
-					state.error = "Invalid URI: The format of the URI could not be determined.";
-					return false;
-				}
-
-				state.elements.isAbsoluteUri = false;
-				return state.remaining.Length > 0;
-			}
-
-			if (part [index] != ':') {
-				if (state.kind == UriKind.Absolute) {
-					state.error = "Invalid URI: The URI scheme is not valid.";
-					return false;
-				}
-
-				state.elements.isAbsoluteUri = false;
-				return state.remaining.Length > 0;
-			}
-
-			state.elements.scheme = sb.ToString ().ToLowerInvariant ();
-			state.remaining = part.Substring (index);
-
-			// Check scheme name characters as specified in RFC2396.
-			// Note: different checks in 1.x and 2.0
-			if (!Uri.CheckSchemeName (state.elements.scheme)) {
-				if (state.kind == UriKind.Absolute) {
-					state.error = "Invalid URI: The URI scheme is not valid.";
-					return false;
-				}
-
-				state.elements.isAbsoluteUri = false;
-				return state.remaining.Length > 0;
-			}
-
-			return ParseDelimiter (state);
-		}
-
-		private static bool ParseDelimiter (ParserState state)
-		{
-			var delimiter = Uri.GetSchemeDelimiter (state.elements.scheme);
-
-			if (!state.remaining.StartsWith (delimiter, StringComparison.Ordinal)) {
-				if (UriHelper.IsKnownScheme (state.elements.scheme)) {
-					state.error = "Invalid URI: The Authority/Host could not be parsed.";
-					return false;
-				}
-
-				delimiter = ":";
-			}
-				
-			state.elements.delimiter = delimiter;
-
-			state.remaining = state.remaining.Substring (delimiter.Length);
-
-			return state.remaining.Length > 0;
-		}
-		
-		private static bool ParseAuthority (ParserState state)
-		{
-			if (state.elements.delimiter != Uri.SchemeDelimiter && state.elements.scheme != Uri.UriSchemeMailto)
-				return state.remaining.Length > 0;
-			
-			return ParseUser (state) &&
-				ParseHost (state) &&
-				ParsePort (state);
-		}
-
-		static bool IsUnreserved (char ch)
-		{
-			return ch == '-' || ch == '.' || ch == '_' || ch == '~';
-		}
-
-
-		static bool IsSubDelim (char ch)
-		{
-			return ch == '!' || ch == '$' || ch == '&' || ch == '\'' || ch == '(' || ch == ')' ||
-				ch == '*' || ch == '+' || ch == ',' || ch == ';' || ch == '=';
-		}
-		
-		// userinfo    = *( unreserved / pct-encoded / sub-delims / ":" )
-		private static bool ParseUser (ParserState state)
-		{
-			string part = state.remaining;
-			StringBuilder sb = null;
-
-			int index;
-			for (index = 0; index < part.Length; index++) {
-				char ch = part [index];
-				bool isEscapedChar = false;
-				var oldIndex = index;
-
-				// Spaces should be percentage encoded #31172
-				if (ch == ' ') {
-					if (sb == null)
-						sb = new StringBuilder ();
-					sb.Append ("%20");
-					continue;
-				}
-
-				if (ch == '%'){
-					if (!Uri.IsHexEncoding (part, index))
-						return false;
-					ch = Uri.HexUnescape (part, ref index);
-					index--;
-					isEscapedChar = true;
-				}
-
-				if (!Char.IsLetterOrDigit (ch) && !IsUnreserved (ch) && !IsSubDelim (ch) && ch != ':'){
-					if (!isEscapedChar)
-						break;
-
-					ch = '%';
-					index = oldIndex;
-				}
-
-				if (sb == null)
-					sb = new StringBuilder ();
-				sb.Append (ch);
-			}
-
-			if (index + 1 <= part.Length && part [index] == '@') {
-				if (state.elements.scheme == Uri.UriSchemeFile) {
-					state.error = "Invalid URI: The hostname could not be parsed.";
-					return false;
-				}
-
-				state.elements.user = sb == null ? "" : sb.ToString ();
-				state.remaining = state.remaining.Substring (index + 1);
-			}
-				
-			return state.remaining.Length > 0;
-		}
-		
-		// host        = IP-literal / IPv4address / reg-name
-		private static bool ParseHost (ParserState state)
-		{
-			string part = state.remaining;
-
-			if (state.elements.scheme == Uri.UriSchemeFile && part.Length >= 2 &&
-				(part [0] == '\\' || part [0] == '/') && part [1] == part [0]) {
-				part = part.TrimStart (part [0]);
-				state.remaining = part;
-			}
-
-			if (!ParseWindowsFilePath (state))
-				return false;
-
-			StringBuilder sb = new StringBuilder ();
-			
-			var tmpHost = "";
-
-			var possibleIpv6 = false;
-
-			int index;
-			for (index = 0; index < part.Length; index++) {	
-				
-				char ch = part [index];
-				
-				if (ch == '/' || ch == '#' || ch == '?')
-					break;
-
-				// Possible IPv6
-				if (string.IsNullOrEmpty (tmpHost) && ch == ':') {
-					tmpHost = sb.ToString ();
-					possibleIpv6 = true;
-				}
-				
-				sb.Append (ch);
-
-				if (possibleIpv6 && ch == ']')
-					break;
-			}
-			
-			if (possibleIpv6) {
-				IPv6Address ipv6addr;
-				if (IPv6Address.TryParse (sb.ToString (), out ipv6addr)) {
-					var ipStr = ipv6addr.ToString (false);
-					//remove scope
-					ipStr = ipStr.Split ('%') [0];
-
-					state.elements.host = "[" + ipStr + "]";
-					state.elements.scopeId = ipv6addr.ScopeId;
-
-					state.remaining = part.Substring (sb.Length);
-					return state.remaining.Length > 0;
-				}
-				state.elements.host = tmpHost;
-			} else
-				state.elements.host = sb.ToString ();
-
-			state.elements.host = state.elements.host.ToLowerInvariant ();
-
-			state.remaining = part.Substring (state.elements.host.Length);
-
-			if (state.elements.scheme == Uri.UriSchemeFile &&
-				state.elements.host != "") {
-				// under Windows all file://host URI are considered UNC, which is not the case other MacOS (e.g. Silverlight)
-#if BOOTSTRAP_BASIC
-				state.elements.isUnc = (Path.DirectorySeparatorChar == '\\');
-#else
-				state.elements.isUnc = Environment.IsRunningOnWindows;
-#endif
-			}
-
-			return state.remaining.Length > 0;
-		}
-		
-		// port          = *DIGIT
-		private static bool ParsePort (ParserState state)
-		{
-			string part = state.remaining;
-			if (part.Length == 0 || part [0] != ':')
-				return part.Length > 0;
-			
-			StringBuilder sb = new StringBuilder ();
-			
-			int index;
-			for (index = 1; index < part.Length; index++ ) {
-				char ch = part [index];
-				
-				if (!char.IsDigit (ch)) {
-					if (ch == '/' || ch == '#' || ch == '?')
-						break;
-
-					state.error = "Invalid URI: Invalid port specified.";
-					return false;
-				}
-				
-				sb.Append (ch);
-			}
-
-			if (index <= part.Length)
-				state.remaining = part.Substring (index);
-
-			if (sb.Length == 0)
-				return state.remaining.Length > 0;
-			
-			int port;
-			if (!Int32.TryParse (sb.ToString (), NumberStyles.None, CultureInfo.InvariantCulture, out port) ||
-				port < 0 || port > UInt16.MaxValue) {
-				state.error = "Invalid URI: Invalid port number";
-				return false;
-			}
-
-			state.elements.port = port;
-				
-			return state.remaining.Length > 0;
-		}
-		
-		private static bool ParsePath (ParserState state)
-		{
-			string part = state.remaining;
-			StringBuilder sb = new StringBuilder ();
-			
-			int index;
-			for (index = 0; index < part.Length; index++) {
-				
-				char ch = part [index];
-				
-				var supportsQuery = UriHelper.SupportsQuery (state.elements.scheme);
-
-				if (ch == '#' || (supportsQuery && ch == '?'))
-					break;
-				
-				sb.Append (ch);
-			}
-			
-			if (index <= part.Length)
-				state.remaining = part.Substring (index);
-			
-			state.elements.path  = sb.ToString ();
-				
-			return state.remaining.Length > 0;
-		}
-		
-		private static bool ParseQuery (ParserState state)
-		{
-			string part = state.remaining;
-
-			if (!UriHelper.SupportsQuery (state.elements.scheme))
-				return part.Length > 0;
-			
-			if (part.Length == 0 || part [0] != '?')
-				return part.Length > 0;
-			
-			StringBuilder sb = new StringBuilder ();
-			
-			int index;
-			for (index = 1; index < part.Length; index++) {
-				
-				char ch = part [index];
-				
-				if (ch == '#')
-					break;
-				
-				sb.Append (ch);
-			}
-			
-			if (index <= part.Length)
-				state.remaining = part.Substring (index);
-			
-			state.elements.query  = sb.ToString ();
-				
-			return state.remaining.Length > 0;
-		}
-		
-		private static bool ParseFragment (ParserState state)
-		{
-			string part = state.remaining;
-			
-			if (part.Length == 0 || part [0] != '#')
-				return part.Length > 0;
-			
-			StringBuilder sb = new StringBuilder ();
-			
-			int index;
-			for (index = 1; index < part.Length; index++) {	
-				
-				char ch = part [index];
-				
-				sb.Append (ch);
-			}
-			
-			state.elements.fragment = sb.ToString ();
-			
-			return false;
-		}
-	}
-}
diff --git a/mcs/class/System/System/UriParser.cs b/mcs/class/System/System/UriParser.cs
deleted file mode 100644
index 5eda9aadc17..00000000000
--- a/mcs/class/System/System/UriParser.cs
+++ /dev/null
@@ -1,359 +0,0 @@
-//
-// System.UriParser abstract class
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections;
-using System.Globalization;
-using System.Security.Permissions;
-using System.Text;
-
-namespace System {
-	public abstract class UriParser {
-
-		static object lock_object = new object ();
-		static Hashtable table;
-
-		internal string scheme_name;
-		private int default_port;
-
-		protected UriParser ()
-		{
-		}
-
-		// protected methods
-		protected internal virtual string GetComponents (Uri uri, UriComponents components, UriFormat format)
-		{
-			if ((format < UriFormat.UriEscaped) || (format > UriFormat.SafeUnescaped))
-				throw new ArgumentOutOfRangeException ("format");
-
-			if ((components & UriComponents.SerializationInfoString) != 0) {
-				if (components != UriComponents.SerializationInfoString)
-					throw new ArgumentOutOfRangeException ("components", "UriComponents.SerializationInfoString must not be combined with other UriComponents.");
-
-				if (!uri.IsAbsoluteUri)
-					return UriHelper.FormatRelative (uri.OriginalString, "", format);
-
-				components |= UriComponents.AbsoluteUri;
-			}
-
-			return GetComponentsHelper (uri, components, format);
-		}
-
-		internal string GetComponentsHelper (Uri uri, UriComponents components, UriFormat format)
-		{
-			UriElements elements = UriParseComponents.ParseComponents (uri.OriginalString.Trim (), UriKind.Absolute);
-
-			string scheme = scheme_name;
-			int dp = default_port;
-
-			if ((scheme == null) || (scheme == "*")) {
-				scheme = elements.scheme;
-				dp = Uri.GetDefaultPort (scheme);
-			} else if (String.Compare (scheme, elements.scheme, true) != 0) {
-				throw new SystemException ("URI Parser: scheme mismatch: " + scheme + " vs. " + elements.scheme);
-			}
-
-			var formatFlags = UriHelper.FormatFlags.None;
-			if (UriHelper.HasCharactersToNormalize (uri.OriginalString))
-				formatFlags |= UriHelper.FormatFlags.HasUriCharactersToNormalize;
-
-			if (uri.UserEscaped)
-				formatFlags |= UriHelper.FormatFlags.UserEscaped;
-
-			if (!string.IsNullOrEmpty (elements.host))
-				formatFlags |= UriHelper.FormatFlags.HasHost;
-
-			// it's easier to answer some case directly (as the output isn't identical 
-			// when mixed with others components, e.g. leading slash, # ...)
-			switch (components) {
-			case UriComponents.Scheme:
-				return scheme;
-			case UriComponents.UserInfo:
-				return elements.user ?? "";
-			case UriComponents.Host:
-				return elements.host;
-			case UriComponents.Port: {
-				int p = elements.port;
-				if (p >= 0 && p != dp)
-					return p.ToString (CultureInfo.InvariantCulture);
-				return String.Empty;
-			}
-			case UriComponents.Path:
-				var path = elements.path;
-				if (scheme != Uri.UriSchemeMailto && scheme != Uri.UriSchemeNews)
-					path = IgnoreFirstCharIf (elements.path, '/');
-				return UriHelper.FormatAbsolute (path, scheme, UriComponents.Path, format, formatFlags);
-			case UriComponents.Query:
-				return UriHelper.FormatAbsolute (elements.query, scheme, UriComponents.Query, format, formatFlags);
-			case UriComponents.Fragment:
-				return UriHelper.FormatAbsolute (elements.fragment, scheme, UriComponents.Fragment, format, formatFlags);
-			case UriComponents.StrongPort: {
-				return elements.port >= 0
-				? elements.port.ToString (CultureInfo.InvariantCulture)
-				: dp.ToString (CultureInfo.InvariantCulture);
-			}
-			case UriComponents.SerializationInfoString:
-				components = UriComponents.AbsoluteUri;
-				break;
-			}
-
-			// now we deal with multiple flags...
-
-			StringBuilder sb = new StringBuilder ();
-
-			if ((components & UriComponents.Scheme) != 0) {
-				sb.Append (scheme);
-				sb.Append (elements.delimiter);
-			}
-
-			if ((components & UriComponents.UserInfo) != 0) {
-				string userinfo = elements.user;
-				if (userinfo != null) {
-					sb.Append (elements.user);
-					sb.Append ('@');
-				}
-			}
-
-			if ((components & UriComponents.Host) != 0)
-				sb.Append (elements.host);
-
-			// for StrongPort always show port - even if -1
-			// otherwise only display if ut's not the default port
-			if ((components & UriComponents.StrongPort) != 0) {
-				sb.Append (":");
-				if (elements.port >= 0) {
-					sb.Append (elements.port);
-				} else {
-					sb.Append (dp);
-				}
-			}
-
-			if ((components & UriComponents.Port) != 0) {
-				int p = elements.port;
-				if (p >= 0 && p != dp) {
-					sb.Append (":");
-					sb.Append (elements.port);
-				}
-			}
-
-			if ((components & UriComponents.Path) != 0) {
-				string path = elements.path;
-				if ((components & UriComponents.PathAndQuery) != 0 &&
-					(path.Length == 0 || !path.StartsWith ("/", StringComparison.Ordinal)) &&
-					elements.delimiter == Uri.SchemeDelimiter)
-					sb.Append ("/");
-				sb.Append (UriHelper.FormatAbsolute (path, scheme, UriComponents.Path, format, formatFlags));
-			}
-
-			if ((components & UriComponents.Query) != 0) {
-				string query = elements.query;
-				if (query != null) {
-					sb.Append ("?");
-					sb.Append (UriHelper.FormatAbsolute (query, scheme, UriComponents.Query, format, formatFlags));
-				}
-			}
-
-			if ((components & UriComponents.Fragment) != 0) {
-				string f = elements.fragment;
-				if (f != null) {
-					sb.Append ("#");
-					sb.Append (UriHelper.FormatAbsolute (f, scheme, UriComponents.Fragment, format, formatFlags));
-				}
-			}
-			return sb.ToString ();
-		}
-
-		protected internal virtual void InitializeAndValidate (Uri uri, out UriFormatException parsingError)
-		{
-			// bad boy, it should check null arguments.
-			if ((uri.Scheme != scheme_name) && (scheme_name != "*"))
-				// Here .NET seems to return "The Authority/Host could not be parsed", but it does not make sense.
-				parsingError = new UriFormatException ("The argument Uri's scheme does not match");
-			else
-				parsingError = null;
-		}
-
-		protected internal virtual bool IsBaseOf (Uri baseUri, Uri relativeUri)
-		{
-			if (baseUri == null)
-				throw new ArgumentNullException ("baseUri");
-			if (relativeUri == null)
-				throw new ArgumentNullException ("relativeUri");
-
-			// compare, not case sensitive, the scheme, host and port (+ user informations)
-			if (Uri.Compare (baseUri, relativeUri, UriComponents.SchemeAndServer | UriComponents.UserInfo, UriFormat.Unescaped, StringComparison.InvariantCultureIgnoreCase) != 0)
-				return false;
-
-			string base_string = baseUri.LocalPath;
-			int last_slash = base_string.LastIndexOf ('/') + 1; // keep the slash
-			return (String.Compare (base_string, 0, relativeUri.LocalPath, 0, last_slash, StringComparison.InvariantCultureIgnoreCase) == 0);
-		}
-
-		protected internal virtual bool IsWellFormedOriginalString (Uri uri)
-		{
-			// well formed according to RFC2396 and RFC2732
-			// see Uri.IsWellFormedOriginalString for some docs
-
-			// Though this class does not seem to do anything. Even null arguments aren't checked :/
-			return uri.IsWellFormedOriginalString ();
-		}
-		protected internal virtual UriParser OnNewUri ()
-		{
-			// nice time for init
-			return this;
-		}
-
-		[MonoTODO]
-		protected virtual void OnRegister (string schemeName, int defaultPort)
-		{
-			// unit tests shows that schemeName and defaultPort aren't usable from here
-		}
-
-		[MonoTODO]
-		protected internal virtual string Resolve (Uri baseUri, Uri relativeUri, out UriFormatException parsingError)
-		{
-			// used by Uri.ctor and Uri.TryCreate
-			throw new NotImplementedException ();
-		}
-
-		// internal properties
-
-		internal string SchemeName {
-			get { return scheme_name; }
-			set { scheme_name = value; }
-		}
-
-		internal int DefaultPort {
-			get { return default_port; }
-			set { default_port = value; }
-		}
-
-		// private stuff
-
-		private string IgnoreFirstCharIf (string s, char c)
-		{
-			if (s.Length == 0)
-				return String.Empty;
-			if (s[0] == c)
-				return s.Substring (1);
-			return s;
-		}
-
-		// static methods
-
-		private static void CreateDefaults ()
-		{
-			if (table != null)
-				return;
-
-			Hashtable newtable = new Hashtable ();
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeFile, -1);
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeFtp, 21);
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeGopher, 70);
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeHttp, 80);
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeHttps, 443);
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeMailto, 25);
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeNetPipe, -1);
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeNetTcp, -1);
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeNews, -1);
-			InternalRegister (newtable, new DefaultUriParser (), Uri.UriSchemeNntp, 119);
-			// not defined in Uri.UriScheme* but a parser class exists
-			InternalRegister (newtable, new DefaultUriParser (), "ldap", 389);
-			
-			lock (lock_object) {
-				if (table == null)
-					table = newtable;
-				else
-					newtable = null;
-			}
-		}
-
-		public static bool IsKnownScheme (string schemeName)
-		{
-			if (schemeName == null)
-				throw new ArgumentNullException ("schemeName");
-			if (schemeName.Length == 0)
-				throw new ArgumentOutOfRangeException ("schemeName");
-
-			CreateDefaults ();
-			string lc = schemeName.ToLower (CultureInfo.InvariantCulture);
-			return (table [lc] != null);
-		}
-
-		// *no* check version
-		private static void InternalRegister (Hashtable table, UriParser uriParser, string schemeName, int defaultPort)
-		{
-			uriParser.SchemeName = schemeName;
-			uriParser.DefaultPort = defaultPort;
-
-			// FIXME: MS doesn't seems to call most inherited parsers
-			if (uriParser is GenericUriParser) {
-				table.Add (schemeName, uriParser);
-			} else {
-				DefaultUriParser parser = new DefaultUriParser ();
-				parser.SchemeName = schemeName;
-				parser.DefaultPort = defaultPort;
-				table.Add (schemeName, parser);
-			}
-
-			// note: we cannot set schemeName and defaultPort inside OnRegister
-			uriParser.OnRegister (schemeName, defaultPort);
-		}
-
-		[SecurityPermission (SecurityAction.Demand, Infrastructure = true)]
-		public static void Register (UriParser uriParser, string schemeName, int defaultPort)
-		{
-			if (uriParser == null)
-				throw new ArgumentNullException ("uriParser");
-			if (schemeName == null)
-				throw new ArgumentNullException ("schemeName");
-			if ((defaultPort < -1) || (defaultPort >= UInt16.MaxValue))
-				throw new ArgumentOutOfRangeException ("defaultPort");
-
-			CreateDefaults ();
-
-			string lc = schemeName.ToLower (CultureInfo.InvariantCulture);
-			if (table [lc] != null) {
-				string msg = Locale.GetText ("Scheme '{0}' is already registred.");
-				throw new InvalidOperationException (msg);
-			}
-			InternalRegister (table, uriParser, lc, defaultPort);
-		}
-
-		internal static UriParser GetParser (string schemeName)
-		{
-			if (schemeName == null)
-				return null;
-
-			CreateDefaults ();
-
-			string lc = schemeName.ToLower (CultureInfo.InvariantCulture);
-			return (UriParser) table [lc];
-		}
-	}
-}
-
diff --git a/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs b/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs
index a5899fd28f3..2e9ef60993d 100644
--- a/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs
+++ b/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs
@@ -16,6 +16,8 @@ using System.IO;
 using System.Reflection;
 using Microsoft.CSharp;
 using NUnit.Framework;
+using System.Text;
+using System.Linq;
 
 namespace MonoTests.Microsoft.CSharp
 {
@@ -566,6 +568,39 @@ namespace MonoTests.Microsoft.CSharp
 			AssertCompileResults (results, true);
 		}
 
+		[Test]
+		public void EncodingMismatch ()
+		{
+			var source = @"
+				#warning Trigger Some Warning
+				public class MyClass {
+					public static string MyMethod () { return ""data""; }
+				}";
+
+			var p = new CompilerParameters () {
+				GenerateInMemory = false,
+				GenerateExecutable = false,
+				IncludeDebugInformation = true,
+				TreatWarningsAsErrors = false,
+				TempFiles = new TempFileCollection (_tempDir, true),
+			};
+
+			var prov = new CSharpCodeProvider ();
+			CompilerResults results;
+
+			var prev = Console.OutputEncoding;
+			try {
+				Console.OutputEncoding = Encoding.Unicode;
+
+				results = prov.CompileAssemblyFromSource (p, source);
+			} finally {
+				Console.OutputEncoding = prev;
+			}
+
+			Assert.IsNotNull (results.Errors);
+			Assert.IsTrue (results.Output.Cast<string>().ToArray ()[1].Contains ("Trigger Some Warning"));
+		}
+
 		private static string CreateTempDirectory ()
 		{
 			// create a uniquely named zero-byte file
diff --git a/mcs/class/System/Test/System.ComponentModel.Design.Serialization/InstanceDescriptorTest.cs b/mcs/class/System/Test/System.ComponentModel.Design.Serialization/InstanceDescriptorTest.cs
index dbc4110cb20..ec9d6b1bb0a 100644
--- a/mcs/class/System/Test/System.ComponentModel.Design.Serialization/InstanceDescriptorTest.cs
+++ b/mcs/class/System/Test/System.ComponentModel.Design.Serialization/InstanceDescriptorTest.cs
@@ -190,7 +190,7 @@ namespace MonoTests.System.ComponentModel.Design.Serialization {
 		{
 #if MOBILE
 			// ensure the property is not linked out of the application since it make the test fails
-			Assert.NotNull (Thread.CurrentPrincipal, "pre-test");
+			Assert.IsNotNull (Thread.CurrentPrincipal, "pre-test");
 #endif
 			PropertyInfo pi = typeof (Thread).GetProperty ("CurrentPrincipal");
 
@@ -213,7 +213,7 @@ namespace MonoTests.System.ComponentModel.Design.Serialization {
 		{
 #if MOBILE
 			// ensure the property is not linked out of the application since it make the test fails
-			Assert.NotNull (Thread.CurrentPrincipal, "pre-test");
+			Assert.IsNotNull (Thread.CurrentPrincipal, "pre-test");
 #endif
 			PropertyInfo pi = typeof (Thread).GetProperty ("CurrentPrincipal");
 
diff --git a/mcs/class/System/Test/System.Net.NetworkInformation/PingTest.cs b/mcs/class/System/Test/System.Net.NetworkInformation/PingTest.cs
index 19a47097a7d..2cbdb6838ca 100644
--- a/mcs/class/System/Test/System.Net.NetworkInformation/PingTest.cs
+++ b/mcs/class/System/Test/System.Net.NetworkInformation/PingTest.cs
@@ -1,13 +1,17 @@
 using NUnit.Framework;
 using System;
+using System.Net;
 using System.Net.NetworkInformation;
+using System.Threading;
 
 namespace MonoTests.System.Net.NetworkInformation
 {
 	[TestFixture]
-	public class PingTest
+	public partial class PingTest
 	{
-		[Test] 
+		partial void AndroidShouldPingWork (ref bool shouldWork);
+
+		[Test]
 		public void PingFail()
 		{
 #if MONOTOUCH
@@ -24,10 +28,99 @@ namespace MonoTests.System.Net.NetworkInformation
 #if MONOTOUCH
 			Assert.Ignore ("Ping implementation is broken on MT (requires sudo access)");
 #else
-			var p = new Ping ().Send ("127.0.0.1");
-			Assert.AreEqual(IPStatus.Success, p.Status);
+			bool shouldWork = true;
+			AndroidShouldPingWork (ref shouldWork);
+			if (shouldWork) {
+				var p = new Ping ().Send ("127.0.0.1");
+				Assert.AreEqual(IPStatus.Success, p.Status);
+			} else
+				Assert.Ignore ("Ping will not work on this Android device");
 #endif
 		}		
+
+		[Test]
+#if MONOTOUCH
+		[Ignore("Ping implementation is broken on MT (requires sudo access)")]
+#endif
+		public void SendAsyncIPV4Succeeds()
+		{
+			var testIp = IPAddress.Loopback;
+			var ping = new Ping ();
+			PingReply reply = null;
+
+			using (var waiter = new AutoResetEvent (false)) {
+				ping.PingCompleted += new PingCompletedEventHandler ( 
+					(s, e) => {
+						reply = e.Reply;
+						(e.UserState as AutoResetEvent) ?.Set ();
+					});
+
+				ping.SendAsync (testIp, waiter);
+
+				waiter.WaitOne (TimeSpan.FromSeconds (8));
+			}
+
+			Assert.AreEqual (IPStatus.Success, reply.Status);
+		}
+
+		[Test]
+#if MONOTOUCH
+		[Ignore("Ping implementation is broken on MT (requires sudo access)")]
+#endif
+		public void SendAsyncIPV4Fails()
+		{
+			var testIp = IPAddress.Parse("192.0.2.0");
+			var ping = new Ping ();
+			PingReply reply = null;
+
+			using (var waiter = new AutoResetEvent (false)) {
+				ping.PingCompleted += new PingCompletedEventHandler ( 
+					(s, e) => {
+						reply = e.Reply;
+						(e.UserState as AutoResetEvent) ?.Set ();
+					});
+
+				ping.SendAsync (testIp, waiter);
+
+				waiter.WaitOne (TimeSpan.FromSeconds (8));
+			}
+
+			Assert.AreNotEqual (IPStatus.Success, reply.Status);
+		}
+
+		[Test]
+#if MONOTOUCH
+		[Ignore("Ping implementation is broken on MT (requires sudo access)")]
+#endif
+		public void SendPingAsyncIPV4Succeeds()
+		{
+			var testIp = IPAddress.Loopback;
+			var ping = new Ping ();
+			var task = ping.SendPingAsync (testIp);
+
+			task.Wait();
+
+			var result = task.Result;
+
+			Assert.AreEqual (IPStatus.Success, result.Status);
+		}
+
+		[Test]
+#if MONOTOUCH
+		[Ignore("Ping implementation is broken on MT (requires sudo access)")]
+#endif
+		public void SendPingAsyncIPV4Fails()
+		{
+			var testIp = IPAddress.Parse("192.0.2.0");
+			var ping = new Ping ();
+			var task = ping.SendPingAsync (testIp);
+
+			task.Wait();
+
+			var result = task.Result;
+
+			Assert.AreNotEqual (IPStatus.Success, result.Status);
+		}
 	}
 }
 
diff --git a/mcs/class/System/Test/System.Net.Security/SslStreamTest.cs b/mcs/class/System/Test/System.Net.Security/SslStreamTest.cs
index cea6bb18c14..68118776fbe 100644
--- a/mcs/class/System/Test/System.Net.Security/SslStreamTest.cs
+++ b/mcs/class/System/Test/System.Net.Security/SslStreamTest.cs
@@ -95,80 +95,6 @@ public class SslStreamTest {
 		}
 	}
 
-	[Test]
-	public void ClientCipherSuitesCallback ()
-	{
-		try {
-			ServicePointManager.ClientCipherSuitesCallback += (SecurityProtocolType p, IEnumerable<string> allCiphers) => {
-				string prefix = p == SecurityProtocolType.Tls ? "TLS_" : "SSL_";
-				return new List<string> { prefix + "RSA_WITH_AES_128_CBC_SHA" };
-			};
-			// client will only offers AES 128 - that's fine since the server support it (and many more ciphers)
-			AuthenticateClientAndServer_ClientSendsNoData ();
-		}
-		finally {
-			ServicePointManager.ClientCipherSuitesCallback = null;
-		}
-	}
-
-	[Test]
-	public void ServerCipherSuitesCallback ()
-	{
-		try {
-			ServicePointManager.ServerCipherSuitesCallback += (SecurityProtocolType p, IEnumerable<string> allCiphers) => {
-				string prefix = p == SecurityProtocolType.Tls ? "TLS_" : "SSL_";
-					return new List<string> { prefix + "RSA_WITH_AES_256_CBC_SHA" };
-			};
-			// server only accept AES 256 - that's fine since the client support it (and many more ciphers)
-			AuthenticateClientAndServer_ClientSendsNoData ();
-		}
-		finally {
-			ServicePointManager.ServerCipherSuitesCallback = null;
-		}
-	}
-
-	[Test]
-	public void CipherSuitesCallbacks ()
-	{
-		try {
-			ServicePointManager.ClientCipherSuitesCallback += (SecurityProtocolType p, IEnumerable<string> allCiphers) => {
-				string prefix = p == SecurityProtocolType.Tls ? "TLS_" : "SSL_";
-				return new List<string> { prefix + "RSA_WITH_AES_128_CBC_SHA", prefix + "RSA_WITH_AES_256_CBC_SHA" };
-			};
-			ServicePointManager.ServerCipherSuitesCallback += (SecurityProtocolType p, IEnumerable<string> allCiphers) => {
-				string prefix = p == SecurityProtocolType.Tls ? "TLS_" : "SSL_";
-				return new List<string> { prefix + "RSA_WITH_AES_128_CBC_SHA", prefix + "RSA_WITH_AES_256_CBC_SHA" };
-			};
-			// both client and server supports AES (128 and 256) - server will select 128 (first choice)
-			AuthenticateClientAndServer_ClientSendsNoData ();
-		}
-		finally {
-			ServicePointManager.ClientCipherSuitesCallback = null;
-			ServicePointManager.ServerCipherSuitesCallback = null;
-		}
-	}
-
-	[Test]
-	public void MismatchedCipherSuites ()
-	{
-		try {
-			ServicePointManager.ClientCipherSuitesCallback += (SecurityProtocolType p, IEnumerable<string> allCiphers) => {
-				string prefix = p == SecurityProtocolType.Tls ? "TLS_" : "SSL_";
-				return new List<string> { prefix + "RSA_WITH_AES_128_CBC_SHA" };
-			};
-			ServicePointManager.ServerCipherSuitesCallback += (SecurityProtocolType p, IEnumerable<string> allCiphers) => {
-				string prefix = p == SecurityProtocolType.Tls ? "TLS_" : "SSL_";
-				return new List<string> { prefix + "RSA_WITH_AES_256_CBC_SHA" };
-			};
-			// mismatch! server will refuse and send back an alert
-			AuthenticateClientAndServer (false, false);
-		}
-		finally {
-			ServicePointManager.ClientCipherSuitesCallback = null;
-			ServicePointManager.ServerCipherSuitesCallback = null;
-		}
-	}
-
 	private void StartClientAndAuthenticate (ClientServerState state, 
 						 IPEndPoint endPoint) {
 		try {
diff --git a/mcs/class/System/Test/System.Net.Sockets/SocketAsyncTest.cs b/mcs/class/System/Test/System.Net.Sockets/SocketAsyncTest.cs
index f137139a55f..d59d39fad89 100644
--- a/mcs/class/System/Test/System.Net.Sockets/SocketAsyncTest.cs
+++ b/mcs/class/System/Test/System.Net.Sockets/SocketAsyncTest.cs
@@ -106,11 +106,11 @@ namespace MonoTests.System.Net.Sockets
 			bool res = clientSocket.SendAsync (e);
 			if (res) {
 				if (!m.WaitOne (1500))
-					throw new TimeoutException ();
+					Assert.Fail ("Timeout #1");
 			}
 
 			if (!mainEvent.WaitOne (1500))
-				throw new TimeoutException ();
+				Assert.Fail ("Timeout #2");
 			if (error != null)
 				throw error;
 
@@ -124,13 +124,13 @@ namespace MonoTests.System.Net.Sockets
 			res = clientSocket.SendAsync (e);
 			if (res) {
 				if (!m.WaitOne (1500))
-					throw new TimeoutException ();
+					Assert.Fail ("Timeout #3");
 			}
 
 			if (!mainEvent.WaitOne (1500))
-				throw new TimeoutException ();
+				Assert.Fail ("Timeout #4");
 			if (error != null)
 				throw error;
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs b/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs
index a53a5d5624a..2b12d7019bf 100755
--- a/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs
+++ b/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs
@@ -573,8 +573,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.DontFragment = true;
 				Assert.Fail ("DontFragment #1");
 			} catch (NotSupportedException) {
-			} catch {
-				Assert.Fail ("DontFragment #2");
 			} finally {
 				sock.Close ();
 			}
@@ -592,8 +590,6 @@ namespace MonoTests.System.Net.Sockets
 				Assert.Fail ("EnableBroadcastDefaultTcp #1");
 			} catch (SocketException ex) {
 				Assert.AreEqual (10042, ex.ErrorCode, "EnableBroadcastDefaultTcp #2");
-			} catch {
-				Assert.Fail ("EnableBroadcastDefaultTcp #2");
 			} finally {
 				sock.Close ();
 			}
@@ -623,8 +619,6 @@ namespace MonoTests.System.Net.Sockets
 				Assert.Fail ("EnableBroadcastChangeTcp #1");
 			} catch (SocketException ex) {
 				Assert.AreEqual (10042, ex.ErrorCode, "EnableBroadcastChangeTcp #2");
-			} catch {
-				Assert.Fail ("EnableBroadcastChangeTcp #2");
 			} finally {
 				sock.Close ();
 			}
@@ -793,8 +787,6 @@ namespace MonoTests.System.Net.Sockets
 				Assert.Fail ("MulticastLoopbackDefaultTcp #1");
 			} catch (SocketException ex) {
 				Assert.AreEqual (10042, ex.ErrorCode, "MulticastLoopbackDefaultTcp #2");
-			} catch {
-				Assert.Fail ("MulticastLoopbackDefaultTcp #2");
 			} finally {
 				sock.Close ();
 			}
@@ -812,8 +804,6 @@ namespace MonoTests.System.Net.Sockets
 				Assert.Fail ("MulticastLoopbackChangeTcp #1");
 			} catch (SocketException ex) {
 				Assert.AreEqual (10042, ex.ErrorCode, "MulticastLoopbackChangeTcp #2");
-			} catch {
-				Assert.Fail ("MulticastLoopbackChangeTcp #2");
 			} finally {
 				sock.Close ();
 			}
@@ -997,7 +987,6 @@ namespace MonoTests.System.Net.Sockets
 		}
 
 		[Test]
-		[Category ("NotOnMac")] // Mac doesn't throw when overflowing the ttl
 		public void TtlChangeOverflow ()
 		{
 			Socket sock = new Socket (AddressFamily.InterNetwork,
@@ -1007,11 +996,9 @@ namespace MonoTests.System.Net.Sockets
 			try {
 				sock.Ttl = 256;
 				Assert.Fail ("TtlChangeOverflow #1");
-			} catch (SocketException ex) {
-				Assert.AreEqual (10022, ex.ErrorCode,
+			} catch (ArgumentOutOfRangeException ex) {
+				Assert.AreEqual ("value", ex.ParamName,
 						 "TtlChangeOverflow #2");
-			} catch {
-				Assert.Fail ("TtlChangeoverflow #3");
 			} finally {
 				sock.Close ();
 			}
@@ -1024,8 +1011,6 @@ namespace MonoTests.System.Net.Sockets
 			} catch (SocketException ex) {
 				Assert.AreEqual (10022, ex.ErrorCode,
 						 "TtlChangeOverflow #5");
-			} catch {
-				Assert.Fail ("TtlChangeOverflow #6");
 			} finally {
 				sock.Close ();
 			}
@@ -1139,8 +1124,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.SendTimeout = -2;
 				Assert.Fail ("SendTimeoutChange #8");
 			} catch (ArgumentOutOfRangeException) {
-			} catch {
-				Assert.Fail ("SendTimeoutChange #9");
 			} finally {
 				sock.Close ();
 			}
@@ -1198,8 +1181,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.ReceiveTimeout = -2;
 				Assert.Fail ("ReceiveTimeoutChange #8");
 			} catch (ArgumentOutOfRangeException) {
-			} catch {
-				Assert.Fail ("ReceiveTimeoutChange #9");
 			} finally {
 				sock.Close ();
 			}
@@ -1257,8 +1238,6 @@ namespace MonoTests.System.Net.Sockets
 			} catch (SocketException ex) {
 				Assert.AreEqual (10042, ex.ErrorCode,
 						 "NoDelayDefaultUdp #2");
-			} catch {
-				Assert.Fail ("NoDelayDefaultUdp #3");
 			} finally {
 				sock.Close ();
 			}
@@ -1277,8 +1256,6 @@ namespace MonoTests.System.Net.Sockets
 			} catch (SocketException ex) {
 				Assert.AreEqual (10042, ex.ErrorCode,
 						 "NoDelayChangeUdp #2");
-			} catch {
-				Assert.Fail ("NoDelayChangeUdp #3");
 			} finally {
 				sock.Close ();
 			}
@@ -1491,8 +1468,6 @@ namespace MonoTests.System.Net.Sockets
 				Assert.Fail ("BeginAcceptSocketUdp #1");
 			} catch (SocketException ex) {
 				Assert.AreEqual (10022, ex.ErrorCode, "BeginAcceptSocketUdp #2");
-			} catch {
-				Assert.Fail ("BeginAcceptSocketUdp #3");
 			} finally {
 				acc.Close ();
 				sock.Close ();
@@ -1524,8 +1499,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.BeginAccept (acc, 256, BADCallback, sock);
 				Assert.Fail ("BeginAcceptSocketBound #1");
 			} catch (InvalidOperationException) {
-			} catch {
-				Assert.Fail ("BeginAcceptSocketBound #2");
 			} finally {
 				acc.Close ();
 				sock.Close ();
@@ -1608,8 +1581,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.BeginAccept (acc, 256, BADCallback, null);
 				Assert.Fail ("BeginAcceptSocketClosed #1");
 			} catch (ObjectDisposedException) {
-			} catch {
-				Assert.Fail ("BeginAcceptSocketClosed #2");
 			} finally {
 				acc.Close ();
 			}
@@ -1638,8 +1609,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.BeginAccept (acc, 256, BADCallback, null);
 				Assert.Fail ("BeginAcceptSocketAccClosed #1");
 			} catch (ObjectDisposedException) {
-			} catch {
-				Assert.Fail ("BeginAcceptSocketAccClosed #2");
 			} finally {
 				sock.Close ();
 			}
@@ -1710,8 +1679,6 @@ namespace MonoTests.System.Net.Sockets
 						   sock);
 				Assert.Fail ("BeginConnectAddressPortNull #1");
 			} catch (ArgumentNullException) {
-			} catch {
-				Assert.Fail ("BeginConnectAddressPortNull #2");
 			} finally {
 				sock.Close ();
 			}
@@ -1733,8 +1700,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.BeginConnect (ip, ep.Port, BCCallback, sock);
 				Assert.Fail ("BeginConnectAddressPortListen #1");
 			} catch (InvalidOperationException) {
-			} catch {
-				Assert.Fail ("BeginConnectAddressPortListen #2");
 			} finally {
 				sock.Close ();
 			}
@@ -1880,8 +1845,6 @@ namespace MonoTests.System.Net.Sockets
 						   sock);
 				Assert.Fail ("BeginConnectMultipleNull #1");
 			} catch (ArgumentNullException) {
-			} catch {
-				Assert.Fail ("BeginConnectMultipleNull #2");
 			} finally {
 				sock.Close ();
 			}
@@ -1910,8 +1873,6 @@ namespace MonoTests.System.Net.Sockets
 						   sock);
 				Assert.Fail ("BeginConnectMultipleListen #1");
 			} catch (InvalidOperationException) {
-			} catch {
-				Assert.Fail ("BeginConnectMultipleListen #2");
 			} finally {
 				sock.Close ();
 			}
@@ -1948,8 +1909,6 @@ namespace MonoTests.System.Net.Sockets
 						   BCCallback, sock);
 				Assert.Fail ("BeginConnectHostPort #1");
 			} catch (ArgumentNullException) {
-			} catch {
-				Assert.Fail ("BeginConnectHostPort #2");
 			} finally {
 				sock.Close ();
 			}
@@ -1972,8 +1931,6 @@ namespace MonoTests.System.Net.Sockets
 						   BCCallback, sock);
 				Assert.Fail ("BeginConnectHostPortListen #1");
 			} catch (InvalidOperationException) {
-			} catch {
-				Assert.Fail ("BeginConnectHostPortListen #2");
 			} finally {
 				sock.Close ();
 			}
@@ -1992,8 +1949,6 @@ namespace MonoTests.System.Net.Sockets
 						   sock);
 				Assert.Fail ("BeginConnectHostPortNotIP #1");
 			} catch (NotSupportedException) {
-			} catch {
-				Assert.Fail ("BeginConnectHostPortNotIP #2");
 			} finally {
 				sock.Close ();
 			}
@@ -2102,8 +2057,6 @@ namespace MonoTests.System.Net.Sockets
 				Assert.Fail ("BeginSendNotConnected #1");
 			} catch (SocketException ex) {
 				Assert.AreEqual (10057, ex.ErrorCode, "BeginSendNotConnected #2");
-			} catch {
-				Assert.Fail ("BeginSendNotConnected #3");
 			} finally {
 				sock.Close ();
 			}
@@ -2142,8 +2095,6 @@ namespace MonoTests.System.Net.Sockets
 				Assert.Fail ("BindTwice #1");
 			} catch (SocketException ex) {
 				Assert.AreEqual (10022, ex.ErrorCode, "BindTwice #2");
-			} catch {
-				Assert.Fail ("BindTwice #3");
 			} finally {
 				sock.Close ();
 			}
@@ -2212,8 +2163,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.Connect (ip, 1249);
 				Assert.Fail ("ConnectAddressPortNull #1");
 			} catch (ArgumentNullException) {
-			} catch {
-				Assert.Fail ("ConnectAddressPortNull #2");
 			} finally {
 				sock.Close ();
 			}
@@ -2235,8 +2184,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.Connect (ip, ep.Port);
 				Assert.Fail ("ConnectAddressPortListen #1");
 			} catch (InvalidOperationException) {
-			} catch {
-				Assert.Fail ("ConnectAddressPortListen #2");
 			} finally {
 				sock.Close ();
 			}
@@ -2359,8 +2306,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.Connect (ips, 1251);
 				Assert.Fail ("ConnectMultipleNull #1");
 			} catch (ArgumentNullException) {
-			} catch {
-				Assert.Fail ("ConnectMultipleNull #2");
 			} finally {
 				sock.Close ();
 			}
@@ -2388,8 +2333,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.Connect (ips, ep.Port);
 				Assert.Fail ("ConnectMultipleListen #1");
 			} catch (InvalidOperationException) {
-			} catch {
-				Assert.Fail ("ConnectMultipleListen #2");
 			} finally {
 				sock.Close ();
 			}
@@ -2425,8 +2368,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.Connect ((string)null, 0);
 				Assert.Fail ("ConnectHostPort #1");
 			} catch (ArgumentNullException) {
-			} catch {
-				Assert.Fail ("ConnectHostPort #2");
 			} finally {
 				sock.Close ();
 			}
@@ -2448,8 +2389,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.Connect ("localhost", ep.Port);
 				Assert.Fail ("ConnectHostPortListen #1");
 			} catch (InvalidOperationException) {
-			} catch {
-				Assert.Fail ("ConnectHostPortListen #2");
 			} finally {
 				sock.Close ();
 			}
@@ -2467,8 +2406,6 @@ namespace MonoTests.System.Net.Sockets
 				sock.Connect ("localhost", 0);
 				Assert.Fail ("ConnectHostPortNotIP #1");
 			} catch (NotSupportedException) {
-			} catch {
-				Assert.Fail ("ConnectHostPortNotIP #2");
 			} finally {
 				sock.Close ();
 			}
@@ -2672,8 +2609,6 @@ namespace MonoTests.System.Net.Sockets
 				Assert.Fail ("ListenNotBound #1");
 			} catch (SocketException ex) {
 				Assert.AreEqual (10022, ex.ErrorCode, "ListenNotBound #2");
-			} catch {
-				Assert.Fail ("ListenNotBound #3");
 			} finally {
 				sock.Close ();
 			}
@@ -3483,43 +3418,34 @@ namespace MonoTests.System.Net.Sockets
 		[Test]
 		public void UdpDoubleBind ()
 		{
-			Socket s = new Socket (AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-			s.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, 1);
-			
-			var ep = new IPEndPoint (IPAddress.Any, NetworkHelpers.FindFreePort ());
-			s.Bind (ep);
-			
-			Socket ss = new Socket (AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-			ss.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, 1);
-			
-			ss.Bind (new IPEndPoint (IPAddress.Any, ep.Port));
+			using (Socket s = new Socket (AddressFamily.InterNetwork,
+						SocketType.Dgram, ProtocolType.Udp))
+			using (Socket ss = new Socket (AddressFamily.InterNetwork,
+						SocketType.Dgram, ProtocolType.Udp)) {
+				var supportsReuseAddress = true;
+				try {
+					s.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+				} catch (SocketException e) {
+					// Exception is thrown when ReuseAddress is not supported
+					Assert.AreEqual ((int) SocketError.OperationNotSupported, e.NativeErrorCode,
+							"Expected SocketError.OperationNotSupported");
+					supportsReuseAddress = false;
+				}
 
-			// If we make it this far, we succeeded.
-			
-			ss.Close ();
-			s.Close ();
-		}
+				var ep = new IPEndPoint (IPAddress.Any, NetworkHelpers.FindFreePort ());
+				s.Bind (ep);
 
-#if MONOTOUCH
-		// when the linker is enabled then reflection won't work and would throw an NRE
-		// this is also always true for iOS - so we do not need to poke internals
-		static bool SupportsPortReuse ()
-		{
-			return true;
-		}
-#else
-		static bool? supportsPortReuse;
-		static bool SupportsPortReuse ()
-		{
-			if (supportsPortReuse.HasValue)
-				return supportsPortReuse.Value;
+				if (supportsReuseAddress)
+					ss.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
 
-			supportsPortReuse = (bool) typeof (Socket).GetMethod ("SupportsPortReuse",
-					BindingFlags.Static | BindingFlags.NonPublic)
-					.Invoke (null, new object [] {});
-			return supportsPortReuse.Value;
+				try {
+					ss.Bind (new IPEndPoint (IPAddress.Any, ep.Port));
+					if (!supportsReuseAddress)
+						Assert.Fail ("Reusing address is not supported, exception was expected on second bind.");
+				} catch (SocketException e) {
+				}
+			}
 		}
-#endif
 
 		// Test case for bug #31557
 		[Test]
@@ -3529,22 +3455,30 @@ namespace MonoTests.System.Net.Sockets
 						SocketType.Stream, ProtocolType.Tcp))
 			using (Socket ss = new Socket (AddressFamily.InterNetwork,
 						SocketType.Stream, ProtocolType.Tcp)) {
-				s.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+				var supportsReuseAddress = true;
+				try {
+					s.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+				} catch (SocketException e) {
+					// Exception is thrown when ReuseAddress is not supported
+					Assert.AreEqual ((int) SocketError.OperationNotSupported, e.NativeErrorCode,
+							"Expected SocketError.OperationNotSupported");
+					supportsReuseAddress = false;
+				}
+
 				var ep = new IPEndPoint (IPAddress.Any, NetworkHelpers.FindFreePort ());
 				s.Bind (ep);
 				s.Listen(1);
 
-				ss.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+				if (supportsReuseAddress)
+					ss.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
 
-				Exception ex = null;
 				try {
 					ss.Bind (new IPEndPoint (IPAddress.Any, ep.Port));
 					ss.Listen(1);
+					if (!supportsReuseAddress)
+						Assert.Fail ("Reusing address is not supported, exception was expected on second bind.");
 				} catch (SocketException e) {
-					ex = e;
 				}
-
-				Assert.AreEqual (SupportsPortReuse (), ex == null);
 			}
 		}
 
@@ -4294,7 +4228,22 @@ namespace MonoTests.System.Net.Sockets
 		[Test]
 		public void SendAsyncFile ()
 		{
-			Socket serverSocket = StartSocketServer ();
+			Socket serverSocket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+			serverSocket.Bind (new IPEndPoint (IPAddress.Loopback, 0));
+			serverSocket.Listen (1);
+
+			var mReceived = new ManualResetEvent (false);
+
+			serverSocket.BeginAccept (AsyncCall => {
+				byte[] bytes = new byte [1024];
+
+				Socket listener = (Socket)AsyncCall.AsyncState;
+				Socket client = listener.EndAccept (AsyncCall);
+				client.Receive (bytes, bytes.Length, 0);
+				client.Close ();
+				mReceived.Set ();
+			}, serverSocket);
 			
 			Socket clientSocket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
 			clientSocket.Connect (serverSocket.LocalEndPoint);
@@ -4312,18 +4261,19 @@ namespace MonoTests.System.Net.Sockets
 					sw.Write (buffer);
 				}
 
-				var m = new ManualResetEvent (false);
+				var mSent = new ManualResetEvent (false);
 
 				// Async Send File to server
 				clientSocket.BeginSendFile(temp, (ar) => {
 					Socket client = (Socket) ar.AsyncState;
 					client.EndSendFile (ar);
-					m.Set ();
+					mSent.Set ();
 				}, clientSocket);
 
-				if (!m.WaitOne (1500))
+				if (!mSent.WaitOne (1500))
+					throw new TimeoutException ();
+				if (!mReceived.WaitOne (1500))
 					throw new TimeoutException ();
-				m.Reset ();
 			} finally {
 				if (File.Exists (temp))
 					File.Delete (temp);
@@ -4383,30 +4333,6 @@ namespace MonoTests.System.Net.Sockets
 			}
 		}
 
-		Socket StartSocketServer ()
-		{
-
-			Socket listenSocket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-			
-			listenSocket.Bind (new IPEndPoint (IPAddress.Loopback, NetworkHelpers.FindFreePort ()));
-			listenSocket.Listen (1);
-
-			listenSocket.BeginAccept (new AsyncCallback (ReceiveCallback), listenSocket);
-			
-			return listenSocket;
-		}
-
-		public static void ReceiveCallback (IAsyncResult AsyncCall)
-		{
-			byte[] bytes = new byte [1024];
-
-			Socket listener = (Socket)AsyncCall.AsyncState;
-			Socket client = listener.EndAccept (AsyncCall);
- 
-			client.Receive (bytes, bytes.Length, 0);
-			client.Close ();
-		}
-
 		[Test]
 		public void UdpMulticasTimeToLive ()
 		{
diff --git a/mcs/class/System/Test/System.Net/DnsTest.cs b/mcs/class/System/Test/System.Net/DnsTest.cs
index fe3769fd545..a1b5f51cdd2 100644
--- a/mcs/class/System/Test/System.Net/DnsTest.cs
+++ b/mcs/class/System/Test/System.Net/DnsTest.cs
@@ -9,7 +9,7 @@
 // 
 
 using System;
-using System.Collections;
+using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
@@ -55,8 +55,9 @@ namespace MonoTests.System.Net
 
 			IAsyncResult async = Dns.BeginResolve (site1Dot, null, null);
 			IPHostEntry entry = Dns.EndResolve (async);
-			SubTestValidIPHostEntry (entry);
-			Assert.AreEqual (site1Dot, entry.AddressList [0].ToString ());
+			SubTestValidIPHostEntry (entry);
+			var ip = GetIPv4Address (entry);
+			Assert.AreEqual (site1Dot, ip.ToString ());
 		}
 
 		void ResolveCallback (IAsyncResult ar)
@@ -205,12 +206,21 @@ namespace MonoTests.System.Net
 			}
 		}
 
+		static IPAddress GetIPv4Address (IPHostEntry h)
+		{
+			var al = h.AddressList.FirstOrDefault (x => x.AddressFamily == AddressFamily.InterNetwork);
+			if (al == null)
+				Assert.Ignore ("Could not resolve an IPv4 address as required by this test case, e.g. running on an IPv6 only network");
+			return al;
+		}
+
 		void SubTestGetHostByName (string siteName, string siteDot)
 		{
 			IPHostEntry h = Dns.GetHostByName (siteName);
 			SubTestValidIPHostEntry (h);
 			Assert.AreEqual (siteName, h.HostName, "siteName");
-			Assert.AreEqual (siteDot, h.AddressList [0].ToString (), "siteDot");
+			var ip = GetIPv4Address (h);
+			Assert.AreEqual (siteDot, ip.ToString (), "siteDot");
 		}
 
 		[Test]
@@ -287,7 +297,8 @@ namespace MonoTests.System.Net
 			IPAddress addr = new IPAddress (IPAddress.NetworkToHostOrder ((int) site1IP));
 			IPHostEntry h = Dns.GetHostByAddress (addr);
 			SubTestValidIPHostEntry (h);
-			Assert.AreEqual (addr.ToString (), h.AddressList [0].ToString ());
+			var ip = GetIPv4Address (h);
+			Assert.AreEqual (addr.ToString (), ip.ToString ());
 		}
 
 		[Test]
@@ -295,8 +306,9 @@ namespace MonoTests.System.Net
 		{
 			IPAddress addr = new IPAddress (IPAddress.NetworkToHostOrder ((int) site2IP));
 			IPHostEntry h = Dns.GetHostByAddress (addr);
-			SubTestValidIPHostEntry (h);
-			Assert.AreEqual (addr.ToString (), h.AddressList [0].ToString ());
+			SubTestValidIPHostEntry (h);
+			var ip = GetIPv4Address (h);
+			Assert.AreEqual (addr.ToString (), ip.ToString ());
 		}
 
 		[Test]
diff --git a/mcs/class/System/Test/System.Net/FileWebRequestTest.cs b/mcs/class/System/Test/System.Net/FileWebRequestTest.cs
index 8d6ee23de6e..6793d2a48fd 100644
--- a/mcs/class/System/Test/System.Net/FileWebRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/FileWebRequestTest.cs
@@ -660,7 +660,7 @@ namespace MonoTests.System.Net
 				Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#3");
 				Assert.IsNotNull (ex.Message, "#4");
 				Assert.IsNotNull (ex.ParamName, "#5");
-				Assert.IsFalse (ex.ParamName == "value", "#6");
+				Assert.AreEqual ("value", ex.ParamName, "#6");
 				Assert.IsNull (ex.InnerException, "#7");
 			}
 		}
diff --git a/mcs/class/System/Test/System.Net/HttpListener2Test.cs b/mcs/class/System/Test/System.Net/HttpListener2Test.cs
index 77fb73e3f00..3afff1226ae 100644
--- a/mcs/class/System/Test/System.Net/HttpListener2Test.cs
+++ b/mcs/class/System/Test/System.Net/HttpListener2Test.cs
@@ -154,7 +154,7 @@ namespace MonoTests.System.Net {
 			Send (ns, "GET / HTTP/1.1\r\n\r\n"); // No host
 			string response = Receive (ns, 512);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 400", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 400"));
 		}
 
 		[Test]
@@ -166,7 +166,7 @@ namespace MonoTests.System.Net {
 			Send (ns, "GET / HTTP/1.1\r\nHost: 127.0.0.1\r\n\r\n"); // no prefix
 			string response = Receive (ns, 512);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 400", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 400"));
 		}
 
 		[Test]
@@ -204,7 +204,7 @@ namespace MonoTests.System.Net {
 				string response = Receive (ns, 512);
 				ns.Close ();
 				listener.Close ();
-				StringAssert.StartsWith ("HTTP/1.1 400", response, String.Format ("Failed on {0}", (int) b));
+				Assert.IsTrue(response.StartsWith ("HTTP/1.1 400"), String.Format ("Failed on {0}", (int) b));
 			}
 		}
 
@@ -217,7 +217,7 @@ namespace MonoTests.System.Net {
 			Send (ns, "POST /test4/ HTTP/1.1\r\nHost: 127.0.0.1\r\n\r\n"); // length required
 			string response = Receive (ns, 512);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 411", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 411"));
 		}
 
 		[Test]
@@ -229,7 +229,7 @@ namespace MonoTests.System.Net {
 			Send (ns, "POST / HTTP/1.1\r\nHost: 127.0.0.1\r\nTransfer-Encoding: pepe\r\n\r\n"); // not implemented
 			string response = Receive (ns, 512);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 501", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 501"));
 		}
 
 		[Test]
@@ -242,7 +242,7 @@ namespace MonoTests.System.Net {
 			Send (ns, "POST /test6/ HTTP/1.1\r\nHost: 127.0.0.1\r\nTransfer-Encoding: identity\r\n\r\n");
 			string response = Receive (ns, 512);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 501", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 501"));
 		}
 
 		[Test]
@@ -257,8 +257,8 @@ namespace MonoTests.System.Net {
 			ctx.Response.Close ();
 			string response = Receive (ns, 1024);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 200", response);
-			StringAssert.Contains ("Transfer-Encoding: chunked", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 200"));
+			Assert.IsTrue(response.Contains ("Transfer-Encoding: chunked"));
 		}
 
 		[Test]
@@ -274,7 +274,7 @@ namespace MonoTests.System.Net {
 			ctx.Response.Close ();
 			string response = Receive (ns, 512);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 200", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 200"));
 			Assert.IsTrue (-1 == response.IndexOf ("Transfer-Encoding: chunked"));
 		}
 
@@ -290,7 +290,7 @@ namespace MonoTests.System.Net {
 			string response = ReceiveWithTimeout (ns, 512, 1000, out timeout);
 			ns.Close ();
 			Assert.IsFalse (timeout);
-			StringAssert.StartsWith ("HTTP/1.1 411", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 411"));
 		}
 
 		[Test]
@@ -306,7 +306,7 @@ namespace MonoTests.System.Net {
 			string response = ReceiveWithTimeout (ns, 512, 1000, out timeout);
 			ns.Close ();
 			Assert.IsFalse (timeout);
-			StringAssert.StartsWith ("HTTP/1.1 411", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 411"));
 		}
 
 		[Test]
@@ -320,7 +320,7 @@ namespace MonoTests.System.Net {
 			ns.GetSocket ().Shutdown (SocketShutdown.Send);
 			string input = Receive (ns, 512);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 400", input);
+			Assert.IsTrue(input.StartsWith ("HTTP/1.1 400"));
 		}
 
 		[Test]
@@ -334,7 +334,7 @@ namespace MonoTests.System.Net {
 			ns.GetSocket ().Shutdown (SocketShutdown.Send);
 			string input = Receive (ns, 512);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 400", input);
+			Assert.IsTrue(input.StartsWith ("HTTP/1.1 400"));
 		}
 
 		[Test]
@@ -348,7 +348,7 @@ namespace MonoTests.System.Net {
 			ns.GetSocket ().Shutdown (SocketShutdown.Send);
 			string input = Receive (ns, 512);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 400", input);
+			Assert.IsTrue(input.StartsWith ("HTTP/1.1 400"));
 		}
 
 		HttpListenerRequest test14_request;
@@ -448,8 +448,8 @@ namespace MonoTests.System.Net {
 			ctx.Response.Close ();
 			string response = Receive (ns, 1024);
 			ns.Close ();
-			StringAssert.StartsWith ("HTTP/1.1 200", response);
-			StringAssert.Contains ("Transfer-Encoding: chunked", response);
+			Assert.IsTrue(response.StartsWith ("HTTP/1.1 200"));
+			Assert.IsTrue(response.Contains ("Transfer-Encoding: chunked"));
 		}
 
 		[Test]
diff --git a/mcs/class/System/Test/System.Net/HttpListenerRequestTest.cs b/mcs/class/System/Test/System.Net/HttpListenerRequestTest.cs
index c088e4e14e2..6ff1b33260e 100644
--- a/mcs/class/System/Test/System.Net/HttpListenerRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/HttpListenerRequestTest.cs
@@ -30,6 +30,7 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Text;
 using System.Collections.Generic;
@@ -194,15 +195,22 @@ namespace MonoTests.System.Net
 		[Test]
 		public void HttpRequestIsLocal ()
 		{
-			var ips = new List<IPAddress> (Dns.GetHostAddresses (Dns.GetHostName ()));
+			var port = NetworkHelpers.FindFreePort ();
+			var ips = new List<IPAddress> ();
 			ips.Add (IPAddress.Loopback);
+			foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces ()) {
+				foreach (var ip in adapter.GetIPProperties ().UnicastAddresses) {
+					ips.Add (ip.Address);
+				}
+			}
+
 			foreach (var ip in ips) {
 				if (ip.AddressFamily != AddressFamily.InterNetwork)
 					continue;
 
 				HttpListener listener = HttpListener2Test.CreateAndStartListener (
-					"http://" + ip + ":9000/HttpRequestIsLocal/");
-				NetworkStream ns = HttpListener2Test.CreateNS (ip, 9000);
+					"http://" + ip + ":" + port + "/HttpRequestIsLocal/");
+				NetworkStream ns = HttpListener2Test.CreateNS (ip, port);
 				HttpListener2Test.Send (ns, "GET /HttpRequestIsLocal/ HTTP/1.0\r\n\r\n");
 				HttpListenerContext ctx = listener.GetContext ();
 				HttpListenerRequest request = ctx.Request;
diff --git a/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
index 2776bb742b4..ee6c82895e3 100644
--- a/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
@@ -1718,7 +1718,9 @@ namespace MonoTests.System.Net
 				Where = "first write";
 				StreamWriter writer = new StreamWriter (ns, Encoding.ASCII);
 				writer.Write (  "HTTP/1.1 401 Unauthorized\r\n" +
-						"WWW-Authenticate: NTLM\r\n" +
+					"WWW-Authenticate: ignore\r\n" +
+					"WWW-Authenticate: NTLM\r\n" +
+					"WWW-Authenticate: ignore,K\r\n" +
 						"Content-Length: 5\r\n\r\nWRONG");
 
 				writer.Flush ();
@@ -2309,7 +2311,6 @@ namespace MonoTests.System.Net
 			completed [1] = new ManualResetEvent (false);
 
 			using (ListenerScope scope = new ListenerScope (processor, port, completed [0])) {
-				ManualResetEvent clientCompleted = new ManualResetEvent (false);
 				Uri address = new Uri (string.Format ("http://localhost:{0}", port));
 				HttpWebRequest client = (HttpWebRequest) WebRequest.Create (address);
 
diff --git a/mcs/class/System/Test/System.Net/IPAddressTest.cs b/mcs/class/System/Test/System.Net/IPAddressTest.cs
index e2fbcadabd8..f3c9ad83671 100644
--- a/mcs/class/System/Test/System.Net/IPAddressTest.cs
+++ b/mcs/class/System/Test/System.Net/IPAddressTest.cs
@@ -145,16 +145,8 @@ public class IPAddressTest
 		"0xff.0x7f.0x20.0xf", "255.127.32.15",
 		"0.0.0.0", IPAddress.Any.ToString(),
 		"255.255.255.255", IPAddress.Broadcast.ToString(),
-		"12.1.1.3 abc", "12.1.1.3",
-		"12.1 .1.2", "12.0.0.1",
-		"12.1 .zzzz.2", "12.0.0.1",
 		"12.1.7", "12.1.0.7",
 		"12", "0.0.0.12",
-		"12.5.3 foo.67.test.test.7FFFFFFFFFfaFFF789FFFFFFFFFFFFFFF", "12.5.0.3",
-		"12.1 foo.bar.test.test.baf", "12.0.0.1",
-		"12.1.4.6 foo.bar.test.test.baf", "12.1.4.6",
-		"12.3 foo.bar.test.test.4", "12.0.0.3",
-		"12 foo.bar.test.test.baf", "0.0.0.12",
 		"65536", "0.1.0.0",
 		"65535", "0.0.255.255",
 		"20.65535", "20.0.255.255",
@@ -187,6 +179,14 @@ public class IPAddressTest
 		"12...",
 		"  ",
 		"7848198702",
+		"12.1.1.3 abc",
+		"12.1 .1.2",
+		"12.1 .zzzz.2",
+		"12.5.3 foo.67.test.test.7FFFFFFFFFfaFFF789FFFFFFFFFFFFFFF",
+		"12.1 foo.bar.test.test.baf",
+		"12.1.4.6 foo.bar.test.test.baf",
+		"12.3 foo.bar.test.test.4",
+		"12 foo.bar.test.test.baf",
 	};
 
 	static byte [] ipv4MappedIPv6Prefix = new byte [] { 0,0, 0,0, 0,0, 0,0, 0,0, 0xFF,0xFF };
@@ -197,8 +197,8 @@ public class IPAddressTest
 		Assert.AreEqual ((long) 0, IPAddress.Any.Address, "#1");
 		Assert.AreEqual ((long) 0xFFFFFFFF, IPAddress.Broadcast.Address, "#2");
 		long loopback = IPAddress.HostToNetworkOrder (BitConverter.IsLittleEndian ? 
-							      0x7f000001 : 
-							      0x0100007f);
+								  0x7f000001 : 
+								  0x0100007f);
 		Assert.AreEqual (loopback, IPAddress.Loopback.Address, "#3");
 		Assert.AreEqual ((long) 0xFFFFFFFF, IPAddress.None.Address, "#4");
 	}
@@ -241,8 +241,8 @@ public class IPAddressTest
 	[Test]
 	public void IsLoopbackV6 ()
 	{
-		if (!Socket.SupportsIPv6)
-			Assert.Ignore ("IPv6 must be enabled in machine.config");
+//		if (!Socket.SupportsIPv6)
+//			Assert.Ignore ("IPv6 must be enabled in machine.config");
 
 		IPAddress ip = IPAddress.IPv6Loopback;
 		Assert.IsTrue (IPAddress.IsLoopback (ip), "#1");
@@ -277,24 +277,16 @@ public class IPAddressTest
 	[Test]
 	public void Address ()
 	{
-		// hm, lame, anything is accepted by ms.net
-		/*
 		try {
 			IPAddress ip1 = new IPAddress (0x0000000100000000);
-			Assertion.Fail ("#1");
+			Assert.Fail ("#1");
 		} catch (ArgumentOutOfRangeException) {}
+		
 		IPAddress ip = IPAddress.Parse ("127.0.0.1");
 		ip.Address = 0;
 		ip.Address = 0xffffffff;
-		try {
-			ip.Address = -1;
-			Assertion.Fail ("#2");
-		} catch (ArgumentOutOfRangeException) {}
-		try {
-			ip.Address = 0x0000000100000000;
-			Assertion.Fail ("#3");
-		} catch (ArgumentOutOfRangeException) {}
-		*/
+		ip.Address = -1;
+		ip.Address = 0x0000000100000000;
 	}
 
 	[Test]
@@ -620,8 +612,8 @@ public class IPAddressTest
 	[Test]
 	public void ParseWrongV6 ()
 	{
-		if (!Socket.SupportsIPv6)
-			Assert.Ignore ("IPv6 must be enabled in machine.config");
+		//if (!Socket.SupportsIPv6)
+		//	Assert.Ignore ("IPv6 must be enabled in machine.config");
 
 		for (int i = 0; i < ipv6ParseWrong.Length; i++) {
 			string ipAddress = ipv6ParseWrong [i];
@@ -631,14 +623,12 @@ public class IPAddressTest
 				Assert.Fail ("#1:" + i + " (" + ipAddress + ")");
 			} catch (FormatException ex) {
 				Assert.AreEqual (typeof (FormatException), ex.GetType (), "#2:" + i);
-				Assert.IsNull (ex.InnerException, "#3:" + i);
+				Assert.AreEqual(typeof(SocketException), ex.InnerException.GetType (), "#3:" + i);
 				Assert.IsNotNull (ex.Message, "#4:" + i);
 			}
 		}
 	}
 
-#if NET_4_5
-
 	[Test]
 	public void MapToIPv6 ()
 	{
@@ -673,8 +663,6 @@ public class IPAddressTest
 		return true;
 	}
 
-#endif
-
 	[Test]
 	public void EqualsFromBytes ()
 	{
@@ -686,6 +674,18 @@ public class IPAddressTest
 
 	}
 
+	[Test]
+	[Category ("NotDotNet")]
+	public void UnixInterfaceNameAsZoneIndex ()
+	{
+		var ip = IPAddress.Parse ("fe80::bae8:56ff:fe47:af7e%en0");
+
+		// Should be en0 but it's of long type!
+		Assert.AreEqual (0, ip.ScopeId);
+		
+		Assert.AreEqual ("fe80::bae8:56ff:fe47:af7e", ip.ToString ());
+	}
+
 }
 }
 
diff --git a/mcs/class/System/Test/System.Net/ServicePointTest.cs b/mcs/class/System/Test/System.Net/ServicePointTest.cs
index 63a6b3e52b3..346f35bdeac 100644
--- a/mcs/class/System/Test/System.Net/ServicePointTest.cs
+++ b/mcs/class/System/Test/System.Net/ServicePointTest.cs
@@ -219,7 +219,7 @@ public class ServicePointTest
 
 		ServicePointManager.DnsRefreshTimeout = dnsRefreshTimeout;
 
-		uri = new Uri ("http://www.google.com/");
+		uri = new Uri ("http://localhost/");
 		sp = ServicePointManager.FindServicePoint (uri);
 
 		hostEntryProperty = typeof (ServicePoint).GetProperty ("HostEntry", BindingFlags.NonPublic | BindingFlags.Instance);
diff --git a/mcs/class/System/Test/System.Net/WebProxyTest.cs b/mcs/class/System/Test/System.Net/WebProxyTest.cs
index d88c9864e23..0257ff50fec 100644
--- a/mcs/class/System/Test/System.Net/WebProxyTest.cs
+++ b/mcs/class/System/Test/System.Net/WebProxyTest.cs
@@ -124,11 +124,6 @@ namespace MonoTests.System.Net
 		}
 
 		[Test]
-		public void GetProxy ()
-		{
-		}
-
-		[Test]
 		public void IsByPassed ()
 		{
 			WebProxy p = new WebProxy ("http://proxy.contoso.com", true);
diff --git a/mcs/class/System/Test/System.Security.Cryptography/OidTest.cs b/mcs/class/System/Test/System.Security.Cryptography/OidTest.cs
index 4aa40ff84e7..7179e186f33 100644
--- a/mcs/class/System/Test/System.Security.Cryptography/OidTest.cs
+++ b/mcs/class/System/Test/System.Security.Cryptography/OidTest.cs
@@ -36,7 +36,6 @@ using System.Security.Cryptography;
 namespace MonoTests.System.Security.Cryptography {
 
 	[TestFixture]
-
 	public class OidTest {
 
 		static string invalidOid = "1.0";
@@ -97,7 +96,7 @@ namespace MonoTests.System.Security.Cryptography {
 		public void ConstructorStringStringNull () 
 		{
 			Oid o = new Oid (validOid, null);
-			Assert.IsNull (o.FriendlyName, "FriendlyName");
+			Assert.AreEqual ("RSA", o.FriendlyName, "FriendlyName");
 			Assert.AreEqual (validOid, o.Value, "Value");
 		}
 
@@ -136,7 +135,7 @@ namespace MonoTests.System.Security.Cryptography {
 			Oid o = new Oid (validOid, invalidName);
 			Assert.AreEqual (invalidName, o.FriendlyName, "FriendlyName");
 			o.FriendlyName = null;
-			Assert.IsNull (o.FriendlyName, "FriendlyName-Null");
+			Assert.AreEqual ("RSA", o.FriendlyName, "FriendlyName-Null");
 		}
 
 		[Test]
@@ -212,8 +211,15 @@ namespace MonoTests.System.Security.Cryptography {
 			o.FriendlyName = "sha512";
 			Assert.AreEqual (o.Value, "2.16.840.1.101.3.4.2.3", "sha512 Value from FriendlyName");
 
+			o = new Oid ("2.16.840.1.101.3.4.2.2");
+			Assert.AreEqual ("2.16.840.1.101.3.4.2.2", o.Value, "sha384 Value");
+			Assert.AreEqual ("sha384", o.FriendlyName, "sha384 FriendlyName");
+
+			o = new Oid ("1.2.840.113549.1.1.12");
+			Assert.AreEqual ("1.2.840.113549.1.1.12", o.Value, "sha384RSA Value");
+			Assert.AreEqual ("sha384RSA", o.FriendlyName, "sha384RSA FriendlyName");
+
 			// TODO: add other well known oid as we find them
 		}
 	}
 }
-
diff --git a/mcs/class/System/Test/System.Threading/SemaphoreTest.cs b/mcs/class/System/Test/System.Threading/SemaphoreTest.cs
index e30968bf5ad..db3a57adab5 100644
--- a/mcs/class/System/Test/System.Threading/SemaphoreTest.cs
+++ b/mcs/class/System/Test/System.Threading/SemaphoreTest.cs
@@ -181,6 +181,15 @@ namespace MonoTests.System.Threading {
 		}
 
 		[Test]
+		public void Constructor_CreatedWithSameName ()
+		{
+			var s1 = new Semaphore(1, 5, "name");
+			bool created;
+			var s2 = new Semaphore(1, 5, "name", out created);
+			Assert.IsFalse (created);
+		}
+
+		[Test]
 		[Category ("MobileNotWorking")]
 		public void Constructor_IntIntStringBoolSecurity ()
 		{
diff --git a/mcs/class/System/Test/System.Timers/TimerTest.cs b/mcs/class/System/Test/System.Timers/TimerTest.cs
index 2b6a95ff768..3dd8cf239af 100644
--- a/mcs/class/System/Test/System.Timers/TimerTest.cs
+++ b/mcs/class/System/Test/System.Timers/TimerTest.cs
@@ -40,7 +40,6 @@ namespace MonoTests.System.Timers
 	public class TimerTest
 	{
 		Timer timer;
-		int _elapsedCount;
 
 		[SetUp]
 		public void SetUp ()
@@ -287,19 +286,46 @@ namespace MonoTests.System.Timers
 			Assert.IsFalse (timer.Enabled, "#3");
 		}
 
-		[Test] // bug #325368
+		[Test] // bug https://bugzilla.novell.com/show_bug.cgi?id=325368
 		public void EnabledInElapsed ()
 		{
-			_elapsedCount = 0;
+			var elapsedCount = 0;
+			var mre = new ST.ManualResetEventSlim ();
 			timer = new Timer (50);
 			timer.AutoReset = false;
-			timer.Elapsed += new ElapsedEventHandler (EnabledInElapsed_Elapsed);
+			timer.Elapsed += (s, e) =>
+			{
+				elapsedCount++;
+				if (elapsedCount == 1)
+					timer.Enabled = true;
+				else if (elapsedCount == 2)
+					mre.Set ();
+			};
 			timer.Start ();
 
-			ST.Thread.Sleep (200);
+			Assert.IsTrue (mre.Wait (500), "#1 re-enabling timer in Elapsed didn't work");
+			Assert.AreEqual (2, elapsedCount, "#2 wrong elapsedCount");
 			timer.Stop ();
+		}
 
-			Assert.IsTrue (_elapsedCount == 2,  "#1 loss of events");
+		[Test]
+		public void AutoResetEventFalseStopsFiringElapsed ()
+		{
+			var elapsedCount = 0;
+			var mre = new ST.ManualResetEventSlim ();
+			timer = new Timer (50);
+			timer.AutoReset = false;
+			timer.Elapsed += (s, e) =>
+			{
+				elapsedCount++;
+				if (elapsedCount > 1)
+					mre.Set ();
+			};
+			timer.Start ();
+
+			Assert.IsFalse (mre.Wait (500), "#1 AutoResetEvent=false didn't stop firing Elapsed, elapsedCount=" + elapsedCount);
+			Assert.AreEqual (1, elapsedCount, "#2 wrong elapsedCount");
+			timer.Stop ();
 		}
 
 		[Test]
@@ -308,14 +334,6 @@ namespace MonoTests.System.Timers
 			Assert.IsTrue (new RaceTest (true).Success, "#1");
 			Assert.IsTrue (new RaceTest (false).Success, "#2");
 		}
-
-		void EnabledInElapsed_Elapsed (object sender, ElapsedEventArgs e)
-		{
-			_elapsedCount++;
-			Timer t = sender as Timer;
-			if (_elapsedCount == 1)
-				t.Enabled = true;
-		}
 	}
 
 	class RaceTest
diff --git a/mcs/class/System/Test/System/UriBuilderTest.cs b/mcs/class/System/Test/System/UriBuilderTest.cs
index a01e0accc2f..59ef15dd764 100644
--- a/mcs/class/System/Test/System/UriBuilderTest.cs
+++ b/mcs/class/System/Test/System/UriBuilderTest.cs
@@ -138,7 +138,7 @@ namespace MonoTests.System
 			b.UserName = "myname";
 			Assert.AreEqual ("myname", b.Uri.UserInfo, "2.UserName");
 			b.Password = "mypwd";
-			Assert.AreEqual ("myname", b.Uri.UserInfo, "2.Password");
+			Assert.AreEqual ("myname:mypwd", b.Uri.UserInfo, "2.Password");
 			Assert.AreEqual ("/", b.Uri.LocalPath, "2.Uri.LocalPath");
 
 			b = new UriBuilder ("mailto", "contoso.com");
diff --git a/mcs/class/System/Test/System/UriParserTest.cs b/mcs/class/System/Test/System/UriParserTest.cs
index 66823040979..6cffcb02105 100644
--- a/mcs/class/System/Test/System/UriParserTest.cs
+++ b/mcs/class/System/Test/System/UriParserTest.cs
@@ -356,7 +356,7 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
+		[ExpectedException (typeof (NullReferenceException))]
 		public void IsBaseOf_UriNull ()
 		{
 			UnitTestUriParser p = new UnitTestUriParser ();
@@ -364,7 +364,7 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
+		[ExpectedException (typeof (NullReferenceException))]
 		public void IsBaseOf_NullUri ()
 		{
 			UnitTestUriParser p = new UnitTestUriParser ();
@@ -372,7 +372,6 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void IsWellFormedOriginalString ()
 		{
 			UnitTestUriParser p = new UnitTestUriParser ();
@@ -381,7 +380,6 @@ namespace MonoTests.System {
 
 		[Test]
 		[ExpectedException (typeof (NullReferenceException))]
-		[Category ("NotWorking")]
 		public void IsWellFormedOriginalString_Null ()
 		{
 			UnitTestUriParser p = new UnitTestUriParser ();
@@ -389,7 +387,6 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void OnNewUri ()
 		{
 			string scheme = prefix + "on.new.uri";
@@ -420,7 +417,6 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void OnRegister2 ()
 		{
 			string scheme = prefix + "onregister2";
@@ -442,7 +438,6 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void Resolve ()
 		{
 			UriFormatException error = null;
@@ -451,7 +446,6 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void Resolve_UriNull ()
 		{
 			UriFormatException error = null;
@@ -461,7 +455,6 @@ namespace MonoTests.System {
 
 		[Test]
 		[ExpectedException (typeof (NullReferenceException))]
-		[Category ("NotWorking")]
 		public void Resolve_NullUri ()
 		{
 			UriFormatException error = null;
@@ -500,7 +493,6 @@ namespace MonoTests.System {
 
 		[Test]
 		[ExpectedException (typeof (ArgumentOutOfRangeException))]
-		[Category ("NotWorking")]
 		public void IsKnownScheme_ExtraSpace ()
 		{
 			// same result for space before, inside or after the scheme
diff --git a/mcs/class/System/Test/System/UriTest.cs b/mcs/class/System/Test/System/UriTest.cs
index 405c16d9309..9f5b848af0c 100644
--- a/mcs/class/System/Test/System/UriTest.cs
+++ b/mcs/class/System/Test/System/UriTest.cs
@@ -21,21 +21,12 @@ namespace MonoTests.System
 	[TestFixture]
 	public class UriTest
 	{
-		protected bool isWin32 = false;
-		public bool IriParsing;
+		bool isWin32;
 
 		[TestFixtureSetUp]
 		public void GetReady ()
 		{
 			isWin32 = (Path.DirectorySeparatorChar == '\\');
-
-			//Make sure Uri static constructor is called
-			Uri.EscapeDataString ("");
-
-			FieldInfo iriParsingField = typeof (Uri).GetField ("s_IriParsing",
-				BindingFlags.Static | BindingFlags.GetField | BindingFlags.NonPublic);
-			if (iriParsingField != null)
-				IriParsing = (bool)iriParsingField.GetValue (null);
 		}
 
 		[Test]
@@ -605,10 +596,7 @@ namespace MonoTests.System
 			Uri u1 = new Uri("http://localhost:8080/test.aspx?ReturnUrl=%2fSearchDoc%2fSearcher.aspx");
 			Uri u2 = new Uri("http://localhost:8080/test.aspx?ReturnUrl=%252fSearchDoc%252fSearcher.aspx");
 
-			if (IriParsing)
-				Assert.AreEqual ("http://localhost:8080/test.aspx?ReturnUrl=%2fSearchDoc%2fSearcher.aspx", u1.ToString (), "QE1");
-			else
-				Assert.AreEqual ("http://localhost:8080/test.aspx?ReturnUrl=/SearchDoc/Searcher.aspx", u1.ToString (), "QE1");
+			Assert.AreEqual ("http://localhost:8080/test.aspx?ReturnUrl=%2fSearchDoc%2fSearcher.aspx", u1.ToString (), "QE1");
 
 			Assert.AreEqual ("http://localhost:8080/test.aspx?ReturnUrl=%252fSearchDoc%252fSearcher.aspx", u2.ToString (), "QE2");
 		}
@@ -897,11 +885,10 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category("NotDotNet")]
 		public void CheckHostName1 ()
 		{
 			// reported to MSDN Product Feedback Center (FDBK28671)
-			Assert.AreEqual (UriHostNameType.Unknown, Uri.CheckHostName (":11:22:33:44:55:66:77:88"), "#36 known to fail with ms.net: this is not a valid IPv6 address.");
+			Assert.AreEqual (UriHostNameType.IPv6, Uri.CheckHostName (":11:22:33:44:55:66:77:88"), "#36 known to fail with ms.net: this is not a valid IPv6 address.");
 		}
 
 		[Test]
@@ -1212,14 +1199,6 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("NotWorking")]
-		public void RelativeUri ()
-		{
-			var u = new Uri ("/foo/bar");
-			Assert.IsFalse (u.IsAbsoluteUri, "#1");
-		}
-
-		[Test]
 		public void RelativeFragmentUri ()
 		{
 			Uri u = new Uri("http://localhost/../../../a");
@@ -1737,6 +1716,16 @@ namespace MonoTests.System
 		}
 
 		[Test]
+		[Category ("NotDotNet")]
+		public void UnixAbsolutePath_ReplaceRelative ()
+		{
+			var u1 = new Uri ("/Users/demo/Projects/file.xml");
+			var u2 = new Uri (u1, "b.jpg");
+
+			Assert.AreEqual ("file:///Users/demo/Projects/b.jpg", u2.ToString ());
+		}
+
+		[Test]
 		public void RelativeUriWithColons ()
 		{
 			string s = @"Transform?args=[{""__type"":""Record:#Nostr"",""Code"":""%22test%22SomeGloss"",""ID"":""1"",""Table"":""Glossary""},{""__type"":""Record:#Nostr"",""Code"":""%22test%22All"",""ID"":""2"",""Table"":""GlossView""}, {""__type"":""Record:#Nostr"",""Code"":""%22test%22Q"",""ID"":""3"",""Table"":""Glossary""}]"; // with related to bug #573795
@@ -1934,26 +1923,26 @@ namespace MonoTests.System
 				Uri uri;
 
 				uri = new Uri ("/foo", DotNetRelativeOrAbsolute);
-				Assert.IsFalse (uri.IsAbsoluteUri);
+				Assert.IsFalse (uri.IsAbsoluteUri, "#2");
 				
-				Uri.TryCreate("/foo", DotNetRelativeOrAbsolute, out uri);
-				Assert.IsFalse (uri.IsAbsoluteUri);
+				Assert.IsTrue (Uri.TryCreate("/foo", DotNetRelativeOrAbsolute, out uri), "#3");
+				Assert.IsFalse (uri.IsAbsoluteUri, "#3a");
 
 				if (useDotNetRelativeOrAbsoluteField != null) {
 					uri = new Uri ("/foo", UriKind.RelativeOrAbsolute);
-					Assert.IsTrue (uri.IsAbsoluteUri);
+					Assert.IsTrue (uri.IsAbsoluteUri, "#4");
 
-					Uri.TryCreate("/foo", UriKind.RelativeOrAbsolute, out uri);
-					Assert.IsTrue (uri.IsAbsoluteUri);
+					Assert.IsTrue (Uri.TryCreate("/foo", UriKind.RelativeOrAbsolute, out uri), "#5");
+					Assert.IsTrue (uri.IsAbsoluteUri, "#5a");
 
 					useDotNetRelativeOrAbsoluteField.SetValue (null, true);
 				}
 
 				uri = new Uri ("/foo", UriKind.RelativeOrAbsolute);
-				Assert.IsFalse (uri.IsAbsoluteUri);
+				Assert.IsFalse (uri.IsAbsoluteUri, "#10");
 
-				Uri.TryCreate("/foo", DotNetRelativeOrAbsolute, out uri);
-				Assert.IsFalse (uri.IsAbsoluteUri);
+				Assert.IsTrue (Uri.TryCreate("/foo", UriKind.RelativeOrAbsolute, out uri), "#11");
+				Assert.IsFalse (uri.IsAbsoluteUri, "#11a");
 			} finally {
 				if (useDotNetRelativeOrAbsoluteField != null)
 					useDotNetRelativeOrAbsoluteField.SetValue (null, useDotNetRelativeOrAbsoluteOld);
@@ -2038,42 +2027,50 @@ namespace MonoTests.System
 			var baseUri = new Uri ("http://test.com", UriKind.Absolute);
 			var relUri = new Uri ("path/dot./", UriKind.Relative);
 			var uri = new Uri (baseUri, relUri);
-			if (IriParsing)
-				Assert.AreEqual ("http://test.com/path/dot./", uri.ToString ());
-			else
-				Assert.AreEqual ("http://test.com/path/dot/", uri.ToString ());
+			Assert.AreEqual ("http://test.com/path/dot./", uri.ToString ());
 		}
-	}
 
-	// Tests non default IriParsing
-	[TestFixture]
-	public class UriTestAux : UriTest
-	{
-		private FieldInfo iriParsingField;
-		private bool originalIriParsing;
+		[Test]
+		public void GuardedIPv6Address ()
+		{
+			var x = new Uri ("asfd://[::1]:123/");
+			Assert.AreEqual ("[::1]", x.Host, "#1");
+		}
 
-		[TestFixtureSetUp]
-		public void GetReady2 ()
+		[Test]
+		public void CombineWithUserSchema ()
 		{
-			isWin32 = (Path.DirectorySeparatorChar == '\\');
+			var baseUri = new Uri ("zip:mem:///");
+			var relativeUrl = "zip:mem:///foo/bar.txt";
 
-			//Make sure Uri static constructor is called
-			Uri.EscapeDataString ("");
+			var result = new Uri (baseUri, relativeUrl);
 
-			iriParsingField = typeof (Uri).GetField ("s_IriParsing",
-				BindingFlags.Static | BindingFlags.GetField | BindingFlags.NonPublic);
+			Assert.AreEqual ("zip:mem:///foo/bar.txt", result.ToString ());
+		}
 
-			originalIriParsing = (bool) iriParsingField.GetValue (null);
+		[Test]
+		public void Scheme_msapp ()
+		{
+			var uri = new Uri ("ms-app://s-1-15-2-1613647288");
+			Assert.AreEqual ("ms-app", uri.Scheme);
+		}
 
-			IriParsing = !originalIriParsing;
+		[Test]
+		public void CombineWithUnixAbsolutePath ()
+		{
+			var a = new Uri ("http://localhost/");
+			var b = new Uri ("/foo", UriKind.RelativeOrAbsolute);
+			var res = new Uri (a, b);
 
-			iriParsingField.SetValue (null, IriParsing);
+			Assert.AreEqual ("http://localhost/foo", res.ToString ());
 		}
 
-		[TestFixtureTearDown]
-		public void TearDown ()
+		[Test]
+		public void ImplicitUnixFileWithUnicode ()
 		{
-			iriParsingField.SetValue (null, originalIriParsing);
+			string value = "/Library/Frameworks/System.Runtim…ee";
+			Uri uri;
+			Assert.IsTrue (Uri.TryCreate (value, UriKind.Absolute, out uri));
 		}
 	}
 }
diff --git a/mcs/class/System/mobile_System.dll.sources b/mcs/class/System/mobile_System.dll.sources
index 4bb3791c6d4..821cf273ff8 100644
--- a/mcs/class/System/mobile_System.dll.sources
+++ b/mcs/class/System/mobile_System.dll.sources
@@ -79,51 +79,26 @@ System.Net.Mail/SmtpStatusCode.cs
 ../referencesource/System/net/System/Net/mail/TransferEncoding.cs
 ../referencesource/System/net/System/Net/mail/WriteStateInfoBase.cs
 ../referencesource/System/net/System/Net/mail/mediatypenames.cs
-System.Net.NetworkInformation/DuplicateAddressDetectionState.cs
-System.Net.NetworkInformation/GatewayIPAddressInformation.cs
-System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs
+System.Net.NetworkInformation/IcmpV4Statistics.cs
+System.Net.NetworkInformation/IcmpV6Statistics.cs
 System.Net.NetworkInformation/IPAddressCollection.cs
-System.Net.NetworkInformation/IPAddressInformation.cs
-System.Net.NetworkInformation/IPAddressInformationCollection.cs
 System.Net.NetworkInformation/IPGlobalProperties.cs
 System.Net.NetworkInformation/IPGlobalStatistics.cs
 System.Net.NetworkInformation/IPInterfaceProperties.cs
-System.Net.NetworkInformation/IPStatus.cs
 System.Net.NetworkInformation/IPv4InterfaceProperties.cs
 System.Net.NetworkInformation/IPv4InterfaceStatistics.cs
 System.Net.NetworkInformation/IPv6InterfaceProperties.cs
-System.Net.NetworkInformation/IcmpV4Statistics.cs
-System.Net.NetworkInformation/IcmpV6Statistics.cs
 System.Net.NetworkInformation/LinuxNetworkInterfaceMarshal.cs
 System.Net.NetworkInformation/MacOsNetworkInterfaceMarshal.cs
-System.Net.NetworkInformation/MulticastIPAddressInformation.cs
-System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
-System.Net.NetworkInformation/NetBiosNodeType.cs
-System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
-System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
-System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs
 System.Net.NetworkInformation/NetworkChange.cs
-System.Net.NetworkInformation/NetworkInformationAccess.cs
-System.Net.NetworkInformation/NetworkInformationException.cs
 System.Net.NetworkInformation/NetworkInterface.cs
-System.Net.NetworkInformation/NetworkInterfaceComponent.cs
-System.Net.NetworkInformation/NetworkInterfaceType.cs
-System.Net.NetworkInformation/OperationalStatus.cs
-System.Net.NetworkInformation/PhysicalAddress.cs
 System.Net.NetworkInformation/Ping.cs
 System.Net.NetworkInformation/PingCompletedEventArgs.cs
 System.Net.NetworkInformation/PingCompletedEventHandler.cs
-System.Net.NetworkInformation/PingException.cs
-System.Net.NetworkInformation/PingOptions.cs
-System.Net.NetworkInformation/PingReply.cs
-System.Net.NetworkInformation/PrefixOrigin.cs
-System.Net.NetworkInformation/SuffixOrigin.cs
-System.Net.NetworkInformation/TcpConnectionInformation.cs
-System.Net.NetworkInformation/TcpState.cs
 System.Net.NetworkInformation/TcpStatistics.cs
 System.Net.NetworkInformation/UdpStatistics.cs
 System.Net.NetworkInformation/UnicastIPAddressInformation.cs
-System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
+System.Net.NetworkInformation/Win32NetworkInterfaceMarshal.cs
 ../referencesource/System/net/System/Net/SecureProtocols/AuthenticatedStream.cs
 ../referencesource/System/net/System/Net/SecureProtocols/NegotiateEnumTypes.cs
 System.Net.Security/EncryptionPolicy.cs
@@ -132,7 +107,6 @@ System.Net.Security/NegotiateStream.cs
 System.Net.Security/RemoteCertificateValidationCallback.cs
 System.Net.Security/SslPolicyErrors.cs
 System.Net.Security/SslStream.cs
-System.Net/SocketAddress.cs
 System.Net/SocketPermissionAttribute.cs
 System.Net/SocketPermission.cs
 ../referencesource/System/net/System/Net/Sockets/AddressFamily.cs
@@ -165,98 +139,57 @@ System.Net.Sockets/TcpListener.cs
 System.Net.Sockets/UdpClient.cs
 ../referencesource/System/net/System/Net/Sockets/UdpReceiveResult.cs
 System.Net/AuthenticationManager.cs
-System.Net/AuthenticationSchemeSelector.cs
-System.Net/AuthenticationSchemes.cs
-System.Net/Authorization.cs
 System.Net/BasicClient.cs
 System.Net/BindIPEndPoint.cs
 System.Net/ChunkStream.cs
 System.Net/ChunkedInputStream.cs
-System.Net/ConnectionModes.cs
-System.Net/CredentialCache.cs
 System.Net/DecompressionMethods.cs
 System.Net/DefaultCertificatePolicy.cs
 System.Net/DigestClient.cs
 System.Net/Dns.cs
-System.Net/DnsEndPoint.cs
-System.Net/EndPoint.cs
 System.Net/EndPointListener.cs
 System.Net/EndPointManager.cs
 System.Net/EndpointPermission.cs
-System.Net/FileWebRequest.cs
-System.Net/FileWebRequestCreator.cs
-System.Net/FileWebResponse.cs
 System.Net/FtpAsyncResult.cs
 System.Net/FtpDataStream.cs
 System.Net/FtpRequestCreator.cs
 System.Net/FtpStatus.cs
-System.Net/FtpStatusCode.cs
 System.Net/FtpWebRequest.cs
 System.Net/FtpWebResponse.cs
-System.Net/GlobalProxySelection.cs
 System.Net/HttpConnection.cs
 System.Net/HttpListener.cs
 System.Net/HttpListenerBasicIdentity.cs
 System.Net/HttpListenerContext.cs
-System.Net/HttpListenerException.cs
 System.Net/HttpListenerPrefixCollection.cs
 System.Net/HttpListenerRequest.cs
 System.Net/HttpListenerResponse.cs
 System.Net/HttpListenerTimeoutManager.cs
 System.Net/HttpRequestCreator.cs
-System.Net/HttpRequestHeader.cs
-System.Net/HttpResponseHeader.cs
-System.Net/HttpStatusCode.cs
 System.Net/HttpStreamAsyncResult.cs
-System.Net/HttpVersion.cs
 System.Net/HttpWebRequest.cs
 System.Net/HttpWebResponse.cs
-System.Net/IAuthenticationModule.cs
-System.Net/ICertificatePolicy.cs
-System.Net/ICredentialLookup.cs
 System.Net/ICredentialPolicy.cs
-System.Net/ICredentialsByHost.cs
-System.Net/IPAddress.cs
-System.Net/IPAddress.cs
-System.Net/IPEndPoint.cs
-System.Net/IPHostEntry.cs
-System.Net/IPv6Address.cs
 System.Net/IPv6Address.cs
 System.Net/IWebConnectionState.cs
-System.Net/IWebProxy.cs
 System.Net/IWebProxyScript.cs
-System.Net/IWebRequestCreate.cs
 System.Net/ListenerAsyncResult.cs
 System.Net/ListenerPrefix.cs
 System.Net/MacProxy.cs
 System.Net/MonoHttpDate.cs
 System.Net/NetConfig.cs
-System.Net/NetworkAccess.cs
 System.Net/NetworkCredential.cs
 System.Net/NtlmClient.cs
-System.Net/ProtocolViolationException.cs
 System.Net/RequestStream.cs
 System.Net/ResponseStream.cs
-System.Net/SecurityProtocolType.cs
 System.Net/ServicePoint.cs
 System.Net/ServicePointManager.cs
 System.Net/ServicePointManager.extra.cs
 System.Net/SimpleAsyncResult.cs
-System.Net/SocketAddress.cs
-System.Net/TransportContext.cs
-System.Net/TransportType.cs
 System.Net/WebAsyncResult.cs
 System.Net/WebConnection.cs
 System.Net/WebConnectionData.cs
 System.Net/WebConnectionGroup.cs
 System.Net/WebConnectionStream.cs
-System.Net/WebException.cs
-System.Net/WebExceptionStatus.cs
-System.Net/WebHeaderCollection.cs
-System.Net/WebProxy.cs
-System.Net/WebRequest.cs
-System.Net/WebRequestMethods.cs
-System.Net/WebResponse.cs
 System.Net.WebSockets/ClientWebSocket.cs
 System.Net.WebSockets/ClientWebSocketOptions.cs
 System.Net.WebSockets/HttpListenerWebSocketContext.cs
@@ -331,33 +264,13 @@ System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs
 System.Security.Cryptography/AsnEncodedData.cs
 System.Security.Cryptography/AsnEncodedDataCollection.cs
 System.Security.Cryptography/AsnEncodedDataEnumerator.cs
-System.Security.Cryptography/Oid.cs
-System.Security.Cryptography/OidCollection.cs
-System.Security.Cryptography/OidEnumerator.cs
-System.Security.Cryptography/OidGroup.cs
-System.Threading/Semaphore.cs
 System.Threading/ThreadExceptionEventArgs.cs
 System.Threading/ThreadExceptionEventHandler.cs
 System.Timers/ElapsedEventArgs.cs
-System/DefaultUriParser.cs
-System/FileStyleUriParser.cs
-System/FtpStyleUriParser.cs
-System/GenericUriParser.cs
-System/GenericUriParserOptions.cs
-System/HttpStyleUriParser.cs
 System/IOSelector.cs
-System/NetPipeStyleUriParser.cs
-System/NetTcpStyleUriParser.cs
-System/NewsStyleUriParser.cs
 System/Platform.cs
 System/SRDescriptionAttribute.cs
-System/Uri.cs
-System/UriBuilder.cs
-System/UriHelper.cs
-System/UriParser.cs
 System/UriTypeConverter.cs
-System/UriElements.cs
-System/UriParseComponents.cs
 System.Windows.Input/ICommand.cs
 
 Mono.Net.Security/CallbackHelpers.cs
@@ -375,18 +288,20 @@ Mono.Net.Security/MonoTlsStream.cs
 Mono.Net.Security/NoReflectionHelper.cs
 Mono.Net.Security/SystemCertificateValidator.cs
 
+ReferenceSources/AutoWebProxyScriptEngine.cs
 ReferenceSources/AssertWrapper.cs
+ReferenceSources/CAPI.cs
 ReferenceSources/EnvironmentHelpers.cs
+ReferenceSources/HttpApi.cs
 ReferenceSources/Internal.cs
 ReferenceSources/HttpSysSettings.cs
 ReferenceSources/Logging.cs
 ReferenceSources/NativeMethods.cs
+ReferenceSources/RequestCacheProtocol.cs
 ReferenceSources/SettingsSectionInternal.cs
 ReferenceSources/Socket.cs
 ReferenceSources/SR.cs
 ReferenceSources/SRCategoryAttribute.cs
-ReferenceSources/SystemNetworkCredential.cs
-ReferenceSources/WebHeaderCollectionType.cs
 ReferenceSources/Win32Exception.cs
 
 ../referencesource/System/regex/system/text/regularexpressions/Regex.cs
@@ -743,36 +658,147 @@ ReferenceSources/Win32Exception.cs
 ../referencesource/System/compmod/system/diagnostics/TraceSwitch.cs
 ../referencesource/System/compmod/system/diagnostics/traceutils.cs
 
+../referencesource/System/net/System/_DomainName.cs
+../referencesource/System/net/System/_IPv4Address.cs
+../referencesource/System/net/System/_IPv6Address.cs
+../referencesource/System/net/System/_UncName.cs
+../referencesource/System/net/System/_UriSyntax.cs
+../referencesource/System/net/System/GenericUriParser.cs
+../referencesource/System/net/System/IriHelper.cs
+../referencesource/System/net/System/URI.cs
+../referencesource/System/net/System/uribuilder.cs
 ../referencesource/System/net/System/UriEnumTypes.cs
+../referencesource/System/net/System/UriExt.cs
 ../referencesource/System/net/System/URIFormatException.cs
+../referencesource/System/net/System/UriHelper.cs
 ../referencesource/System/net/System/UriHostNameType.cs
+../referencesource/System/net/System/UriParserTemplates.cs
 ../referencesource/System/net/System/URIPartial.cs
+../referencesource/System/net/System/UriScheme.cs
 
 ../referencesource/System/net/System/Net/_BufferOffsetSize.cs
+../referencesource/System/net/System/Net/_Connection.cs
+../referencesource/System/net/System/Net/_emptywebproxy.cs
+../referencesource/System/net/System/Net/_HeaderInfo.cs
+../referencesource/System/net/System/Net/_HeaderInfoTable.cs
+../referencesource/System/net/System/Net/_HTTPDateParse.cs
+../referencesource/System/net/System/Net/_IStreams.cs
+../referencesource/System/net/System/Net/_NetRes.cs
 ../referencesource/System/net/System/Net/_LazyAsyncResult.cs
 ../referencesource/System/net/System/Net/_LoggingObject.cs
+../referencesource/System/net/System/Net/_PooledStream.cs
+../referencesource/System/net/System/Net/_ProxyChain.cs
 ../referencesource/System/net/System/Net/_ScatterGatherBuffers.cs
+../referencesource/System/net/System/Net/_Semaphore.cs
+../referencesource/System/net/System/Net/_TimerThread.cs
+../referencesource/System/net/System/Net/_WebProxyDataBuilder.cs
+../referencesource/System/net/System/Net/AuthenticationScheme.cs
+../referencesource/System/net/System/Net/AuthenticationSchemeSelector.cs
+../referencesource/System/net/System/Net/Authorization.cs
+../referencesource/System/net/System/Net/CredentialCache.cs
 ../referencesource/System/net/System/Net/cookie.cs
 ../referencesource/System/net/System/Net/cookiecollection.cs
 ../referencesource/System/net/System/Net/cookiecontainer.cs
 ../referencesource/System/net/System/Net/cookieexception.cs
+../referencesource/System/net/System/Net/connectionpool.cs
+../referencesource/System/net/System/Net/DnsEndPoint.cs
+../referencesource/System/net/System/Net/EndPoint.cs
+../referencesource/System/net/System/Net/FtpStatusCode.cs
+../referencesource/System/net/System/Net/filewebrequest.cs
+../referencesource/System/net/System/Net/filewebresponse.cs
+../referencesource/System/net/System/Net/GlobalProxySelection.cs
+../referencesource/System/net/System/Net/HttpListenerException.cs
 ../referencesource/System/net/System/Net/HttpListenerRequestUriBuilder.cs
+../referencesource/System/net/System/Net/HttpRequestHeader.cs
+../referencesource/System/net/System/Net/HttpResponseHeader.cs
+../referencesource/System/net/System/Net/HttpStatusCode.cs
+../referencesource/System/net/System/Net/HttpVersion.cs
+../referencesource/System/net/System/Net/IAuthenticationModule.cs
+../referencesource/System/net/System/Net/ICertificatePolicy.cs
+../referencesource/System/net/System/Net/ICredentials.cs
+../referencesource/System/net/System/Net/ICredentialsByHost.cs
 ../referencesource/System/net/System/Net/Internal.cs
+../referencesource/System/net/System/Net/IPAddress.cs
+../referencesource/System/net/System/Net/IPEndPoint.cs
+../referencesource/System/net/System/Net/IPHostEntry.cs
+../referencesource/System/net/System/Net/iwebproxy.cs
+../referencesource/System/net/System/Net/IWebProxyFinder.cs
+../referencesource/System/net/System/Net/IWebRequestCreate.cs
+../referencesource/System/net/System/Net/NetworkAccess.cs
+../referencesource/System/net/System/Net/ProtocolViolationException.cs
+../referencesource/System/net/System/Net/TransportContext.cs
+../referencesource/System/net/System/Net/TransportType.cs
 ../referencesource/System/net/System/Net/UnicodeDecodingConformance.cs
 ../referencesource/System/net/System/Net/UnicodeEncodingConformance.cs
 ../referencesource/System/net/System/Net/ServicePointManager.cs
+../referencesource/System/net/System/Net/SocketAddress.cs
 ../referencesource/System/net/System/Net/webclient.cs
+../referencesource/System/net/System/Net/WebException.cs
+../referencesource/System/net/System/Net/WebExceptionStatus.cs
+../referencesource/System/net/System/Net/WebHeaderCollection.cs
 ../referencesource/System/net/System/Net/WebPermission.cs
+../referencesource/System/net/System/Net/webproxy.cs
+../referencesource/System/net/System/Net/WebRequestMethods.cs
+../referencesource/System/net/System/Net/WebRequest.cs
+../referencesource/System/net/System/Net/WebResponse.cs
 ../referencesource/System/net/System/Net/WebUtility.cs
 ../referencesource/System/net/System/Net/WriteStreamClosedEventArgs.cs
 
+../referencesource/System/net/System/Net/Cache/RequestCache.cs
+../referencesource/System/net/System/Net/Cache/RequestCacheEntry.cs
 ../referencesource/System/net/System/Net/Cache/RequestCachePolicy.cs
+../referencesource/System/net/System/Net/Cache/RequestCacheManager.cs
+
+../referencesource/System/net/System/Net/Configuration/DefaultProxySection.cs
 
 ../referencesource/System/net/System/Net/Sockets/IPProtectionLevel.cs
 ../referencesource/System/net/System/Net/Sockets/NetworkStream.cs
+
+../referencesource/System/net/System/Net/NetworkInformation/DuplicateAddressDetectionState.cs
+../referencesource/System/net/System/Net/NetworkInformation/GatewayIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/GatewayIPAddressInformationCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPAddressCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPAddressInformationCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPGlobalStatistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPInterfaceProperties.cs
 ../referencesource/System/net/System/Net/NetworkInformation/IPInterfaceStatistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPStatus.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPv4InterfaceProperties.cs
+../referencesource/System/net/System/Net/NetworkInformation/IPv6InterfaceProperties.cs
+../referencesource/System/net/System/Net/NetworkInformation/IcmpV4Statistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/IcmpV6Statistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/MulticastIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/MulticastIPAddressInformationCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkAddressChange.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkInformationException.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkInformationPermission.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkInterface.cs
+../referencesource/System/net/System/Net/NetworkInformation/NetworkInterfaceComponent.cs
+../referencesource/System/net/System/Net/NetworkInformation/OperationalStatus.cs
+../referencesource/System/net/System/Net/NetworkInformation/PhysicalAddress.cs
+../referencesource/System/net/System/Net/NetworkInformation/PingOptions.cs
+../referencesource/System/net/System/Net/NetworkInformation/PingReply.cs
+../referencesource/System/net/System/Net/NetworkInformation/PrefixOrigin.cs
 ../referencesource/System/net/System/Net/NetworkInformation/ScopeLevel.cs
+../referencesource/System/net/System/Net/NetworkInformation/SuffixOrigin.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemGatewayIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemMulticastIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemUnicastIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/SystemTcpConnection.cs
+../referencesource/System/net/System/Net/NetworkInformation/TcpConnection.cs
+../referencesource/System/net/System/Net/NetworkInformation/TcpState.cs
+../referencesource/System/net/System/Net/NetworkInformation/TcpStatistics.cs
+../referencesource/System/net/System/Net/NetworkInformation/UdpStatistics.cs
 ../referencesource/System/net/System/Net/NetworkInformation/UnicastIPAddressInformation.cs
+../referencesource/System/net/System/Net/NetworkInformation/UnicastIPAddressInformationCollection.cs
+../referencesource/System/net/System/Net/NetworkInformation/interfacetype.cs
+../referencesource/System/net/System/Net/NetworkInformation/nodetype.cs
+../referencesource/System/net/System/Net/NetworkInformation/pingexception.cs
+
+../referencesource/System/sys/system/IO/ports/InternalResources.cs
 
 ../referencesource/System/sys/system/runtime/interopservices/DefaultParameterValueAttribute.cs
 ../referencesource/System/sys/system/runtime/interopservices/handlecollector.cs
@@ -780,6 +806,13 @@ ReferenceSources/Win32Exception.cs
 ../referencesource/System/sys/system/runtime/versioning/FrameworkName.cs
 
 ../referencesource/System/sys/system/threading/Barrier.cs
+../referencesource/System/sys/system/threading/semaphore.cs
+
+../referencesource/System/security/system/security/Authentication/ExtendedProtection/TokenBinding.cs
+
+../referencesource/System/security/system/security/cryptography/oid.cs
+
+../referencesource/System/security/system/security/cryptography/x509/x509utils.cs
 
 ../referencesource/System/security/system/security/permissions/typedescriptorpermission.cs
 
diff --git a/mcs/class/System/mobile_static_System_test.dll.excludes b/mcs/class/System/mobile_static_System_test.dll.exclude.sources
index 8f84347cde9..8f84347cde9 100644
--- a/mcs/class/System/mobile_static_System_test.dll.excludes
+++ b/mcs/class/System/mobile_static_System_test.dll.exclude.sources
diff --git a/mcs/class/System/monodroid_System_test.dll.exclude.sources b/mcs/class/System/monodroid_System_test.dll.exclude.sources
new file mode 100644
index 00000000000..1aea9da1bae
--- /dev/null
+++ b/mcs/class/System/monodroid_System_test.dll.exclude.sources
@@ -0,0 +1,83 @@
+#include mobile_static_System_test.dll.exclude.sources
+#include monodroid_System_test.dll.new-exclude.sources
+Microsoft.Win32/IntranetZoneCredentialPolicyCas.cs
+Microsoft.Win32/IntranetZoneCredentialPolicyTest.cs
+Microsoft.Win32/PowerModeChangedEventArgsCas.cs
+Microsoft.Win32/SessionEndedEventArgsCas.cs
+Microsoft.Win32/SessionEndingEventArgsCas.cs
+Microsoft.Win32/SessionSwitchEventArgsCas.cs
+Microsoft.Win32/SessionSwitchEventArgsTest.cs
+Microsoft.Win32/SystemEventsCas.cs
+Microsoft.Win32/TimerElapsedEventArgsCas.cs
+Microsoft.Win32/UserPreferenceChangedEventArgsCas.cs
+Microsoft.Win32/UserPreferenceChangingEventArgsCas.cs
+System.Collections.Concurrent/CollectionStressTestHelper.cs
+System.Collections.Specialized/BitVector32Cas.cs
+System.Collections.Specialized/CollectionsUtilCas.cs
+System.Collections.Specialized/HybridDictionaryCas.cs
+System.Collections.Specialized/ListDictionaryCas.cs
+System.Collections.Specialized/NameObjectCollectionBaseCas.cs
+System.Collections.Specialized/NameValueCollectionCas.cs
+System.Collections.Specialized/OrderedDictionaryCas.cs
+System.Collections.Specialized/StringCollectionCas.cs
+System.Collections.Specialized/StringDictionaryCas.cs
+System.ComponentModel.Design.Serialization/InstanceDescriptorCas.cs
+System/FileStyleUriParserCas.cs
+System/FtpStyleUriParserCas.cs
+System/GenericUriParserCas.cs
+System/GopherStyleUriParserCas.cs
+System/HttpStyleUriParserCas.cs
+System.IO.Compression/DeflateStreamCas.cs
+System.IO.Compression/GZipStreamCas.cs
+System/LdapStyleUriParserCas.cs
+System.Net/DnsCas.cs
+System.Net/FileWebRequestCas.cs
+System.Net/HttpListener2Test.cs
+System.Net/HttpListenerRequestTest.cs
+System.Net/HttpWebRequestCas.cs
+System/NetPipeStyleUriParserCas.cs
+System.Net.Sockets/NetworkStreamCas.cs
+System.Net.Sockets/SocketCas.cs
+System.Net.Sockets/TcpClientCas.cs
+System/NetTcpStyleUriParserCas.cs
+System/NewsStyleUriParserCas.cs
+System.Security.Cryptography.X509Certificates/PublicKeyCas.cs
+System.Security.Cryptography.X509Certificates/X500DistinguishedNameCas.cs
+System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtensionCas.cs
+System.Security.Cryptography.X509Certificates/X509CertificateCollectionCas.cs
+System.Security.Cryptography.X509Certificates/X509ChainCas.cs
+System.Security.Cryptography.X509Certificates/X509ChainPolicyCas.cs
+System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtensionCas.cs
+System.Security.Cryptography.X509Certificates/X509ExtensionCas.cs
+System.Security.Cryptography.X509Certificates/X509KeyUsageExtensionCas.cs
+System.Security.Cryptography.X509Certificates/X509StoreCas.cs
+System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtensionCas.cs
+System.Security.Permissions/ResourcePermissionBaseCas.cs
+System.Security.Permissions/ResourcePermissionBaseEntryCas.cs
+System.Security.Permissions/ResourcePermissionBaseEntryTest.cs
+System.Security.Permissions/ResourcePermissionBaseTest.cs
+System.Security.Permissions/StorePermissionAttributeCas.cs
+System.Security.Permissions/StorePermissionAttributeTest.cs
+System.Security.Permissions/StorePermissionCas.cs
+System.Security.Permissions/StorePermissionTest.cs
+System.Text.RegularExpressions/CaptureCas.cs
+System.Text.RegularExpressions/CaptureCollectionCas.cs
+System.Text.RegularExpressions/GroupCas.cs
+System.Text.RegularExpressions/GroupCollectionCas.cs
+System.Text.RegularExpressions/MatchCas.cs
+System.Text.RegularExpressions/MatchCollectionCas.cs
+System.Text.RegularExpressions/RegexCas.cs
+System.Text.RegularExpressions/RegexCompilationInfoCas.cs
+System.Text.RegularExpressions/RegexRunnerCas.cs
+System.Text.RegularExpressions/RegexRunnerFactoryCas.cs
+System.Threading/SemaphoreCas.cs
+System.Threading/SemaphoreFullExceptionCas.cs
+System.Threading/ThreadExceptionEventArgsCas.cs
+System.Timers/ElapsedEventArgsCas.cs
+System.Timers/TimerCas.cs
+System.Timers/TimersDescriptionAttributeCas.cs
+System/UriBuilderCas.cs
+System/UriCas.cs
+System/UriFormatExceptionCas.cs
+System/UriParserCas.cs
+System/UriTypeConverterCas.cs
diff --git a/mcs/class/System/monodroid_System_test.dll.new-exclude.sources b/mcs/class/System/monodroid_System_test.dll.new-exclude.sources
new file mode 100644
index 00000000000..5e785195449
--- /dev/null
+++ b/mcs/class/System/monodroid_System_test.dll.new-exclude.sources
@@ -0,0 +1,2 @@
+System.Net/HttpWebRequestTest.cs
+System.Net.Sockets/SocketAcceptAsyncTest.cs
diff --git a/mcs/class/System/monodroid_System_test.dll.sources b/mcs/class/System/monodroid_System_test.dll.sources
new file mode 100644
index 00000000000..3944a95be6a
--- /dev/null
+++ b/mcs/class/System/monodroid_System_test.dll.sources
@@ -0,0 +1 @@
+#include System_test.dll.sources
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_x.csproj b/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_x.csproj
index f359a27bd05..cff36539f3b 100644
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_x.csproj
+++ b/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -60,15 +63,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_x.csproj b/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_x.csproj
index f06409b2b3d..ed37cbc38ad 100644
--- a/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_x.csproj
+++ b/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -59,15 +62,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/WindowsBase/Makefile b/mcs/class/WindowsBase/Makefile
index 842c1ed0ebe..d3eaf78bc82 100644
--- a/mcs/class/WindowsBase/Makefile
+++ b/mcs/class/WindowsBase/Makefile
@@ -6,7 +6,7 @@ LIBRARY = WindowsBase.dll
 LIB_REFS = System System.Xml
 LIB_MCS_FLAGS = -unsafe
 TEST_MCS_FLAGS = -unsafe
-TEST_LIB_REFS = WindowsBase System System.Xml System.Core
+TEST_LIB_REFS = WindowsBase System System.Xml System.Core System.IO.Compression
 
 ifeq (2.0, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:NET_3_0
diff --git a/mcs/class/WindowsBase/System.IO.Packaging/Package.cs b/mcs/class/WindowsBase/System.IO.Packaging/Package.cs
index 96ea9a5403b..e4b4ae11d2a 100644
--- a/mcs/class/WindowsBase/System.IO.Packaging/Package.cs
+++ b/mcs/class/WindowsBase/System.IO.Packaging/Package.cs
@@ -457,6 +457,8 @@ namespace System.IO.Packaging {
 
 		internal static void WriteRelationships (Dictionary <string, PackageRelationship> relationships, Stream stream)
 		{
+			stream.SetLength(0);
+
 			XmlDocument doc = new XmlDocument ();
 			XmlNamespaceManager manager = new XmlNamespaceManager (doc.NameTable);
 			manager.AddNamespace ("rel", RelationshipNamespace);
diff --git a/mcs/class/WindowsBase/System.IO.Packaging/ZipPackage.cs b/mcs/class/WindowsBase/System.IO.Packaging/ZipPackage.cs
index 435e1d5ab7c..783350b0934 100644
--- a/mcs/class/WindowsBase/System.IO.Packaging/ZipPackage.cs
+++ b/mcs/class/WindowsBase/System.IO.Packaging/ZipPackage.cs
@@ -95,8 +95,10 @@ namespace System.IO.Packaging {
 		{
 			// Ensure that all the data has been read out of the package
 			// stream already. Otherwise we'll lose data when we recreate the zip
-			foreach (ZipPackagePart part in Parts.Values)
-				part.GetStream ().Dispose ();
+			foreach (ZipPackagePart part in Parts.Values) {
+				if (part.Package != null)
+					part.GetStream ().Dispose ();
+			}
 			
 			// Empty the package stream
 			PackageStream.Position = 0;
@@ -107,6 +109,9 @@ namespace System.IO.Packaging {
 
 				// Write all the part streams
 				foreach (ZipPackagePart part in Parts.Values) {
+					if (part.Package == null)
+						continue;
+
 					Stream partStream = part.GetStream ();
 					partStream.Seek (0, SeekOrigin.Begin);
 					
diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageRelationshipTests.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageRelationshipTests.cs
index 6ce92d31e57..ade937eea58 100644
--- a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageRelationshipTests.cs
+++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageRelationshipTests.cs
@@ -184,5 +184,33 @@ namespace MonoTests.System.IO.Packaging {
                                                         d.RelationshipType == node.Attributes["Type"].InnerText));
             }
         }
+
+        [Test]
+        public void CheckRelationshipDeletion ()
+        {
+            AddThreeRelationShips ();
+            package.Flush ();
+
+            foreach (PackageRelationship p in new List<PackageRelationship> (package.GetRelationships ()).Skip(1))
+                package.DeleteRelationship (p.Id);
+
+            PackagePart part = package.GetPart (new Uri ("/_rels/.rels", UriKind.Relative));
+            Assert.IsNotNull (package.GetPart (new Uri ("/_RELS/.RELS", UriKind.Relative)), "#0");
+            package.Flush ();
+            Assert.IsNotNull (part, "#1");
+
+            Stream stream = part.GetStream ();
+            Assert.IsTrue (stream.Length > 0, "#2a");
+
+            XmlDocument doc = new XmlDocument ();
+            XmlNamespaceManager manager = new XmlNamespaceManager (doc.NameTable);
+            manager.AddNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
+            doc.Load (new StreamReader (stream));
+
+            Assert.IsNotNull (doc.SelectSingleNode ("/rel:Relationships", manager), "#2b");
+
+            XmlNodeList list = doc.SelectNodes ("/rel:Relationships/*", manager);
+            Assert.AreEqual (1, list.Count);
+        }
     }
 }
diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageTest.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageTest.cs
index 933449052f3..9a1aa2ea4fb 100644
--- a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageTest.cs
+++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageTest.cs
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.IO.Packaging;
 using System.Linq;
 using System.Text;
@@ -116,7 +117,7 @@ namespace MonoTests.System.IO.Packaging {
             package = Package.Open (path);
             package.Close ();
             package = Package.Open (path);
-        }
+        } 
 		
 		[Test]
 		public void Close_FileStreamNotClosed ()
@@ -416,5 +417,27 @@ namespace MonoTests.System.IO.Packaging {
             File.Create (path).Close ();
             package = Package.Open (path, FileMode.OpenOrCreate, FileAccess.Write);
         }
+
+        [Test]
+        public void Check_ZipDateTime ()
+        {
+            using (var zipStream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.ReadWrite))
+            using (package = Package.Open (zipStream, FileMode.OpenOrCreate)) {
+                var part = package.CreatePart (new Uri ("/test", UriKind.Relative), "test/type");
+                using (var stream = part.GetStream ())
+                    stream.Write (new byte [1024 * 1024], 0, 1024 * 1024);
+            }
+
+            using (var stream = new FileStream (path, FileMode.Open, FileAccess.Read))
+            using (var archive = new ZipArchive(stream))
+            {                
+                foreach (var entry in archive.Entries)
+                {
+                    Assert.AreEqual (DateTime.Now.Year, entry.LastWriteTime.Year);
+                    Assert.AreEqual (DateTime.Now.Month, entry.LastWriteTime.Month);
+                    Assert.AreEqual (DateTime.Now.Day, entry.LastWriteTime.Day);
+                }
+            }
+        }           
     }
 }
diff --git a/mcs/class/WindowsBase/WindowsBase-net_4_x.csproj b/mcs/class/WindowsBase/WindowsBase-net_4_x.csproj
index 1bd14f7aa31..5ac7164723c 100644
--- a/mcs/class/WindowsBase/WindowsBase-net_4_x.csproj
+++ b/mcs/class/WindowsBase/WindowsBase-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -252,15 +255,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/WindowsBase/ZipSharp/ZipFileInfo.cs b/mcs/class/WindowsBase/ZipSharp/ZipFileInfo.cs
index 2cbea32a40c..2a81a73959b 100644
--- a/mcs/class/WindowsBase/ZipSharp/ZipFileInfo.cs
+++ b/mcs/class/WindowsBase/ZipSharp/ZipFileInfo.cs
@@ -5,9 +5,11 @@
 //
 
 using System;
+using System.Runtime.InteropServices;
 
 namespace zipsharp
 {
+	[StructLayoutAttribute (LayoutKind.Sequential)]
 	struct ZipFileInfo
 	{
 		ZipTime date;
@@ -38,7 +40,7 @@ namespace zipsharp
 		public ZipFileInfo (DateTime fileTime)
 		{
 			date = new ZipTime (fileTime);
-			dosDate = new IntPtr ((int)fileTime.ToFileTime ());
+			dosDate = IntPtr.Zero;
 			internalFileAttributes = IntPtr.Zero;
 			externalFileAttributes = IntPtr.Zero;
 		}
diff --git a/mcs/class/WindowsBase/ZipSharp/ZipTime.cs b/mcs/class/WindowsBase/ZipSharp/ZipTime.cs
index 2736df9410d..e2c3abb66ca 100644
--- a/mcs/class/WindowsBase/ZipSharp/ZipTime.cs
+++ b/mcs/class/WindowsBase/ZipSharp/ZipTime.cs
@@ -25,13 +25,13 @@ namespace zipsharp
 			minute = (uint) time.Minute;
 			hour = (uint) time.Hour;
 			day = (uint) time.Day;
-			month = (uint) time.Month;
+			month = (uint) time.Month - 1;
 			year = (uint) time.Year;
 		}
 
 		public DateTime Date
 		{
-			get { return new DateTime ((int) year, (int) month, (int) day, (int) hour, (int) minute, (int) second); }
+			get { return new DateTime ((int) year, (int) month + 1, (int) day, (int) hour, (int) minute, (int) second); }
 		}
 	}
 }
diff --git a/mcs/class/corlib/Mono/RuntimeHandles.cs b/mcs/class/corlib/Mono/RuntimeHandles.cs
new file mode 100644
index 00000000000..f6d0827bab3
--- /dev/null
+++ b/mcs/class/corlib/Mono/RuntimeHandles.cs
@@ -0,0 +1,95 @@
+//
+// Wrapper handles for Mono Runtime internal structs
+//
+// Authors:
+//   Aleksey Kliger <aleksey@xamarin.com>
+//   Rodrigo Kumpera <kumpera@xamarin.com>
+//
+// Copyright 2016 Dot net foundation.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Mono {
+
+	internal struct RuntimeClassHandle {
+		unsafe RuntimeStructs.MonoClass* value;
+
+		internal unsafe RuntimeClassHandle (RuntimeStructs.MonoClass* value) {
+			this.value = value;
+		}
+
+		internal unsafe RuntimeClassHandle (IntPtr ptr) {
+			this.value = (RuntimeStructs.MonoClass*) ptr;
+		}
+
+		internal unsafe RuntimeStructs.MonoClass* Value {
+			get { return value; }
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (obj == null || GetType () != obj.GetType ())
+				return false;
+
+			unsafe { return value == ((RuntimeClassHandle)obj).Value; }
+		}
+
+		public override int GetHashCode ()
+		{
+			unsafe { return ((IntPtr)value).GetHashCode (); }
+		}
+
+		public bool Equals (RuntimeClassHandle handle)
+		{
+			unsafe { return value == handle.Value; }
+		}
+
+		public static bool operator == (RuntimeClassHandle left, Object right)
+		{
+			return (right != null) && (right is RuntimeClassHandle) && left.Equals ((RuntimeClassHandle)right);
+		}
+
+		public static bool operator != (RuntimeClassHandle left, Object right)
+		{
+			return (right == null) || !(right is RuntimeClassHandle) || !left.Equals ((RuntimeClassHandle)right);
+		}
+
+		public static bool operator == (Object left, RuntimeClassHandle right)
+		{
+			return (left != null) && (left is RuntimeClassHandle) && ((RuntimeClassHandle)left).Equals (right);
+		}
+
+		public static bool operator != (Object left, RuntimeClassHandle right)
+		{
+			return (left == null) || !(left is RuntimeClassHandle) || !((RuntimeClassHandle)left).Equals (right);
+		}
+
+		[MethodImpl(MethodImplOptions.InternalCall)]
+		internal unsafe extern static IntPtr GetTypeFromClass (RuntimeStructs.MonoClass *klass);
+
+		internal RuntimeTypeHandle GetTypeHandle ()
+		{
+			unsafe { return new RuntimeTypeHandle (GetTypeFromClass (value)); }
+		}
+	}
+
+	internal struct RuntimeRemoteClassHandle {
+		unsafe RuntimeStructs.RemoteClass* value;
+
+		internal unsafe RuntimeRemoteClassHandle (RuntimeStructs.RemoteClass* value)
+		{
+			this.value = value;
+		}
+
+		internal RuntimeClassHandle ProxyClass {
+			get {
+				unsafe {
+					return new RuntimeClassHandle (value->proxy_class);
+				}
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/Mono/RuntimeStructs.cs b/mcs/class/corlib/Mono/RuntimeStructs.cs
new file mode 100644
index 00000000000..c4453463262
--- /dev/null
+++ b/mcs/class/corlib/Mono/RuntimeStructs.cs
@@ -0,0 +1,34 @@
+//
+// Mono runtime native structs surfaced to managed code.
+//
+// Authors:
+//   Aleksey Kliger <aleksey@xamarin.com>
+//   Rodrigo Kumpera <kumpera@xamarin.com>
+//
+// Copyright 2016 Dot net foundation.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Mono {
+	internal class RuntimeStructs {
+		// class-internals.h MonoRemoteClass
+		[StructLayout(LayoutKind.Sequential)]
+		internal unsafe struct RemoteClass {
+			internal IntPtr default_vtable;
+			internal IntPtr xdomain_vtable;
+			internal MonoClass* proxy_class;
+			internal IntPtr proxy_class_name;
+			internal uint interface_count;
+			// FIXME: How to represent variable-length array struct member?
+			// MonoClass* interfaces [];
+		}
+
+		internal struct MonoClass {
+		}
+	}
+
+}
+	
diff --git a/mcs/class/corlib/ReferenceSources/RuntimeType.cs b/mcs/class/corlib/ReferenceSources/RuntimeType.cs
index bedcf1af0c1..f577efcd5ca 100644
--- a/mcs/class/corlib/ReferenceSources/RuntimeType.cs
+++ b/mcs/class/corlib/ReferenceSources/RuntimeType.cs
@@ -41,14 +41,78 @@ using System.Runtime.Serialization;
 
 namespace System
 {
+	// Contains information about the type which is expensive to compute
+	[StructLayout (LayoutKind.Sequential)]
+	internal class MonoTypeInfo {
+		// this is the displayed form: special characters
+		// ,+*&*[]\ in the identifier portions of the names
+		// have been escaped with a leading backslash (\)
+		public string full_name;
+		public MonoCMethod default_ctor;
+	}
+
+	[StructLayout (LayoutKind.Sequential)]
 	partial class RuntimeType
 	{
+		[NonSerialized]
+		MonoTypeInfo type_info;
+
 		internal Object GenericCache;
 
-		internal virtual MonoCMethod GetDefaultConstructor ()
+		internal RuntimeType (Object obj)
+		{
+			throw new NotImplementedException ();
+		}
+
+		internal MonoCMethod GetDefaultConstructor ()
+		{
+			MonoCMethod ctor = null;
+
+			if (type_info == null)
+				type_info = new MonoTypeInfo ();
+			else
+				ctor = type_info.default_ctor;
+
+			if (ctor == null) {
+				var ctors = GetConstructors (BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly);
+
+				for (int i = 0; i < ctors.Length; ++i) {
+					if (ctors [i].GetParametersCount () == 0) {
+						type_info.default_ctor = ctor = (MonoCMethod) ctors [i];
+						break;
+					}
+				}
+			}
+
+			return ctor;
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		extern MethodInfo GetCorrespondingInflatedMethod (MethodInfo generic);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		extern ConstructorInfo GetCorrespondingInflatedConstructor (ConstructorInfo generic);
+
+		internal override MethodInfo GetMethod (MethodInfo fromNoninstanciated)
+                {
+			if (fromNoninstanciated == null)
+				throw new ArgumentNullException ("fromNoninstanciated");
+                        return GetCorrespondingInflatedMethod (fromNoninstanciated);
+                }
+
+		internal override ConstructorInfo GetConstructor (ConstructorInfo fromNoninstanciated)
 		{
-			// TODO: Requires MonoType
-			throw new NotSupportedException ();
+			if (fromNoninstanciated == null)
+				throw new ArgumentNullException ("fromNoninstanciated");
+                        return GetCorrespondingInflatedConstructor (fromNoninstanciated);
+		}
+
+		internal override FieldInfo GetField (FieldInfo fromNoninstanciated)
+		{
+			/* create sensible flags from given FieldInfo */
+			BindingFlags flags = fromNoninstanciated.IsStatic ? BindingFlags.Static : BindingFlags.Instance;
+			flags |= fromNoninstanciated.IsPublic ? BindingFlags.Public : BindingFlags.NonPublic;
+			return GetField (fromNoninstanciated.Name, flags);
 		}
 
 		string GetDefaultMemberName ()
@@ -586,12 +650,6 @@ namespace System
 			get;
 		}
 
-		public override string FullName {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
 		public extern override string Name {
 			[MethodImplAttribute(MethodImplOptions.InternalCall)]
 			get;
@@ -624,5 +682,32 @@ namespace System
 			get { return get_core_clr_security_level () == 1; }
 		}
 #endif
+
+		public override int GetHashCode()
+		{
+			Type t = UnderlyingSystemType;
+			if (t != null && t != this)
+				return t.GetHashCode ();
+			return (int)_impl.Value;
+		}
+
+		public override string FullName {
+			get {
+				string fullName;
+				// This doesn't need locking
+				if (type_info == null)
+					type_info = new MonoTypeInfo ();
+				if ((fullName = type_info.full_name) == null)
+					fullName = type_info.full_name = getFullName (true, false);
+
+				return fullName;
+			}
+		}
+
+		internal override bool IsUserType {
+			get {
+				return false;
+			}
+		}
 	}
 }
diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
index 6acc3c4ec77..6a6fcd36f5a 100644
--- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
@@ -1038,16 +1038,6 @@ namespace System.Reflection.Emit
 			return (str == "neutral" ? String.Empty : str);
 		}
 
-		internal override AssemblyName UnprotectedGetName ()
-		{
-			AssemblyName an = base.UnprotectedGetName ();
-			if (sn != null) {
-				an.SetPublicKey (sn.PublicKey);
-				an.SetPublicKeyToken (sn.PublicKeyToken);
-			}
-			return an;
-		}
-
 		/*Warning, @typeArguments must be a mscorlib internal array. So make a copy before passing it in*/
 		internal Type MakeGenericType (Type gtd, Type[] typeArguments)
 		{
@@ -1124,7 +1114,15 @@ namespace System.Reflection.Emit
 
 		public override AssemblyName GetName (bool copiedName)
 		{
-			return base.GetName (copiedName);
+			AssemblyName aname = new AssemblyName ();
+			FillName (this, aname);
+
+			if (sn != null) {
+				aname.SetPublicKey (sn.PublicKey);
+				aname.SetPublicKeyToken (sn.PublicKeyToken);
+			}
+			return aname;
+
 		}
 
 		[MonoTODO ("This always returns an empty array")]
diff --git a/mcs/class/corlib/System.Reflection/Assembly.cs b/mcs/class/corlib/System.Reflection/Assembly.cs
index 0bba65f4693..f75802198eb 100644
--- a/mcs/class/corlib/System.Reflection/Assembly.cs
+++ b/mcs/class/corlib/System.Reflection/Assembly.cs
@@ -423,18 +423,11 @@ namespace System.Reflection {
 		internal extern static void InternalGetAssemblyName (string assemblyFile, AssemblyName aname);
 
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
-		static extern void FillName (Assembly ass, AssemblyName aname);
+		static extern internal void FillName (Assembly ass, AssemblyName aname);
 
-		[MonoTODO ("copiedName == true is not supported")]
 		public virtual AssemblyName GetName (Boolean copiedName)
 		{
-#if !MOBILE
-			// CodeBase, which is restricted, will be copied into the AssemblyName object so...
-			if (SecurityManager.SecurityEnabled) {
-				GetCodeBase (true); // this will ensure the Demand is made
-			}
-#endif
-			return UnprotectedGetName ();
+			throw new NotImplementedException ();
 		}
 
 		public virtual AssemblyName GetName ()
@@ -442,14 +435,6 @@ namespace System.Reflection {
 			return GetName (false);
 		}
 
-		// the security runtime requires access to the assemblyname (e.g. to get the strongname)
-		internal virtual AssemblyName UnprotectedGetName ()
-		{
-			AssemblyName aname = new AssemblyName ();
-			FillName (this, aname);
-			return aname;
-		}
-
 		public override string ToString ()
 		{
 			// note: ToString work without requiring CodeBase (so no checks are needed)
diff --git a/mcs/class/corlib/System.Reflection/MonoAssembly.cs b/mcs/class/corlib/System.Reflection/MonoAssembly.cs
index 34051bd8368..c433bc93dc8 100644
--- a/mcs/class/corlib/System.Reflection/MonoAssembly.cs
+++ b/mcs/class/corlib/System.Reflection/MonoAssembly.cs
@@ -37,6 +37,7 @@ using System.Collections.Generic;
 using System.Runtime.Serialization;
 using System.Threading;
 using System.Diagnostics.Contracts;
+using System.Security;
 using System.Security.Policy;
 using System.Security.Permissions;
 
@@ -128,9 +129,11 @@ namespace System.Reflection {
 
                 if (!suppressSecurityChecks)
                 {
+#if FEATURE_MONO_CAS
 #pragma warning disable 618
                     new SecurityPermission(SecurityPermissionFlag.ControlEvidence).Demand();
 #pragma warning restore 618
+#endif
                 }
             }
 
@@ -149,6 +152,22 @@ namespace System.Reflection {
 			return LoadWithPartialNameInternal (an.ToString (), securityEvidence, ref stackMark);
 		}
 
+		// the security runtime requires access to the assemblyname (e.g. to get the strongname)
+		public override AssemblyName GetName (bool copiedName)
+		{
+
+#if !MOBILE
+			// CodeBase, which is restricted, will be copied into the AssemblyName object so...
+			if (SecurityManager.SecurityEnabled) {
+				var _ = CodeBase; // this will ensure the Demand is made
+			}
+#endif
+
+			AssemblyName aname = new AssemblyName ();
+			FillName (this, aname);
+			return aname;
+		}
+
 	}
 
 	[ComVisible (true)]
diff --git a/mcs/class/corlib/System.Reflection/MonoMethod.cs b/mcs/class/corlib/System.Reflection/MonoMethod.cs
index 04c0c567086..c93233dfffb 100644
--- a/mcs/class/corlib/System.Reflection/MonoMethod.cs
+++ b/mcs/class/corlib/System.Reflection/MonoMethod.cs
@@ -438,7 +438,7 @@ namespace System.Reflection {
 			foreach (Type type in methodInstantiation) {
 				if (type == null)
 					throw new ArgumentNullException ();
-				if (!(type is MonoType))
+				if (!(type is RuntimeType))
 					hasUserType = true;
 			}
 
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ArrayWithOffset.cs b/mcs/class/corlib/System.Runtime.InteropServices/ArrayWithOffset.cs
deleted file mode 100644
index 1ad70d39085..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/ArrayWithOffset.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// System.Runtime.InteropServices.ArrayWithOffset.cs
-//
-// Author:
-//   Miguel de Icaza (miguel@ximian.com)
-//
-// (C) Novell, Inc.  http://www.ximian.com
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-
-namespace System.Runtime.InteropServices {
-
-	[Serializable]
-	[ComVisible (true)]
-	public struct ArrayWithOffset {
-		object array;
-		int offset;
-
-		public ArrayWithOffset (object array, int offset)
-		{
-			this.array = array;
-			this.offset = offset;
-		}
-
-		public override bool Equals (object obj)
-		{
-			if (obj == null)
-				return false;
-			if (!(obj is ArrayWithOffset))
-				return false;
-			ArrayWithOffset other = (ArrayWithOffset) obj;
-
-			return (other.array == array && other.offset == offset);
-		}
-
-		public bool Equals (ArrayWithOffset obj)
-		{
-			return obj.array == array && obj.offset == offset;
-		}
-
-		public static bool operator == (ArrayWithOffset a, ArrayWithOffset b)
-		{
-			return a.Equals (b);
-		}
-
-		public static bool operator != (ArrayWithOffset a, ArrayWithOffset b)
-		{
-			return !a.Equals (b);
-		}
-
-		public override int GetHashCode ()
-		{
-			return offset;
-		}
-
-		public object GetArray ()
-		{
-			return array;
-		}				
-
-		public int GetOffset ()
-		{
-			return offset;
-		}				
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/AssemblyRegistrationFlags.cs b/mcs/class/corlib/System.Runtime.InteropServices/AssemblyRegistrationFlags.cs
deleted file mode 100644
index 244e7273fc2..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/AssemblyRegistrationFlags.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Runtime.InteropServices.AssemblyRegistrationFlags.cs
-//
-// Author:
-//   Kevin Winchester (kwin@ns.sympatico.ca)
-//
-// (C) 2002 Kevin Winchester
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Runtime.InteropServices
-{
-	[Flags]
-	[ComVisible(true)]
-	public enum AssemblyRegistrationFlags {
-		None = 0,
-		SetCodeBase,
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/BStrWrapper.cs b/mcs/class/corlib/System.Runtime.InteropServices/BStrWrapper.cs
deleted file mode 100644
index 5f392b89793..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/BStrWrapper.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// System.Runtime.InteropServices.BStrWrapper
-//
-// Author:
-//   Kazuki Oikawa  (kazuki@panicode.com)
-//
-
-using System;
-
-namespace System.Runtime.InteropServices
-{
-	[Serializable]
-	[ComVisible (true)]
-	public sealed class BStrWrapper
-	{
-		string _value;
-
-		public BStrWrapper (string value)
-		{
-			_value = value;
-		}
-		
-		public BStrWrapper (object value)
-		{
-			_value = (string)value;
-		}
-
-		public string WrappedObject { get { return _value; } }
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/COMException.cs b/mcs/class/corlib/System.Runtime.InteropServices/COMException.cs
deleted file mode 100644
index f7ad9af3153..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/COMException.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// COMException.cs - COM Exception
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// (C) 2002 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004, 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Runtime.Serialization;
-
-namespace System.Runtime.InteropServices {
-
-[Serializable]
-[ComVisible (true)]
-public class COMException : ExternalException {
-
-	public COMException () 
-		: base () {}
-
-	public COMException (string message) 
-		: base (message) {}
-
-	public COMException (string message, Exception inner) 
-		: base (message, inner) {}
-
-	public COMException (string message, int errorCode) 
-		: base (message, errorCode) {}
-
-	protected COMException (SerializationInfo info, StreamingContext context) 
-		: base (info, context) {}
-
-	public override string ToString ()
-	{
-		return String.Format (
-			"{0} (0x{1:x}): {2} {3}{4}{5}",
-			GetType (), HResult, Message, InnerException == null ? String.Empty : InnerException.ToString (),
-			Environment.NewLine, StackTrace != null ? StackTrace : String.Empty);
-	}
-} 
-
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/CallingConvention.cs b/mcs/class/corlib/System.Runtime.InteropServices/CallingConvention.cs
deleted file mode 100644
index 4dab193c545..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/CallingConvention.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// CallingConvention.cs
-//
-// This code was automatically generated from
-// ECMA CLI XML Library Specification.
-// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
-// Created: Fri, 7 Sep 2001 16:33:29 UTC
-// Source file: AllTypes.xml
-// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-
-namespace System.Runtime.InteropServices {
-
-	[Serializable]
-	[ComVisible (true)]
-	public enum CallingConvention {
-		Winapi = 1,
-		Cdecl = 2,
-		StdCall = 3,
-		ThisCall = 4,
-		FastCall = 5,
-	} 
-
-} // System.Runtime.InteropServices
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/CharSet.cs b/mcs/class/corlib/System.Runtime.InteropServices/CharSet.cs
deleted file mode 100644
index 565380a9baa..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/CharSet.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// CharSet.cs
-//
-// This code was automatically generated from
-// ECMA CLI XML Library Specification.
-// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
-// Created: Fri, 7 Sep 2001 16:33:35 UTC
-// Source file: AllTypes.xml
-// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-
-namespace System.Runtime.InteropServices {
-
-	[Serializable]
-	[ComVisible (true)]
-	public enum CharSet {
-		None = 1,
-		Ansi = 2,
-		Unicode = 3,
-		Auto = 4,
-	} 
-
-} // System.Runtime.InteropServices
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComMemberType.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComMemberType.cs
deleted file mode 100644
index 480d18a6288..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/ComMemberType.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-// System.Runtime.InteropServices/ComMemberType.cs
-//
-// Paolo Molaro (lupus@ximian.com)
-//
-// (C) 2002 Ximian, Inc.
-
-using System;
-
-namespace System.Runtime.InteropServices
-{
-	[Serializable]
-	[ComVisible (true)]
-	public enum ComMemberType {
-		Method  = 0,
-		PropGet = 1,
-		PropSet = 2
-	}
-}
-
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/CriticalHandle.cs b/mcs/class/corlib/System.Runtime.InteropServices/CriticalHandle.cs
deleted file mode 100644
index ce50aff31b4..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/CriticalHandle.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// System.Runtime.InteropServices.CriticalHandle
-//
-// Author:
-//   Kazuki Oikawa  (kazuki@panicode.com)
-//
-
-
-using System;
-using System.Runtime.ConstrainedExecution;
-using System.Runtime.Serialization;
-
-namespace System.Runtime.InteropServices
-{
-	public abstract class CriticalHandle : CriticalFinalizerObject, IDisposable
-	{
-		protected IntPtr handle;
-		bool _disposed = false;
-
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.MayFail)]
-		protected CriticalHandle (IntPtr invalidHandleValue)
-		{
-			handle = invalidHandleValue;
-		}
-
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		~CriticalHandle ()
-		{
-			Dispose (false);
-		}
-
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		public void Close ()
-		{
-			Dispose (true);
-		}
-
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		public void Dispose ()
-		{
-			Dispose (true);
-		}
-
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		protected virtual void Dispose (bool disposing)
-		{
-			if (_disposed)
-				return;
-
-			if (!IsInvalid){
-				if (!_disposed && !ReleaseHandle ()) {
-					GC.SuppressFinalize (this);
-				} else {
-					// Failed in release...
-				}
-			}
-			_disposed = true;
-		}
-
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		protected abstract bool ReleaseHandle ();
-
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		protected void SetHandle (IntPtr handle)
-		{
-			this.handle = handle;
-		}
-
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		public void SetHandleAsInvalid()
-		{
-			_disposed = true;
-		}
-
-		public bool IsClosed {
-			[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-			get { return _disposed; }
-		}
-
-		public abstract bool IsInvalid {
-			[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-			get;
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/CurrencyWrapper.cs b/mcs/class/corlib/System.Runtime.InteropServices/CurrencyWrapper.cs
deleted file mode 100644
index 5460b164867..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/CurrencyWrapper.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// System.Runtime.InteropServices.CurrencyWrapper.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Runtime.InteropServices
-{
-	[Serializable]
-	[ComVisible (true)]
-	public sealed class CurrencyWrapper
-	{
-		Decimal currency;
-
-		public CurrencyWrapper (decimal obj)
-		{
-			currency = obj;
-		}
-
-		public CurrencyWrapper (object obj)
-		{
-			if (obj.GetType() != typeof(Decimal))
-				throw new ArgumentException ("obj has to be a Decimal type");
-			currency = (Decimal)obj;
-		}
-
-		public decimal WrappedObject {
-			get { return currency; }
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DispatchWrapper.cs b/mcs/class/corlib/System.Runtime.InteropServices/DispatchWrapper.cs
deleted file mode 100644
index dfc5a2a29f2..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/DispatchWrapper.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// System.Runtime.InteropServices.DispatchWrapper.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if !FULL_AOT_RUNTIME
-using System;
-
-namespace System.Runtime.InteropServices
-{
-	[Serializable]
-	[ComVisible (true)]
-	public sealed class DispatchWrapper
-	{
-		object wrappedObject;
-
-		public DispatchWrapper (object obj)
-		{
-			Marshal.GetIDispatchForObject (obj);
-			wrappedObject = obj;
-		}
-
-		public object WrappedObject {
-			get { return wrappedObject; }
-		}
-	}
-}
-#endif
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ErrorWrapper.cs b/mcs/class/corlib/System.Runtime.InteropServices/ErrorWrapper.cs
deleted file mode 100644
index 4bf947af4bc..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/ErrorWrapper.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// System.Runtime.InteropServices.ErrorWrapper.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if !FULL_AOT_RUNTIME
-using System;
-
-namespace System.Runtime.InteropServices
-{
-	[Serializable]
-	[ComVisible (true)]
-	public sealed class ErrorWrapper
-	{
-		int errorCode;
-
-		public ErrorWrapper (Exception e)
-		{
-			this.errorCode = Marshal.GetHRForException (e);
-		}
-
-		public ErrorWrapper (int errorCode)
-		{
-			this.errorCode = errorCode;
-		}
-
-		public ErrorWrapper (object errorCode)
-		{
-			if (errorCode.GetType() != typeof(int))
-				throw new ArgumentException ("errorCode has to be an int type");
-			this.errorCode = (int)errorCode;
-		}
-
-		public int ErrorCode {
-			get { return errorCode; }
-		}
-	}
-}
-#endif
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs b/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs
deleted file mode 100644
index f149ed31ab7..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// System.Runtime.InteropServices.ExternalException.cs
-//
-// Author:
-//   Miguel De Icaza (miguel@ximian.com)
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Runtime.Serialization;
-using System.Globalization;
-
-namespace System.Runtime.InteropServices
-{
-	[Serializable]
-	[ComVisible (true)]
-	public class ExternalException : SystemException
-	{
-		public ExternalException ()
-			: base (Locale.GetText ("External exception"))
-		{
-			HResult = -2147467259;
-		}
-
-		public ExternalException (string message)
-			: base (message)
-		{
-			HResult = -2147467259;
-		}
-
-		protected ExternalException(SerializationInfo info, StreamingContext context)
-			: base (info, context) {
-		}
-
-		public ExternalException (string message, Exception inner)
-			: base (message, inner)
-		{
-			HResult = -2147467259;
-		}
-
-		public ExternalException (string message, int errorCode)
-			: base (message)
-		{
-			HResult = errorCode;
-		}
-
-		public virtual int ErrorCode {
-			get {
-				return HResult;
-			}
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/HandleRef.cs b/mcs/class/corlib/System.Runtime.InteropServices/HandleRef.cs
deleted file mode 100644
index d61d3bc0b75..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/HandleRef.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// System.Runtime.InteropServices.HandleRef
-//
-// Author:
-//   Tim Coleman (tim@timcoleman.com)
-//
-// Copyright (C) 2003 Tim Coleman
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Runtime.InteropServices {
-	[ComVisible (true)]
-	public struct HandleRef {
-
-		#region Fields
-
-		object wrapper;
-		IntPtr handle;
-
-		#endregion // Fields
-
-		#region Constructors
-
-		public HandleRef (object wrapper, IntPtr handle)
-		{
-			this.wrapper = wrapper;
-			this.handle = handle;
-		}
-
-		#endregion // Constructors
-
-		#region Properties
-
-		public IntPtr Handle {
-			get { return handle; }
-		}
-
-		public object Wrapper {
-			get { return wrapper; }
-		}
-
-		#endregion // Properties
-
-		#region Type Conversions
-
-		public static explicit operator IntPtr (HandleRef value)
-		{
-			return value.Handle;
-		}
-		
-		#endregion // Type Conversions
-		public static IntPtr ToIntPtr(HandleRef value)
-		{
-			return value.Handle; 
-			// Why did MS add a function for this?
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ICustomAdapter.cs b/mcs/class/corlib/System.Runtime.InteropServices/ICustomAdapter.cs
deleted file mode 100644
index 6ad1e356618..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/ICustomAdapter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Runtime.InteropServices.ICustomAdapter.cs
-//
-// Author:
-//   Kevin Winchester (kwin@ns.sympatico.ca)
-//
-// (C) 2002 Kevin Winchester
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Runtime.InteropServices {
-
-	[ComVisible (true)]
-	public interface ICustomAdapter {
-		[return: MarshalAs (UnmanagedType.IUnknown)]
-		object GetUnderlyingObject ();
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ICustomFactory.cs b/mcs/class/corlib/System.Runtime.InteropServices/ICustomFactory.cs
deleted file mode 100644
index 2f22d28183d..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/ICustomFactory.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Runtime.InteropServices.ICustomFactory.cs
-//
-// Author:
-//   Kevin Winchester (kwin@ns.sympatico.ca)
-//
-// (C) 2002 Kevin Winchester
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Runtime.InteropServices {
-
-	[ComVisible (true)]
-	public interface ICustomFactory {
-		MarshalByRefObject CreateInstance (Type serverType);
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ICustomMarshaler.cs b/mcs/class/corlib/System.Runtime.InteropServices/ICustomMarshaler.cs
deleted file mode 100644
index 629a97684a9..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/ICustomMarshaler.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Runtime.InteropServices.ICustomMarshaler.cs
-//
-// Author:
-//   Kevin Winchester (kwin@ns.sympatico.ca)
-//
-// (C) 2002 Kevin Winchester
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Runtime.InteropServices {
-
-	[ComVisible (true)]
-	public interface ICustomMarshaler {
-		void CleanUpManagedData (object ManagedObj);
-		void CleanUpNativeData (IntPtr pNativeData);
-		int GetNativeDataSize ();
-		IntPtr MarshalManagedToNative (object ManagedObj);
-		object MarshalNativeToManaged (IntPtr pNativeData);
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/IRegistrationServices.cs b/mcs/class/corlib/System.Runtime.InteropServices/IRegistrationServices.cs
deleted file mode 100644
index 415f2a9da67..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/IRegistrationServices.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// System.Runtime.InteropServices.IRegistrationServices.cs
-//
-// Author:
-//   Kevin Winchester (kwin@ns.sympatico.ca)
-//
-// (C) 2002 Kevin Winchester
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Reflection;
-using System.Security.Permissions;
-namespace System.Runtime.InteropServices {
-
-	[ComVisible(true)]
-	[Guid("CCBD682C-73A5-4568-B8B0-C7007E11ABA2")]
-	public interface IRegistrationServices {
-		Guid GetManagedCategoryGuid ();
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-		string GetProgIdForType (Type type);
-
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-		Type[] GetRegistrableTypesInAssembly (Assembly assembly);
-
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-		bool RegisterAssembly (Assembly assembly, AssemblyRegistrationFlags flags);
-
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-		void RegisterTypeForComClients (Type type, ref Guid g);
-		
-		bool TypeRepresentsComType (Type type);
-		
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-		bool TypeRequiresRegistration (Type type);
-
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.UnmanagedCode)]
-		bool UnregisterAssembly (Assembly assembly);
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/InvalidComObjectException.cs b/mcs/class/corlib/System.Runtime.InteropServices/InvalidComObjectException.cs
deleted file mode 100644
index c484ed73af8..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/InvalidComObjectException.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// System.Runtime.InteropServices.InvalidComObjectException.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.Serialization;
-
-namespace System.Runtime.InteropServices
-{
-	[ComVisible(true)]
-	[Serializable]
-	public class InvalidComObjectException : SystemException
-	{
-		private const int ErrorCode = -2146233049; // = 0x80131527
-
-		public InvalidComObjectException ()
-			: base (Locale.GetText ("Invalid COM object is used"))
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public InvalidComObjectException (string message)
-			: base (message)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public InvalidComObjectException (string message, Exception inner)
-			: base (message, inner)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		protected InvalidComObjectException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/InvalidOleVariantTypeException.cs b/mcs/class/corlib/System.Runtime.InteropServices/InvalidOleVariantTypeException.cs
deleted file mode 100644
index d280bf4c56a..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/InvalidOleVariantTypeException.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// System.Runtime.InteropServices.InvalidOleVariantTypeException.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.Serialization;
-
-namespace System.Runtime.InteropServices
-{
-	[ComVisible(true)]
-	[Serializable]
-	public class InvalidOleVariantTypeException : SystemException
-	{
-		private const int ErrorCode = -2146233039; // = 0x80131531
-
-		public InvalidOleVariantTypeException ()
-			: base (Locale.GetText ("Found native variant type cannot be marshalled to managed code"))
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public InvalidOleVariantTypeException (string message)
-			: base (message)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public InvalidOleVariantTypeException (string message, Exception inner)
-			: base (message, inner)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		protected InvalidOleVariantTypeException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/LayoutKind.cs b/mcs/class/corlib/System.Runtime.InteropServices/LayoutKind.cs
deleted file mode 100644
index 25fe51b57da..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/LayoutKind.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// LayoutKind.cs
-//
-// This code was automatically generated from
-// ECMA CLI XML Library Specification.
-// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
-// Created: Fri, 7 Sep 2001 16:33:48 UTC
-// Source file: AllTypes.xml
-// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-namespace System.Runtime.InteropServices {
-
-	[ComVisible(true)]
-	[Serializable]
-	public enum LayoutKind {
-		Sequential = 0,
-		Explicit = 2,
-		Auto = 3
-	}
-	
-} 
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
index 24f15e3f980..a1b028b08c1 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
@@ -1664,5 +1664,9 @@ namespace System.Runtime.InteropServices
 			
 			return GetFunctionPointerForDelegateInternal ((Delegate)(object)d);
 		}
+
+		internal static void SetLastWin32Error (int error)
+		{
+		}
 	}
 }
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/MarshalDirectiveException.cs b/mcs/class/corlib/System.Runtime.InteropServices/MarshalDirectiveException.cs
deleted file mode 100644
index 13c9c1554ad..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/MarshalDirectiveException.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// System.Runtime.InteropServices.MarshalDirectiveException.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.Serialization;
-
-namespace System.Runtime.InteropServices
-{
-	[ComVisible(true)]
-	[Serializable]
-	public class MarshalDirectiveException : SystemException
-	{
-		private const int ErrorCode = -2146233035; // = 0x80131535
-
-		public MarshalDirectiveException ()
-			: base (Locale.GetText ("Unsupported MarshalAsAttribute found"))
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public MarshalDirectiveException (string message)
-			: base (message)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public MarshalDirectiveException (string message, Exception inner)
-			: base (message, inner)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		protected MarshalDirectiveException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ObjectCreationDelegate.cs b/mcs/class/corlib/System.Runtime.InteropServices/ObjectCreationDelegate.cs
deleted file mode 100644
index 92dbc2fcb81..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/ObjectCreationDelegate.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Runtime.InteropServices.ObjectCreationDelegate.cs
-//
-// Author:
-//   Miguel de Icaza (miguel@ximian.com)
-//
-// (C) Novell, Inc.  http://www.ximian.com
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-
-namespace System.Runtime.InteropServices {
-
-	[ComVisible(true)]
-	public delegate IntPtr ObjectCreationDelegate (IntPtr aggregator);
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/SEHException.cs b/mcs/class/corlib/System.Runtime.InteropServices/SEHException.cs
deleted file mode 100644
index e3547cbdee1..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/SEHException.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// System.Runtime.InteropServices.SEHException.cs
-//
-// Authors:
-//    Gonzalo Paniagua Javier <gonzalo@ximian.com>
-//
-// (c) 2003 Ximian, Inc. http://www.ximian.com
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Runtime.Serialization;
-
-namespace System.Runtime.InteropServices
-{
-	[ComVisible(true)]	
-	[Serializable]
-	public class SEHException : ExternalException
-	{
-		public SEHException ()
-		{
-		}
-
-		public SEHException (string message)
-			: base (message)
-		{
-		}
-
-		public SEHException (string message, Exception inner)
-			: base (message, inner)
-		{
-		}
-
-		protected SEHException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-		}
-
-		public virtual bool CanResume ()
-		{
-			return false;
-		}
-	}
-}
-
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayRankMismatchException.cs b/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayRankMismatchException.cs
deleted file mode 100644
index c712d91bbe0..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayRankMismatchException.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// System.Runtime.InteropServices.SafeArrayRankMismatchException.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.Serialization;
-
-namespace System.Runtime.InteropServices
-{
-	[ComVisible(true)]
-	[Serializable]
-	public class SafeArrayRankMismatchException : SystemException
-	{
-		private const int ErrorCode = -2146233032; // = 0x80131538
-
-		public SafeArrayRankMismatchException ()
-			: base (Locale.GetText ("The incoming SAVEARRAY does not match the rank of the expected managed signature"))
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public SafeArrayRankMismatchException (string message)
-			: base (message)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public SafeArrayRankMismatchException (string message, Exception inner)
-			: base (message, inner)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		protected SafeArrayRankMismatchException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs b/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs
deleted file mode 100644
index e23c5f6c298..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// System.Runtime.InteropServices.SafeArrayTypeMismatchException.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.Serialization;
-
-namespace System.Runtime.InteropServices
-{
-	[ComVisible(true)]
-	[Serializable]
-	public class SafeArrayTypeMismatchException : SystemException
-	{
-		private const int ErrorCode = -2146233037; // = 0x80131533
-
-		public SafeArrayTypeMismatchException ()
-			: base (Locale.GetText ("The incoming SAVEARRAY does not match the expected managed signature"))
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public SafeArrayTypeMismatchException (string message)
-			: base (message)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		public SafeArrayTypeMismatchException (string message, Exception inner)
-			: base (message, inner)
-		{
-			this.HResult = ErrorCode;
-		}
-
-		protected SafeArrayTypeMismatchException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs b/mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs
index 305c087a702..b5b59a1ae81 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs
@@ -227,18 +227,5 @@ namespace System.Runtime.InteropServices
 					ReleaseHandle ();
 			}
 		}
-
-		/*
-		 * Implement this abstract method in your derived class to specify how to
-		 * free the handle. Be careful not write any code that's subject to faults
-		 * in this method (the runtime will prepare the infrastructure for you so
-		 * that no jit allocations etc. will occur, but don't allocate memory unless
-		 * you can deal with the failure and still free the handle).
-		 * The boolean returned should be true for success and false if the runtime
-		 * should fire a SafeHandleCriticalFailure MDA (CustomerDebugProbe) if that
-		 * MDA is enabled.
-		 */
-		[ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)]
-		protected abstract bool ReleaseHandle ();
 	}
 }
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UnknownWrapper.cs b/mcs/class/corlib/System.Runtime.InteropServices/UnknownWrapper.cs
deleted file mode 100644
index ae5dda0ea01..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/UnknownWrapper.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.Runtime.InteropServices.UnknownWrapper.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Runtime.InteropServices
-{
-	[Serializable, ComVisible(true)]
-	public sealed class UnknownWrapper
-	{
-		private object InternalObject;
-
-		public UnknownWrapper (object obj)
-		{
-			InternalObject = obj;
-		}
-
-		public object WrappedObject {
-			get { return InternalObject; } 
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/VariantWrapper.cs b/mcs/class/corlib/System.Runtime.InteropServices/VariantWrapper.cs
deleted file mode 100644
index 984cd379ed6..00000000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/VariantWrapper.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// System.Runtime.InteropServices.VariantWrapper.cs
-//
-// Author:
-//   Gert Driesen (drieseng@users.sourceforge.net)
-//
-// (C) Novell, Inc.  http://www.ximian.com
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Runtime.InteropServices
-{
-	[Serializable]
-	public sealed class VariantWrapper
-	{
-		private object _wrappedObject;
-
-		public VariantWrapper (object obj)
-		{
-			_wrappedObject = obj;
-		}
-
-		public object WrappedObject
-		{
-			get
-			{
-				return _wrappedObject;
-			}
-		}
-	}
-}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
index 3b324d1eab7..3640f728591 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
@@ -68,8 +68,38 @@ namespace System.Runtime.Remoting.Messaging {
 		internal static String CallContextKey = "__CallContext";
 		internal static String UriKey           = "__Uri";
 
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		internal extern void InitMessage (MonoMethod method, object [] out_args);
+		internal void InitMessage (MonoMethod method, object [] out_args)
+		{
+			this.method = method;
+			ParameterInfo[] paramInfo = method.GetParametersInternal ();
+			int param_count = paramInfo.Length;
+			args = new object[param_count];
+			arg_types = new byte[param_count];
+			asyncResult = null;
+			call_type = CallType.Sync;
+			names = new string[param_count];
+			for (int i = 0; i < param_count; i++) {
+				names[i] = paramInfo[i].Name;
+			}
+			bool hasOutArgs = out_args != null;
+			int j = 0;
+			for (int i = 0; i < param_count; i++) {
+				byte arg_type;
+				bool isOut = paramInfo[i].IsOut;
+				if (paramInfo[i].ParameterType.IsByRef) {
+					if (hasOutArgs)
+						args[i] = out_args[j++];
+					arg_type = 2; // OUT
+					if (!isOut)
+						arg_type |= 1; // INOUT
+				} else {
+					arg_type = 1; // IN
+					if (isOut)
+						arg_type |= 4; // IN, COPY OUT
+				}
+				arg_types[i] = arg_type;
+			}
+		}
 
 		public MonoMethodMessage (MethodBase method, object [] out_args)
 		{
@@ -79,19 +109,30 @@ namespace System.Runtime.Remoting.Messaging {
 				args = null;
 		}
 
-		public MonoMethodMessage (Type type, string method_name, object [] in_args)
+		internal MonoMethodMessage (MethodInfo minfo, object [] in_args, object [] out_args)
 		{
-			// fixme: consider arg types
-			MethodInfo minfo = type.GetMethod (method_name);
-			
-			InitMessage ((MonoMethod)minfo, null);
+			InitMessage ((MonoMethod)minfo, out_args);
 
 			int len = in_args.Length;
 			for (int i = 0; i < len; i++) {
 				args [i] = in_args [i];
 			}
 		}
+
+		private static MethodInfo GetMethodInfo (Type type, string methodName)
+		{
+			// fixme: consider arg types
+			MethodInfo minfo = type.GetMethod(methodName);
+			if (minfo == null)
+				throw new ArgumentException (String.Format("Could not find '{0}' in {1}", methodName, type), "methodName");
+			return minfo;
+		}
 		
+		public MonoMethodMessage (Type type, string methodName, object [] in_args)
+			: this (GetMethodInfo (type, methodName), in_args, null)
+		{
+		}
+
 		public IDictionary Properties {
 			get {
 				if (properties == null) properties = new MCMDictionary (this);
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
index de4b921cff8..74bc4764adc 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
@@ -49,8 +49,52 @@ namespace System.Runtime.Remoting.Proxies
 	[StructLayout (LayoutKind.Sequential)]
 	internal class TransparentProxy {
 		public RealProxy _rp;
-		IntPtr _class;
+		Mono.RuntimeRemoteClassHandle _class;
 		bool _custom_type_info;
+
+		unsafe internal RuntimeType GetProxyType () {
+			RuntimeTypeHandle h = _class.ProxyClass.GetTypeHandle ();
+			return (RuntimeType)Type.GetTypeFromHandle (h);
+		}
+
+		bool IsContextBoundObject {
+			get { return GetProxyType ().IsContextful; }
+		}
+
+		Context TargetContext {
+			get { return _rp._targetContext; }
+		}
+
+		bool InCurrentContext () {
+			return IsContextBoundObject && Object.ReferenceEquals (TargetContext, Thread.CurrentContext);
+		}
+
+		internal object LoadRemoteFieldNew (IntPtr classPtr, IntPtr fieldPtr) {
+			Mono.RuntimeClassHandle classHandle = new Mono.RuntimeClassHandle (classPtr);
+			RuntimeFieldHandle fieldHandle = new RuntimeFieldHandle (fieldPtr);
+			RuntimeTypeHandle typeHandle = classHandle.GetTypeHandle ();
+
+			FieldInfo field = FieldInfo.GetFieldFromHandle (fieldHandle);
+
+			if (InCurrentContext ()) {
+				object o = _rp._server;
+				return field.GetValue(o);
+			}
+
+			object[] inArgs = new object[] { Type.GetTypeFromHandle(typeHandle).FullName,
+							  field.Name };
+			object[] outArgsMsg = new object[1];
+			MethodInfo minfo = typeof(object).GetMethod("FieldGetter", BindingFlags.NonPublic | BindingFlags.Instance);
+			if (minfo == null)
+				throw new MissingMethodException ("System.Object", "FieldGetter");
+			MonoMethodMessage msg = new MonoMethodMessage (minfo, inArgs, outArgsMsg);
+			object[] outArgs;
+			Exception exc;
+			RealProxy.PrivateInvoke (_rp, msg, out exc, out outArgs);
+			if (exc != null)
+				throw exc;
+			return outArgs[0];
+		}
 	}
 #pragma warning restore 169, 649
 	
@@ -66,7 +110,7 @@ namespace System.Runtime.Remoting.Proxies
 		#region Sync with object-internals.h
 		Type class_to_proxy;
 		internal Context _targetContext;
-		MarshalByRefObject _server;
+		internal MarshalByRefObject _server;
 		int _targetDomainId = -1;
 		internal string _targetUri;
 		internal Identity _objectIdentity;
diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
index bc424ce5e2d..1b35fe1ee90 100644
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
@@ -477,7 +477,7 @@ namespace System.Runtime.Remoting
 		public static bool IsMethodOverloaded(IMethodMessage msg)
 		{
 			const BindingFlags bfinst = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance;
-			MonoType type = (MonoType) msg.MethodBase.DeclaringType;
+			RuntimeType type = (RuntimeType) msg.MethodBase.DeclaringType;
 			return type.GetMethodsByName (msg.MethodName, bfinst, false, type).Length > 1;
 		}
 
diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.Apple.cs b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.Apple.cs
index 7068882bc9a..995865a3c62 100644
--- a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.Apple.cs
+++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.Apple.cs
@@ -12,35 +12,22 @@ namespace System.Security.Cryptography.X509Certificates
 			return new X509CertificateImplApple (handle, false);
 		}
 
-		public static X509CertificateImpl Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags)
+		static X509CertificateImpl Import (byte[] rawData)
 		{
-			MX.X509Certificate x509;
-			IntPtr handle;
-			if (password == null) {
-				handle = CFHelpers.CreateCertificateFromData (rawData);
-				if (handle != IntPtr.Zero)
-					return new X509CertificateImplApple (handle, true);
+			var handle = CFHelpers.CreateCertificateFromData (rawData);
+			if (handle != IntPtr.Zero)
+				return new X509CertificateImplApple (handle, true);
 
+			MX.X509Certificate x509;
+			try {
+				x509 = new MX.X509Certificate (rawData);
+			} catch (Exception e) {
 				try {
-					x509 = new MX.X509Certificate (rawData);
-				} catch (Exception e) {
-					try {
-						x509 = X509Helper.ImportPkcs12 (rawData, null);
-					} catch {
-						string msg = Locale.GetText ("Unable to decode certificate.");
-						// inner exception is the original (not second) exception
-						throw new CryptographicException (msg, e);
-					}
-				}
-			} else {
-				// try PKCS#12
-				try {
-					x509 = X509Helper.ImportPkcs12 (rawData, password);
-				}
-				catch {
-					// it's possible to supply a (unrequired/unusued) password
-					// fix bug #79028
-					x509 = new MX.X509Certificate (rawData);
+					x509 = ImportPkcs12 (rawData, null);
+				} catch {
+					string msg = Locale.GetText ("Unable to decode certificate.");
+					// inner exception is the original (not second) exception
+					throw new CryptographicException (msg, e);
 				}
 			}
 
diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.cs b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.cs
index 1f3f1f83d1f..c12fa6229cf 100644
--- a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.cs
+++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.cs
@@ -148,34 +148,46 @@ namespace System.Security.Cryptography.X509Certificates
 			}
 		}
 
-#if !MONOTOUCH && !XAMMAC
-		public static X509CertificateImpl Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags)
+		static byte[] PEM (string type, byte[] data)
 		{
-			if (nativeHelper != null)
-				return nativeHelper.Import (rawData, password, keyStorageFlags);
+			string pem = Encoding.ASCII.GetString (data);
+			string header = String.Format ("-----BEGIN {0}-----", type);
+			string footer = String.Format ("-----END {0}-----", type);
+			int start = pem.IndexOf (header) + header.Length;
+			int end = pem.IndexOf (footer, start);
+			string base64 = pem.Substring (start, (end - start));
+			return Convert.FromBase64String (base64);
+		}
 
-			MX.X509Certificate x509;
-			if (password == null) {
+		static byte[] ConvertData (byte[] data)
+		{
+			if (data == null || data.Length == 0)
+				return data;
+
+			// does it looks like PEM ?
+			if (data [0] != 0x30) {
 				try {
-					x509 = new MX.X509Certificate (rawData);
-				} catch (Exception e) {
-					try {
-						x509 = ImportPkcs12 (rawData, null);
-					} catch {
-						string msg = Locale.GetText ("Unable to decode certificate.");
-						// inner exception is the original (not second) exception
-						throw new CryptographicException (msg, e);
-					}
+					return PEM ("CERTIFICATE", data);
+				} catch {
+					// let the implementation take care of it.
 				}
-			} else {
-				// try PKCS#12
+			}
+			return data;
+		}
+
+#if !MONOTOUCH && !XAMMAC
+		static X509CertificateImpl Import (byte[] rawData)
+		{
+			MX.X509Certificate x509;
+			try {
+				x509 = new MX.X509Certificate (rawData);
+			} catch (Exception e) {
 				try {
-					x509 = ImportPkcs12 (rawData, password);
-				}
-				catch {
-					// it's possible to supply a (unrequired/unusued) password
-					// fix bug #79028
-					x509 = new MX.X509Certificate (rawData);
+					x509 = ImportPkcs12 (rawData, null);
+				} catch {
+					string msg = Locale.GetText ("Unable to decode certificate.");
+					// inner exception is the original (not second) exception
+					throw new CryptographicException (msg, e);
 				}
 			}
 
@@ -183,6 +195,26 @@ namespace System.Security.Cryptography.X509Certificates
 		}
 #endif
 
+		public static X509CertificateImpl Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags)
+		{
+			if (password == null) {
+				rawData = ConvertData (rawData);
+				return Import (rawData);
+			}
+
+			MX.X509Certificate x509;
+			// try PKCS#12
+			try {
+				x509 = ImportPkcs12 (rawData, password);
+			} catch {
+				// it's possible to supply a (unrequired/unusued) password
+				// fix bug #79028
+				x509 = new MX.X509Certificate (rawData);
+			}
+
+			return new X509CertificateImplMono (x509);
+		}
+
 		public static byte[] Export (X509CertificateImpl impl, X509ContentType contentType, byte[] password)
 		{
 			ThrowIfContextInvalid (impl);
diff --git a/mcs/class/corlib/System.Security.Policy/Evidence.cs b/mcs/class/corlib/System.Security.Policy/Evidence.cs
index f8653aad20a..307c9d788a3 100644
--- a/mcs/class/corlib/System.Security.Policy/Evidence.cs
+++ b/mcs/class/corlib/System.Security.Policy/Evidence.cs
@@ -251,7 +251,7 @@ namespace System.Security.Policy {
 			}
 
 			// strongnamed assemblies gets a StrongName evidence
-			AssemblyName an = a.UnprotectedGetName ();
+			AssemblyName an = a.GetName ();
 			byte[] pk = an.GetPublicKey ();
 			if ((pk != null) && (pk.Length > 0)) {
 				StrongNamePublicKeyBlob blob = new StrongNamePublicKeyBlob (pk);
diff --git a/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs b/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs
index d78fe55eb07..4e1427fe1be 100644
--- a/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs
+++ b/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs
@@ -582,7 +582,7 @@ namespace System.Security.Policy {
 
 		internal bool IsFullTrustAssembly (Assembly a)
 		{
-			AssemblyName an = a.UnprotectedGetName ();
+			AssemblyName an = a.GetName ();
 			StrongNamePublicKeyBlob snpkb = new StrongNamePublicKeyBlob (an.GetPublicKey ());
 			StrongNameMembershipCondition snMC = new StrongNameMembershipCondition (snpkb, an.Name, an.Version);
 			foreach (StrongNameMembershipCondition sn in full_trust_assemblies) {
diff --git a/mcs/class/corlib/System.Security/CodeAccessPermission.cs b/mcs/class/corlib/System.Security/CodeAccessPermission.cs
index 15fbb4ad390..34285b39e3a 100644
--- a/mcs/class/corlib/System.Security/CodeAccessPermission.cs
+++ b/mcs/class/corlib/System.Security/CodeAccessPermission.cs
@@ -52,7 +52,11 @@ namespace System.Security {
 		{
 		}
 
+#if MOBILE
+		[Conditional ("FEATURE_MONO_CAS")]
+#else
 		[MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
+#endif
 		public void Assert ()
 		{
 			new PermissionSet (this).Assert ();
@@ -60,6 +64,9 @@ namespace System.Security {
 
 		public abstract IPermission Copy ();
 
+#if MOBILE
+		[Conditional ("FEATURE_MONO_CAS")]
+#endif
 		public void Demand ()
 		{
 			// note: here we're sure it's a CAS demand
@@ -70,7 +77,11 @@ namespace System.Security {
 			new PermissionSet (this).CasOnlyDemand (3);
 		}
 
+#if MOBILE
+		[Conditional ("FEATURE_MONO_CAS")]
+#else
 		[MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
+#endif
 		public void Deny ()
 		{
 			new PermissionSet (this).Deny ();
@@ -114,13 +125,21 @@ namespace System.Security {
 			return null;
 		}
 
+#if MOBILE
+		[Conditional ("FEATURE_MONO_CAS")]
+#else
 		[MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
+#endif
 		public void PermitOnly ()
 		{
 			new PermissionSet (this).PermitOnly ();
 		}
 
+#if MOBILE
+		[Conditional ("FEATURE_MONO_CAS")]
+#else
 		[MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
+#endif
 		public static void RevertAll ()
 		{
 			if (!SecurityManager.SecurityEnabled)
@@ -128,7 +147,11 @@ namespace System.Security {
 			throw new NotImplementedException ();
 		}
 
+#if MOBILE
+		[Conditional ("FEATURE_MONO_CAS")]
+#else
 		[MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
+#endif
 		public static void RevertAssert ()
 		{
 			if (!SecurityManager.SecurityEnabled)
@@ -136,7 +159,11 @@ namespace System.Security {
 			throw new NotImplementedException ();
 		}
 
+#if MOBILE
+		[Conditional ("FEATURE_MONO_CAS")]
+#else
 		[MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
+#endif
 		public static void RevertDeny ()
 		{
 			if (!SecurityManager.SecurityEnabled)
@@ -144,7 +171,11 @@ namespace System.Security {
 			throw new NotImplementedException ();
 		}
 
+#if MOBILE
+		[Conditional ("FEATURE_MONO_CAS")]
+#else
 		[MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
+#endif
 		public static void RevertPermitOnly ()
 		{
 			if (!SecurityManager.SecurityEnabled)
@@ -233,5 +264,28 @@ namespace System.Security {
 			msg = String.Format (msg, target.GetType (), expected);
 			throw new ArgumentException (msg, "target");
 		}
+
+#if MOBILE
+		// Workaround for CS0629
+		void IStackWalk.Assert ()
+		{
+		}
+
+		void IStackWalk.Deny ()
+		{
+		}
+
+		void IStackWalk.PermitOnly ()
+		{
+		}
+
+		void IStackWalk.Demand ()
+		{
+		}
+
+		void IPermission.Demand ()
+		{
+		}
+#endif
 	}
 }
diff --git a/mcs/class/corlib/System.Threading/Monitor.cs b/mcs/class/corlib/System.Threading/Monitor.cs
index b76c35d2d88..9ec94ff97f9 100644
--- a/mcs/class/corlib/System.Threading/Monitor.cs
+++ b/mcs/class/corlib/System.Threading/Monitor.cs
@@ -37,151 +37,51 @@ using System.Runtime.InteropServices;
 
 namespace System.Threading
 {
-	[ComVisible (true)]
-	public static class Monitor
+	public static partial class Monitor
 	{
-		// Grabs the mutex on object 'obj', with a maximum
-		// wait time 'ms' but doesn't block - if it can't get
-		// the lock it returns false, true if it can
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private extern static bool Monitor_try_enter(object obj, int ms);
+		extern static bool Monitor_test_synchronised(object obj);
 
-		// Enter/Exit are implemented directly as icalls for performance reasons
-
-		// Acquires the mutex on object 'obj'
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		public extern static void Enter(object obj);
-
-		// Releases the mutex on object 'obj'
-		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		public extern static void Exit(object obj);
-
-		// Signals one of potentially many objects waiting on
-		// object 'obj'
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private extern static void Monitor_pulse(object obj);
+		extern static void Monitor_pulse(object obj);
 
-		// Checks whether object 'obj' is currently synchronised
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private extern static bool Monitor_test_synchronised(object obj);
-
-		public static void Pulse(object obj) {
-			if(obj==null) {
-				throw new ArgumentNullException("obj");
-			}
-			if(Monitor_test_synchronised(obj)==false) {
+		static void ObjPulse(Object obj)
+		{
+			if (!Monitor_test_synchronised (obj))
 				throw new SynchronizationLockException("Object is not synchronized");
-			}
 
-			Monitor_pulse(obj);
+			Monitor_pulse (obj);
 		}
 
-		// Signals all of potentially many objects waiting on
-		// object 'obj'
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private extern static void Monitor_pulse_all(object obj);
-
-		public static void PulseAll(object obj) {
-			if(obj==null) {
-				throw new ArgumentNullException("obj");
-			}
-			if(Monitor_test_synchronised(obj)==false) {
-				throw new SynchronizationLockException("Object is not synchronized");
-			}
-
-			Monitor_pulse_all(obj);
-		}
+		extern static void Monitor_pulse_all(object obj);
 
-		public static bool TryEnter (object obj)
+		static void ObjPulseAll(Object obj)
 		{
-			return TryEnter (obj, 0);
-		}
-
-		public static bool TryEnter (object obj, int millisecondsTimeout)
-		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-
-			if (millisecondsTimeout == Timeout.Infinite) {
-				Enter (obj);
-				return true;
-			}
-
-			if (millisecondsTimeout < 0)
-				throw new ArgumentException ("negative value for millisecondsTimeout", "millisecondsTimeout");
-			
-			return Monitor_try_enter (obj, millisecondsTimeout);
-		}
+			if (!Monitor_test_synchronised (obj))
+				throw new SynchronizationLockException("Object is not synchronized");
 
-		public static bool TryEnter (object obj, TimeSpan timeout)
-		{
-			long ms = (long) timeout.TotalMilliseconds;
-			if (ms < Timeout.Infinite || ms > Int32.MaxValue)
-				throw new ArgumentOutOfRangeException ("timeout", "timeout out of range");
-			
-			return TryEnter (obj, (int) ms);
+			Monitor_pulse_all (obj);
 		}
 
-		// Waits for a signal on object 'obj' with maximum
-		// wait time 'ms'. Returns true if the object was
-		// signalled, false if it timed out
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private extern static bool Monitor_wait(object obj, int ms);
-
-		public static bool Wait (object obj)
-		{
-			return Wait (obj, Timeout.Infinite);
-		}
+		extern static bool Monitor_wait(object obj, int ms);
 
-		public static bool Wait (object obj, int millisecondsTimeout)
+		static bool ObjWait(bool exitContext, int millisecondsTimeout, Object obj)
 		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-
-			if (millisecondsTimeout < Timeout.Infinite)
-				throw new ArgumentOutOfRangeException ("millisecondsTimeout", "timeout out of range");
-
+			if (millisecondsTimeout < 0 && millisecondsTimeout != (int) Timeout.Infinite)
+				throw new ArgumentOutOfRangeException ("millisecondsTimeout");
 			if (!Monitor_test_synchronised (obj))
 				throw new SynchronizationLockException ("Object is not synchronized");
 
-			return Monitor_wait (obj, millisecondsTimeout);
-		}
-
-		public static bool Wait (object obj, TimeSpan timeout)
-		{
-			long ms = (long) timeout.TotalMilliseconds;
-			if (ms < Timeout.Infinite || ms > Int32.MaxValue)
-				throw new ArgumentOutOfRangeException ("timeout", "timeout out of range");
-
-			return Wait (obj, (int) ms);
-		}
-
-		public static bool Wait(object obj, int millisecondsTimeout, bool exitContext) {
 			try {
 #if !DISABLE_REMOTING
 				if (exitContext)
 					SynchronizationAttribute.ExitContext ();
 #endif
-				return Wait (obj, millisecondsTimeout);
-			}
-			finally {
-#if !DISABLE_REMOTING
-				if (exitContext)
-					SynchronizationAttribute.EnterContext ();
-#endif
-			}
-		}
 
-		public static bool Wait(object obj, TimeSpan timeout, bool exitContext) {
-			try {
-#if !DISABLE_REMOTING
-				if (exitContext)
-					SynchronizationAttribute.ExitContext ();
-#endif
-				return Wait (obj, timeout);
-			}
-			finally {
+				return Monitor_wait (obj, millisecondsTimeout);
+			} finally {
 #if !DISABLE_REMOTING
 				if (exitContext)
 					SynchronizationAttribute.EnterContext ();
@@ -192,50 +92,27 @@ namespace System.Threading
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		extern static void try_enter_with_atomic_var (object obj, int millisecondsTimeout, ref bool lockTaken);
 
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		extern static void enter_with_atomic_var (object obj, ref bool lockTaken);
-
-		// Can't make this an icall since it has the same name as the other Enter method
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		public static void Enter (object obj, ref bool lockTaken)
+		static void ReliableEnterTimeout(Object obj, int timeout, ref bool lockTaken)
 		{
-			enter_with_atomic_var (obj, ref lockTaken);
-		}
+			if (obj == null)
+				throw new ArgumentNullException ("obj");
+			if (timeout < 0 && timeout != (int) Timeout.Infinite)
+				throw new ArgumentOutOfRangeException ("millisecondsTimeout");
 
-		public static void TryEnter (object obj, ref bool lockTaken)
-		{
-			TryEnter (obj, 0, ref lockTaken);
+			try_enter_with_atomic_var (obj, timeout, ref lockTaken);
 		}
 
-		public static void TryEnter (object obj, TimeSpan timeout, ref bool lockTaken)
+		static void ReliableEnter(Object obj, ref bool lockTaken)
 		{
-			long ms = (long) timeout.TotalMilliseconds;
-			if (ms < Timeout.Infinite || ms > Int32.MaxValue)
-				throw new ArgumentOutOfRangeException ("timeout", "timeout out of range");
-			TryEnter (obj, (int)ms, ref lockTaken);
+			ReliableEnterTimeout (obj, (int) Timeout.Infinite, ref lockTaken);
 		}
 
-		public static void TryEnter (object obj, int millisecondsTimeout, ref bool lockTaken)
-		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			if (lockTaken)
-				throw new ArgumentException ("lockTaken");
-
-			if (millisecondsTimeout < 0 && millisecondsTimeout != Timeout.Infinite)
-				throw new ArgumentException ("negative value for millisecondsTimeout", "millisecondsTimeout");
-
-			try_enter_with_atomic_var (obj, millisecondsTimeout, ref lockTaken);
-		}		
-
-
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		extern static bool Monitor_test_owner (object obj);
 
-		public
-		static bool IsEntered (object obj)
+		static bool IsEnteredNative(Object obj)
 		{
-			return Monitor_test_owner(obj);
+			return Monitor_test_owner (obj);
 		}
 	}
 }
diff --git a/mcs/class/corlib/System.Threading/Thread.cs b/mcs/class/corlib/System.Threading/Thread.cs
index e10918121dd..de7889e827d 100644
--- a/mcs/class/corlib/System.Threading/Thread.cs
+++ b/mcs/class/corlib/System.Threading/Thread.cs
@@ -116,6 +116,7 @@ namespace System.Threading {
 		private InternalThread internal_thread;
 		object m_ThreadStartArg;
 		object pending_exception;
+		int priority;
 		#endregion
 #pragma warning restore 414
 
diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs
index 73fef7906bb..2b031f33287 100644
--- a/mcs/class/corlib/System/Environment.cs
+++ b/mcs/class/corlib/System/Environment.cs
@@ -57,7 +57,7 @@ namespace System {
 		 * of icalls, do not require an increment.
 		 */
 #pragma warning disable 169
-		private const int mono_corlib_version = 146;
+		private const int mono_corlib_version = 151;
 #pragma warning restore 169
 
 		[ComVisible (true)]
diff --git a/mcs/class/corlib/System/MonoCustomAttrs.cs b/mcs/class/corlib/System/MonoCustomAttrs.cs
index 76b5b15e041..8894ec98c98 100644
--- a/mcs/class/corlib/System/MonoCustomAttrs.cs
+++ b/mcs/class/corlib/System/MonoCustomAttrs.cs
@@ -49,14 +49,14 @@ namespace System
 		[ThreadStatic]
 		static Dictionary<Type, AttributeUsageAttribute> usage_cache;
 
-		/* Treat as user types all corlib types extending System.Type that are not MonoType and TypeBuilder */
+		/* Treat as user types all corlib types extending System.Type that are not RuntimeType and TypeBuilder */
 		static bool IsUserCattrProvider (object obj)
 		{
 			Type type = obj as Type;
 #if !FULL_AOT_RUNTIME
-			if ((type is MonoType) || (type is TypeBuilder))
+			if ((type is RuntimeType) || (type is TypeBuilder))
 #else
-			if (type is MonoType)
+			if (type is RuntimeType)
 #endif
 				return false;
 			if ((obj is Type))
diff --git a/mcs/class/corlib/System/MonoType.cs b/mcs/class/corlib/System/MonoType.cs
index 0fd8fa7ec75..f99efb2b7b5 100644
--- a/mcs/class/corlib/System/MonoType.cs
+++ b/mcs/class/corlib/System/MonoType.cs
@@ -32,126 +32,14 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System.Collections.Generic;
-using System.Globalization;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Security;
-using System.Diagnostics.Contracts;
-using System.Threading;
-using System.Diagnostics;
-using System.Security.Permissions;
-using System.Runtime.Remoting.Activation;
-using System.Runtime;
-
 namespace System
 {
-	// Contains information about the type which is expensive to compute
-	[StructLayout (LayoutKind.Sequential)]
-	internal class MonoTypeInfo {
-		// this is the displayed form: special characters
-		// ,+*&*[]\ in the identifier portions of the names
-		// have been escaped with a leading backslash (\)
-		public string full_name;
-		public MonoCMethod default_ctor;
-	}
-
-	[Serializable]
-	[StructLayout (LayoutKind.Sequential)]
-	class MonoType : RuntimeType, ISerializable
+	// Dummy type kept because lots of external code uses
+	// this to check whenever it is running on mono.
+	sealed class MonoType : RuntimeType
 	{
-		[NonSerialized]
-		MonoTypeInfo type_info;
-
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private static extern void type_from_obj (MonoType type, Object obj);
-		
-		internal MonoType (Object obj)
-		{
-			// this should not be used - lupus
-			type_from_obj (this, obj);
-			
-			throw new NotImplementedException ();
-		}
-
-		internal override MonoCMethod GetDefaultConstructor ()
+		private MonoType ()
 		{
-			MonoCMethod ctor = null;
-			
-			if (type_info == null)
-				type_info = new MonoTypeInfo ();
-			else
-				ctor = type_info.default_ctor;
-
-			if (ctor == null) {
-				var ctors = GetConstructors (BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly);
-
-				for (int i = 0; i < ctors.Length; ++i) {
-					if (ctors [i].GetParametersCount () == 0) {
-						type_info.default_ctor = ctor = (MonoCMethod) ctors [i];
-						break;
-					}
-				}
-			}
-
-			return ctor;
-		}
-
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		extern MethodInfo GetCorrespondingInflatedMethod (MethodInfo generic);
-
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		extern ConstructorInfo GetCorrespondingInflatedConstructor (ConstructorInfo generic);
-
-		internal override MethodInfo GetMethod (MethodInfo fromNoninstanciated)
-                {
-			if (fromNoninstanciated == null)
-				throw new ArgumentNullException ("fromNoninstanciated");
-                        return GetCorrespondingInflatedMethod (fromNoninstanciated);
-                }
-
-		internal override ConstructorInfo GetConstructor (ConstructorInfo fromNoninstanciated)
-		{
-			if (fromNoninstanciated == null)
-				throw new ArgumentNullException ("fromNoninstanciated");
-                        return GetCorrespondingInflatedConstructor (fromNoninstanciated);
-		}
-
-		internal override FieldInfo GetField (FieldInfo fromNoninstanciated)
-		{
-			/* create sensible flags from given FieldInfo */
-			BindingFlags flags = fromNoninstanciated.IsStatic ? BindingFlags.Static : BindingFlags.Instance;
-			flags |= fromNoninstanciated.IsPublic ? BindingFlags.Public : BindingFlags.NonPublic;
-			return GetField (fromNoninstanciated.Name, flags);
-		}
-
-		public override int GetHashCode()
-		{
-			Type t = UnderlyingSystemType;
-			if (t != null && t != this)
-				return t.GetHashCode ();
-			return (int)_impl.Value;
-		}
-
-		public override string FullName {
-			get {
-				string fullName;
-				// This doesn't need locking
-				if (type_info == null)
-					type_info = new MonoTypeInfo ();
-				if ((fullName = type_info.full_name) == null)
-					fullName = type_info.full_name = getFullName (true, false);
-
-				return fullName;
-			}
-		}
-
-		internal override bool IsUserType {
-			get {
-				return false;
-			}
 		}
 	}
 }
diff --git a/mcs/class/corlib/System/RuntimeTypeHandle.cs b/mcs/class/corlib/System/RuntimeTypeHandle.cs
index 479e867f501..eb6c42f0976 100644
--- a/mcs/class/corlib/System/RuntimeTypeHandle.cs
+++ b/mcs/class/corlib/System/RuntimeTypeHandle.cs
@@ -62,7 +62,7 @@ namespace System
 			if (info == null)
 				throw new ArgumentNullException ("info");
 
-			MonoType mt = ((MonoType) info.GetValue ("TypeObj", typeof (MonoType)));
+			RuntimeType mt = ((RuntimeType) info.GetValue ("TypeObj", typeof (RuntimeType)));
 			value = mt.TypeHandle.Value;
 			if (value == IntPtr.Zero)
 				throw new SerializationException (Locale.GetText ("Insufficient state."));
@@ -82,7 +82,7 @@ namespace System
 			if (value == IntPtr.Zero)
 				throw new SerializationException ("Object fields may not be properly initialized");
 
-			info.AddValue ("TypeObj", Type.GetTypeHandle (this), typeof (MonoType));
+			info.AddValue ("TypeObj", Type.GetTypeHandle (this), typeof (RuntimeType));
 		}
 
 		[ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
diff --git a/mcs/class/corlib/System/TimeZoneInfo.cs b/mcs/class/corlib/System/TimeZoneInfo.cs
index 46667805357..fc1cd544826 100644
--- a/mcs/class/corlib/System/TimeZoneInfo.cs
+++ b/mcs/class/corlib/System/TimeZoneInfo.cs
@@ -873,7 +873,7 @@ namespace System
 				return true;
 
 			// We might be in the dateTime previous year's DST period
-			return IsInDSTForYear (rule, dateTime, dateTime.Year - 1);
+			return dateTime.Year > 1 && IsInDSTForYear (rule, dateTime, dateTime.Year - 1);
 		}
 
 		bool IsInDSTForYear (AdjustmentRule rule, DateTime dateTime, int year)
@@ -1221,8 +1221,10 @@ namespace System
 
 			try {
 				return ParseTZBuffer (id, buffer, length);
+			} catch (InvalidTimeZoneException) {
+				throw;
 			} catch (Exception e) {
-				throw new InvalidTimeZoneException (e.Message);
+				throw new InvalidTimeZoneException ("Time zone information file contains invalid data", e);
 			}
 		}
 
@@ -1279,7 +1281,7 @@ namespace System
 			if (time_types.Count == 0)
 				throw new InvalidTimeZoneException ();
 
-			if (time_types.Count == 1 && ((TimeType)time_types[0]).IsDst)
+			if (time_types.Count == 1 && time_types[0].IsDst)
 				throw new InvalidTimeZoneException ();
 
 			TimeSpan baseUtcOffset = new TimeSpan (0);
@@ -1360,8 +1362,8 @@ namespace System
 
 			TimeZoneInfo tz;
 			if (adjustmentRules.Count == 0 && !storeTransition) {
-				TimeType t = (TimeType)time_types [0];
 				if (standardDisplayName == null) {
+					var t = time_types [0];
 					standardDisplayName = t.Name;
 					baseUtcOffset = new TimeSpan (0, 0, t.Offset);
 				}
@@ -1405,6 +1407,20 @@ namespace System
 			var types = new Dictionary<int, TimeType> (count);
 			for (int i = 0; i < count; i++) {
 				int offset = ReadBigEndianInt32 (buffer, index + 6 * i);
+
+				//
+				// The official tz database contains timezone with GMT offsets
+				// not only in whole hours/minutes but in seconds. This happens for years
+				// before 1901. For example
+				//
+				// NAME		        GMTOFF   RULES	FORMAT	UNTIL
+				// Europe/Madrid	-0:14:44 -	LMT	1901 Jan  1  0:00s
+				//
+				// .NET as of 4.6.2 cannot handle that and uses hours/minutes only, so
+				// we remove seconds to not crash later
+				//
+				offset = (offset / 60) * 60;
+
 				byte is_dst = buffer [index + 6 * i + 4];
 				byte abbrev = buffer [index + 6 * i + 5];
 				types.Add (i, new TimeType (offset, (is_dst != 0), abbreviations [(int)abbrev]));
@@ -1460,7 +1476,7 @@ namespace System
 #endregion
 	}
 
-	struct TimeType {
+	class TimeType {
 		public readonly int Offset;
 		public readonly bool IsDst;
 		public string Name;
diff --git a/mcs/class/corlib/Test/Mono.Math/ArithmeticBigTest.cs b/mcs/class/corlib/Test/Mono.Math/ArithmeticBigTest.cs
index 94ff296ced5..007c0a44d9d 100644
--- a/mcs/class/corlib/Test/Mono.Math/ArithmeticBigTest.cs
+++ b/mcs/class/corlib/Test/Mono.Math/ArithmeticBigTest.cs
@@ -179,48 +179,48 @@ namespace MonoTests.Mono.Math.Arithmetic.Big {
 		[Test]
 		public void AgtB () 
 		{
-			Assertion.Assert(A > B);
+			Assert.IsTrue(A > B);
 		}
 		
 		[Test]
 		public void ANotLtB () 
 		{
-			Assertion.Assert(!(A < B));
+			Assert.IsTrue(!(A < B));
 		}
 		
 		[Test]
 		public void BNotGtA () 
 		{
-			Assertion.Assert(!(B > A));
+			Assert.IsTrue(!(B > A));
 		}
 		
 		[Test]
 		public void AltB () 
 		{
-			Assertion.Assert(B < A);
+			Assert.IsTrue(B < A);
 		}
 		
 		[Test]
 		public void AeqA () 
 		{
-			Assertion.Assert(A == A);
+			Assert.IsTrue(A == A);
 		}
 		[Test]
 		public void BeqB () 
 		{
-			Assertion.Assert(B == B);
+			Assert.IsTrue(B == B);
 		}
 		
 		[Test]
 		public void AneqB () 
 		{
-			Assertion.Assert(A != B);
+			Assert.IsTrue(A != B);
 		}
 		
 		[Test]
 		public void BneqA () 
 		{
-			Assertion.Assert(B != A);
+			Assert.IsTrue(B != A);
 		}
 
 		#endregion
diff --git a/mcs/class/corlib/Test/Mono.Math/PrimeTestingTest.cs b/mcs/class/corlib/Test/Mono.Math/PrimeTestingTest.cs
index e6ddb0fc36e..b1ba0d26e6e 100644
--- a/mcs/class/corlib/Test/Mono.Math/PrimeTestingTest.cs
+++ b/mcs/class/corlib/Test/Mono.Math/PrimeTestingTest.cs
@@ -81,12 +81,12 @@ namespace MonoTests.Mono.Math {
 
 		private void ExpectComposite (BigInteger bi)
 		{
-			Assertion.AssertEquals (false, bi.isProbablePrime ());
+			Assert.AreEqual (false, bi.isProbablePrime ());
 		}
 
 		private void ExpectPrime (BigInteger bi)
 		{
-			Assertion.AssertEquals (true, bi.isProbablePrime ());
+			Assert.AreEqual (true, bi.isProbablePrime ());
 		}
 	}
 
diff --git a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
index 4b4b3b3a805..ce4f22174b1 100644
--- a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
+++ b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
@@ -770,7 +770,7 @@ namespace MonoTests.System.Collections
 			for (int i = 0; i < 20; i++)
 				sl1.RemoveAt (9);
 
-			Assert.AreEqual (30, sl1.Count, 30, "#C1");
+			Assert.AreEqual (30, (double) sl1.Count, 30, "#C1");
 			for (int i = 0; i < 9; i++)
 				Assert.AreEqual (i, sl1 ["kala " + string.Format ("{0:D2}", i)], "#C2:" + i);
 			for (int i = 9; i < 29; i++)
diff --git a/mcs/class/corlib/Test/System.IO/FileStreamTest.cs b/mcs/class/corlib/Test/System.IO/FileStreamTest.cs
index 84a9d638ed6..008930061e4 100644
--- a/mcs/class/corlib/Test/System.IO/FileStreamTest.cs
+++ b/mcs/class/corlib/Test/System.IO/FileStreamTest.cs
@@ -1671,6 +1671,9 @@ namespace MonoTests.System.IO
 			} catch (FileNotFoundException) {
 				// Only run this test on platforms where /dev/zero exists
 				Assert.Ignore();
+			} catch (DirectoryNotFoundException) {
+				// Only run this test on platforms where /dev exists
+				Assert.Ignore();
 			}
 
 			// this shouldn't throw
diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
index de8f4bdbca5..bc3416441cf 100644
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
@@ -182,7 +182,10 @@ namespace MonoTests.System.Reflection
 			// note: only available in default appdomain
 			// http://weblogs.asp.net/asanto/archive/2003/09/08/26710.aspx
 			// Not sure we should emulate this behavior.
-#if !MONODROID
+#if __WATCHOS__
+			Assert.IsNull (Assembly.GetEntryAssembly (), "GetEntryAssembly");
+			Assert.IsTrue (AppDomain.CurrentDomain.IsDefaultAppDomain (), "!default appdomain");
+#elif !MONODROID
 			string fname = AppDomain.CurrentDomain.FriendlyName;
 			if (fname.EndsWith (".dll")) { // nunit-console
 				Assert.IsNull (Assembly.GetEntryAssembly (), "GetEntryAssembly");
@@ -249,7 +252,7 @@ namespace MonoTests.System.Reflection
 		public void Corlib_test ()
 		{
 			Assembly corlib_test = Assembly.GetExecutingAssembly ();
-#if MONODROID || MOBILE_STATIC
+#if MONODROID || MOBILE_STATIC || __WATCHOS__
 			Assert.IsNull (corlib_test.EntryPoint, "EntryPoint");
 			Assert.IsNull (corlib_test.Evidence, "Evidence");
 #elif MOBILE
@@ -1327,6 +1330,19 @@ namespace MonoTests.System.Reflection
 			Assert.AreSame (x1, x2, "#1");
 		}
 #endif
+
+		class MyAssembly : Assembly { }
+
+		[Test]
+		public void CustomAssemblyImplThrows ()
+		{
+			var ma = new MyAssembly();
+			try {
+				ma.GetName ();
+				Assert.Fail ("must throw");
+			} catch (NotImplementedException){
+			}
+		}
 	}
 
 	public class TestDefinedTypes
diff --git a/mcs/class/corlib/Test/System.Security/CodeAccessPermissionTest.cs b/mcs/class/corlib/Test/System.Security/CodeAccessPermissionTest.cs
index 065914a2ed4..c5f63a7b5bf 100644
--- a/mcs/class/corlib/Test/System.Security/CodeAccessPermissionTest.cs
+++ b/mcs/class/corlib/Test/System.Security/CodeAccessPermissionTest.cs
@@ -7,6 +7,8 @@
 // (C) 2004 Motus Technologies Inc. (http://www.motus.com)
 //
 
+#if FEATURE_MONO_CAS
+
 using NUnit.Framework;
 using System;
 using System.Security;
@@ -89,3 +91,5 @@ namespace MonoTests.System.Security {
 		}
 	}
 }
+
+#endif
diff --git a/mcs/class/corlib/Test/System.Threading/CountdownEventTests.cs b/mcs/class/corlib/Test/System.Threading/CountdownEventTests.cs
index b9d20c73abf..9f1d87cc0d0 100644
--- a/mcs/class/corlib/Test/System.Threading/CountdownEventTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/CountdownEventTests.cs
@@ -304,7 +304,7 @@ namespace MonoTests.System.Threading
 						});
 					}
 
-					Assert.IsTrue (ce.Wait (1000), "#1");
+					Assert.IsTrue (ce.Wait (10000), "#1");
 				}
 			}
 		}
diff --git a/mcs/class/corlib/Test/System.Threading/ExecutionContextCas.cs b/mcs/class/corlib/Test/System.Threading/ExecutionContextCas.cs
index f4ecfb5d46f..c58012a3c93 100644
--- a/mcs/class/corlib/Test/System.Threading/ExecutionContextCas.cs
+++ b/mcs/class/corlib/Test/System.Threading/ExecutionContextCas.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-
+#if FEATURE_MONO_CAS
 
 using System;
 using System.Security;
@@ -168,3 +168,4 @@ namespace MonoCasTests.System.Threading {
 	}
 }
 
+#endif
+\ No newline at end of file
diff --git a/mcs/class/corlib/Test/System.Threading/MonitorTest.cs b/mcs/class/corlib/Test/System.Threading/MonitorTest.cs
index 1c4ae9408a0..158a9afc942 100644
--- a/mcs/class/corlib/Test/System.Threading/MonitorTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/MonitorTest.cs
@@ -144,7 +144,7 @@ namespace MonoTests.System.Threading {
 		}
 
 		[Test]
-		[ExpectedException (typeof (ArgumentException))]
+		[ExpectedException (typeof (ArgumentOutOfRangeException))]
 		public void TryEnter_Int_Negative ()
 		{
 			object o = new object ();
diff --git a/mcs/class/corlib/Test/System.Threading/ThreadTest.cs b/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
index c7f73e95d38..a869f7191f7 100644
--- a/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
@@ -109,7 +109,7 @@ namespace MonoTests.System.Threading
 			}
 
 			// check a class in mscorlib to determine if we're running on Mono
-			if (Type.GetType ("System.MonoType", false) != null)
+			if (Type.GetType ("Mono.Runtime", false) != null)
 				is_mono = true;
 		}
 
@@ -574,37 +574,6 @@ namespace MonoTests.System.Threading
 			t.Name = "b";
 		}
 
-		bool rename_finished;
-		bool rename_failed;
-
-		[Test]
-		public void RenameTpThread ()
-		{
-			object monitor = new object ();
-			ThreadPool.QueueUserWorkItem (new WaitCallback (Rename_callback), monitor);
-			lock (monitor) {
-				if (!rename_finished)
-					Monitor.Wait (monitor);
-			}
-			Assert.IsTrue (!rename_failed);
-		}
-
-		void Rename_callback (object o) {
-			Thread.CurrentThread.Name = "a";
-			try {
-				Thread.CurrentThread.Name = "b";
-				//Console.WriteLine ("Thread name is: {0}", Thread.CurrentThread.Name);
-			} catch (Exception e) {
-				//Console.Error.WriteLine (e);
-				rename_failed = true;
-			}
-			object monitor = o;
-			lock (monitor) {
-				rename_finished = true;
-				Monitor.Pulse (monitor);
-			}
-		}
-
 		[Test]
 		public void TestNestedThreads1()
 		{
diff --git a/mcs/class/corlib/Test/System/AppDomainTest.cs b/mcs/class/corlib/Test/System/AppDomainTest.cs
index 03de187af3d..34874b1f81f 100644
--- a/mcs/class/corlib/Test/System/AppDomainTest.cs
+++ b/mcs/class/corlib/Test/System/AppDomainTest.cs
@@ -3115,6 +3115,26 @@ namespace MonoTests.System
 			tester.AssertLoadMissingAssemblyType ();
 		}
 
+		[Test]
+		public void ShadowCopyDontChangeAssemblyCodeBase ()
+		{
+			var setup = new AppDomainSetup ();
+			setup.ApplicationBase = tempDir;
+			setup.ApplicationName = "testdomain";
+			setup.ShadowCopyFiles = "true";
+			var ad = CreateTestDomain (setup, true);
+
+			string assemblyFile = Path.Combine (tempDir, "TestAssembly.dll");
+			AssemblyName aname = new AssemblyName ();
+			aname.Name = "TestAssembly";
+			GenerateAssembly (aname, assemblyFile);
+
+			var tester = CreateCrossDomainTester (ad);
+			var codeBaseFromShadowCopy = tester.LoadAndGetName ("TestAssembly");
+			var expected = Assembly.LoadFrom (Path.Combine (tempDir, "TestAssembly.dll"));
+			Assert.AreEqual (expected.GetName ().CodeBase, codeBaseFromShadowCopy);
+		}
+
 		private static AppDomain CreateTestDomain (string baseDirectory, bool assemblyResolver)
 		{
 			AppDomainSetup setup = new AppDomainSetup ();
@@ -3258,6 +3278,12 @@ namespace MonoTests.System
 			{
 				return obj;
 			}
+
+			public string LoadAndGetName (string assemblyName)
+			{
+				var assembly = Assembly.Load (assemblyName);
+				return assembly.GetName ().CodeBase;
+			}
 		}
 
 		[Serializable ()]
diff --git a/mcs/class/corlib/Test/System/ConvertTest.cs b/mcs/class/corlib/Test/System/ConvertTest.cs
index 2124aa85733..2391dbb6507 100644
--- a/mcs/class/corlib/Test/System/ConvertTest.cs
+++ b/mcs/class/corlib/Test/System/ConvertTest.cs
@@ -1876,7 +1876,7 @@ namespace MonoTests.System {
 				iTest++;
 				Assert.AreEqual ((float)0, Convert.ToSingle(tryByte), "#N03");
 				iTest++;
-				Assert.AreEqual ((float)1234, 234, Convert.ToSingle(tryDec), "#N04");
+				Assert.AreEqual ((float)1234, (double)234, Convert.ToSingle(tryDec), "#N04");
 				iTest++;
 				Assert.AreEqual ((float)0, Convert.ToSingle(tryDbl), "#N05");
 				iTest++;
@@ -1888,7 +1888,7 @@ namespace MonoTests.System {
 				iTest++;
 				Assert.AreEqual ((float)123, Convert.ToSingle(trySByte), "#N09");
 				iTest++;
-				Assert.AreEqual ((float)1234, 2345, Convert.ToSingle(tryFloat), "#N10");
+				Assert.AreEqual ((float)1234, (double)2345, Convert.ToSingle(tryFloat), "#N10");
 				iTest++;
 				Assert.AreEqual ((float)987, Convert.ToSingle("987"), "#N11");
 				iTest++;
diff --git a/mcs/class/corlib/Test/System/EnvironmentTest.cs b/mcs/class/corlib/Test/System/EnvironmentTest.cs
index deb0e3314b6..fed370974e5 100644
--- a/mcs/class/corlib/Test/System/EnvironmentTest.cs
+++ b/mcs/class/corlib/Test/System/EnvironmentTest.cs
@@ -156,9 +156,13 @@ namespace MonoTests.System
 		public void GetCommandLineArgs ()
 		{
 			string[] args = Environment.GetCommandLineArgs ();
+#if !__WATCHOS__
 			Assert.IsNotNull (args, "not null");
 			Assert.IsTrue (((args.Length > 0) && (args.Length < 256)), "reasonable");
 			Assert.IsNotNull (args [0], "application");
+#else
+			Assert.AreEqual (0, args.Length, "length");
+#endif
 		}
 
 #if !NET_2_1
diff --git a/mcs/class/corlib/Test/System/StringTest.cs b/mcs/class/corlib/Test/System/StringTest.cs
index a45c7ec198c..be5e7984757 100644
--- a/mcs/class/corlib/Test/System/StringTest.cs
+++ b/mcs/class/corlib/Test/System/StringTest.cs
@@ -109,8 +109,8 @@ public class StringTest
 		if (!Environment.Is64BitProcess)
 			Assert.Ignore("This test cannot run on a 32-bit system.");
 
-		// Require 6 GB physical RAM, for the 4GB string plus 2GB headroom
-		var pc = new PerformanceCounter ("Mono Memory", "Total Physical Memory");
+		// Require 6 GB available RAM, for the 4GB string plus 2GB headroom
+		var pc = new PerformanceCounter ("Mono Memory", "Available Physical Memory");
 
 		if (pc.RawValue < 6L*1024L*1024L*1024L)
 			Assert.Ignore("This machine may not have enough RAM to run this test.");
diff --git a/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs b/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
index d18f8a4efef..5ede3b2ea8f 100644
--- a/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
+++ b/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
@@ -923,18 +923,18 @@ namespace MonoTests.System
 					"Canada/Newfoundland",
 					"Europe/Moscow",
 					"Europe/Riga",
-					"N/A", // testing that the test doesn't fail with inexistent TZs
 				};
 				foreach (var tz in subMinuteDSTs) {
-					try {
-						TimeZoneInfo.FindSystemTimeZoneById (tz);
-					} catch (TimeZoneNotFoundException) {
-						// ok;
-					} catch (Exception ex) {
-						Assert.Fail (string.Format ("Failed to load TZ {0}: {1}", tz, ex.ToString ()));
-					}
+					TimeZoneInfo.FindSystemTimeZoneById (tz);
 				}
 			}
+
+			[Test]
+			[ExpectedException (typeof (TimeZoneNotFoundException))]
+			public void InvalidName ()
+			{
+				TimeZoneInfo.FindSystemTimeZoneById ("N/A");
+			}
 		}
 		
 		[TestFixture]
@@ -1158,6 +1158,22 @@ namespace MonoTests.System
 			  Assert.AreEqual(baseUtcOffset, cairo.GetUtcOffset(offset), "dst2End_with_dstOffset+baseUtcOffset#exact");
 			  Assert.AreEqual(baseUtcOffset, cairo.GetUtcOffset(offset.Add(new TimeSpan(0, 0, 0, 1))), "dst2End_with_dstOffset+baseUtcOffset#after");
 		  }
+
+			[Test]
+			public void DTS_WithMinimalDate ()
+			{
+				TimeZoneInfo.TransitionTime startTransition, endTransition;
+				startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (1, 1, 1, 4, 0, 0),
+																				  10, 2, DayOfWeek.Sunday);
+				endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule (new DateTime (1, 1, 1, 3, 0, 0),
+																				3, 2, DayOfWeek.Sunday);
+
+				var ctz = TimeZoneInfo.CreateCustomTimeZone ("test", TimeSpan.FromHours (-5), "display", "sdisplay", "dst", new [] {
+					TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule (DateTime.MinValue, DateTime.MaxValue.Date, TimeSpan.FromHours (-1), startTransition, endTransition) });
+
+				var offset = ctz.GetUtcOffset (DateTime.MinValue);
+				Assert.AreEqual (TimeSpan.FromHours (-5), offset); // TODO: Wrong it should be -6
+			}
     }
 
 		[TestFixture]
diff --git a/mcs/class/corlib/Test/System/TimeZoneTest.cs b/mcs/class/corlib/Test/System/TimeZoneTest.cs
index 358298f91e5..409e62066b5 100644
--- a/mcs/class/corlib/Test/System/TimeZoneTest.cs
+++ b/mcs/class/corlib/Test/System/TimeZoneTest.cs
@@ -326,6 +326,16 @@ public class TimeZoneTest {
 			Assert.IsTrue (tzi.SupportsDaylightSavingTime, "SupportsDaylightSavingTime");
 		}
 
+		[Test]
+		public void OldEraToLocalTime ()
+		{
+			TimeSpan offset = TimeSpan.Zero;
+			var dto = new DateTimeOffset (new DateTime (1900, 1, 1).Ticks, offset);
+
+			// Should never throw
+			dto.ToLocalTime ();
+		}
+
 #if MOBILE
 		// On device we cannot read the OS file system to look for /etc/localtime
 		// and /usr/share/zoneinfo - so we must initialize the BCL TimeZoneInfo
diff --git a/mcs/class/corlib/Test/System/TypeTest.cs b/mcs/class/corlib/Test/System/TypeTest.cs
index cbf44c17f35..1e38f069af2 100644
--- a/mcs/class/corlib/Test/System/TypeTest.cs
+++ b/mcs/class/corlib/Test/System/TypeTest.cs
@@ -456,6 +456,65 @@ namespace MonoTests.System
 
 		}
 
+		class GetProperties_Overrides_Input
+		{
+			public class TestClass : BaseClass<object>
+			{
+				public override object TestProperty { get; set; }
+			}
+
+			public abstract class BaseClass<T>
+			{
+				public virtual T TestProperty { get; set; }
+			}
+
+			public class TestClass_Indexer : BaseClass_Indexer<object>
+			{
+				public override object this[int arg] { set { } }
+			}
+
+			public abstract class BaseClass_Indexer<T>
+			{
+				public virtual T this[int arg] { set { } }
+			}
+
+			public interface IB : IA<object>
+			{
+				new object TestProperty { get; set; }
+			}
+
+			public interface IA<T>
+			{
+				T TestProperty { get; set; }
+			}
+
+			public class TestClass_HiddenProperty : BaseClass_HiddenProperty
+			{
+				public new virtual string Prop { set { } }
+			}
+
+			public class BaseClass_HiddenProperty
+			{
+				public virtual string Prop { set  { } }
+			}
+		}
+
+		[Test]
+		public void GetProperties_Overrides ()
+		{
+			Assert.AreEqual (1, typeof (GetProperties_Overrides_Input.IB).GetProperties().Length);
+
+			var prop = typeof (GetProperties_Overrides_Input.TestClass).GetProperty ("TestProperty");
+			Assert.AreEqual (typeof (GetProperties_Overrides_Input.TestClass), prop.DeclaringType);
+
+			var prop_2 = typeof (GetProperties_Overrides_Input.TestClass_HiddenProperty).GetProperty ("Prop");
+			Assert.AreEqual (typeof (GetProperties_Overrides_Input.TestClass_HiddenProperty), prop_2.DeclaringType);
+
+			Assert.AreEqual (1, typeof (GetProperties_Overrides_Input.TestClass).GetProperties().Length);
+			Assert.AreEqual (1, typeof (GetProperties_Overrides_Input.TestClass_Indexer).GetProperties().Length);
+			Assert.AreEqual (1, typeof (GetProperties_Overrides_Input.TestClass_HiddenProperty).GetProperties().Length);
+	    }
+
 		[Test] // GetProperties (BindingFlags)
 		public void GetProperties_Flags ()
 		{
diff --git a/mcs/class/corlib/corlib-basic.csproj b/mcs/class/corlib/corlib-basic.csproj
deleted file mode 100644
index cdc717d6c9f..00000000000
--- a/mcs/class/corlib/corlib-basic.csproj
+++ /dev/null
@@ -1,1759 +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>{B8AA4FF3-2174-4C82-B75E-28C3CA28A380}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>612,618,1699</NoWarn>
-    <OutputPath>./../../class/lib/basic</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>mscorlib</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>612,618,1699</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;BOOTSTRAP_BASIC</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>612,618,1699</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;BOOTSTRAP_BASIC</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\ConfidenceFactor.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\PrimalityTests.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math\BigInteger.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeBase.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoTools.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\KeyPairPersistence.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS1.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS8.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RC4.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RSAManaged.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\SymmetricTransform.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\PKCS12.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X501Name.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Certificate.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CertificateCollection.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Chain.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509ChainStatusFlags.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CRL.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extension.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extensions.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Store.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509StoreManager.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Stores.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X520Attributes.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1Convert.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\BitConverterLE.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\PKCS7.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\StrongName.cs" />
-    <Compile Include="..\System.Core\System.Security.Cryptography\Aes.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.AdjustmentRule.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.Android.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.MonoTouch.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.TransitionTime.cs" />
-    <Compile Include="..\System\System.Threading\SemaphoreFullException.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\CriticalHandleMinusOneIsInvalid.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\CriticalHandleZeroOrMinusOneIsInvalid.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeFileHandle.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeHandleMinusOneIsInvalid.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeRegistryHandle.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeWaitHandle.cs" />
-    <Compile Include="Microsoft.Win32\IRegistryApi.cs" />
-    <Compile Include="Microsoft.Win32\Registry.cs" />
-    <Compile Include="Microsoft.Win32\RegistryHive.cs" />
-    <Compile Include="Microsoft.Win32\RegistryKey.cs" />
-    <Compile Include="Microsoft.Win32\RegistryKeyPermissionCheck.cs" />
-    <Compile Include="Microsoft.Win32\RegistryOptions.cs" />
-    <Compile Include="Microsoft.Win32\RegistryValueKind.cs" />
-    <Compile Include="Microsoft.Win32\RegistryValueOptions.cs" />
-    <Compile Include="Microsoft.Win32\RegistryView.cs" />
-    <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
-    <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
-    <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-    <Compile Include="Mono.Globalization.Unicode\CodePointIndexer.cs" />
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTable.cs" />
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTableUtil.cs" />
-    <Compile Include="Mono.Globalization.Unicode\Normalization.cs" />
-    <Compile Include="Mono.Globalization.Unicode\NormalizationTableUtil.cs" />
-    <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
-    <Compile Include="Mono.Globalization.Unicode\SortKey.cs" />
-    <Compile Include="Mono.Globalization.Unicode\SortKeyBuffer.cs" />
-    <Compile Include="Mono.Interop\ComInteropProxy.cs" />
-    <Compile Include="Mono.Interop\IDispatch.cs" />
-    <Compile Include="Mono.Interop\IUnknown.cs" />
-    <Compile Include="Mono.Security.Cryptography\DSAManaged.cs" />
-    <Compile Include="Mono.Security.Cryptography\HMACAlgorithm.cs" />
-    <Compile Include="Mono.Security.Cryptography\MACAlgorithm.cs" />
-    <Compile Include="Mono.Security\StrongNameManager.cs" />
-    <Compile Include="Mono.Security\Uri.cs" />
-    <Compile Include="Mono.Xml\SecurityParser.cs" />
-    <Compile Include="Mono.Xml\SmallXmlParser.cs" />
-    <Compile Include="Mono\DataConverter.cs" />
-    <Compile Include="Mono\Runtime.cs" />
-    <Compile Include="System.Collections.Concurrent.Partitioners\EnumerablePartitioner.cs" />
-    <Compile Include="System.Collections.Concurrent.Partitioners\ListPartitioner.cs" />
-    <Compile Include="System.Collections.Concurrent.Partitioners\UserRangePartitioner.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentDictionary.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentOrderedList.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentQueue.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentStack.cs" />
-    <Compile Include="System.Collections.Concurrent\EnumerablePartitionerOptions.cs" />
-    <Compile Include="System.Collections.Concurrent\IProducerConsumerCollection.cs" />
-    <Compile Include="System.Collections.Concurrent\OrderablePartitioner.cs" />
-    <Compile Include="System.Collections.Concurrent\Partitioner.cs" />
-    <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />
-    <Compile Include="System.Collections.Generic\CollectionDebuggerView.cs" />
-    <Compile Include="System.Collections.Generic\Comparer.cs" />
-    <Compile Include="System.Collections.Generic\Dictionary.cs" />
-    <Compile Include="System.Collections.Generic\EqualityComparer.cs" />
-    <Compile Include="System.Collections.Generic\ICollection.cs" />
-    <Compile Include="System.Collections.Generic\IComparer.cs" />
-    <Compile Include="System.Collections.Generic\IDictionary.cs" />
-    <Compile Include="System.Collections.Generic\IEnumerable.cs" />
-    <Compile Include="System.Collections.Generic\IEnumerator.cs" />
-    <Compile Include="System.Collections.Generic\IEqualityComparer.cs" />
-    <Compile Include="System.Collections.Generic\IList.cs" />
-    <Compile Include="System.Collections.Generic\IReadOnlyCollection.cs" />
-    <Compile Include="System.Collections.Generic\IReadOnlyDictionary.cs" />
-    <Compile Include="System.Collections.Generic\IReadOnlyList.cs" />
-    <Compile Include="System.Collections.Generic\KeyNotFoundException.cs" />
-    <Compile Include="System.Collections.Generic\KeyValuePair.cs" />
-    <Compile Include="System.Collections.Generic\List.cs" />
-    <Compile Include="System.Collections.ObjectModel\Collection.cs" />
-    <Compile Include="System.Collections.ObjectModel\KeyedCollection.cs" />
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyCollection.cs" />
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyDictionary.cs" />
-    <Compile Include="System.Collections\ArrayList.cs" />
-    <Compile Include="System.Collections\BitArray.cs" />
-    <Compile Include="System.Collections\CaseInsensitiveComparer.cs" />
-    <Compile Include="System.Collections\CaseInsensitiveHashCodeProvider.cs" />
-    <Compile Include="System.Collections\CollectionBase.cs" />
-    <Compile Include="System.Collections\CollectionDebuggerView.cs" />
-    <Compile Include="System.Collections\Comparer.cs" />
-    <Compile Include="System.Collections\DictionaryBase.cs" />
-    <Compile Include="System.Collections\DictionaryEntry.cs" />
-    <Compile Include="System.Collections\HashPrimeNumbers.cs" />
-    <Compile Include="System.Collections\Hashtable.cs" />
-    <Compile Include="System.Collections\ICollection.cs" />
-    <Compile Include="System.Collections\IComparer.cs" />
-    <Compile Include="System.Collections\IDictionary.cs" />
-    <Compile Include="System.Collections\IDictionaryEnumerator.cs" />
-    <Compile Include="System.Collections\IEnumerable.cs" />
-    <Compile Include="System.Collections\IEnumerator.cs" />
-    <Compile Include="System.Collections\IEqualityComparer.cs" />
-    <Compile Include="System.Collections\IHashCodeProvider.cs" />
-    <Compile Include="System.Collections\IList.cs" />
-    <Compile Include="System.Collections\IStructuralComparable.cs" />
-    <Compile Include="System.Collections\IStructuralEquatable.cs" />
-    <Compile Include="System.Collections\Queue.cs" />
-    <Compile Include="System.Collections\ReadOnlyCollectionBase.cs" />
-    <Compile Include="System.Collections\SortedList.cs" />
-    <Compile Include="System.Collections\Stack.cs" />
-    <Compile Include="System.Collections\StructuralComparisons.cs" />
-    <Compile Include="System.Configuration.Assemblies\AssemblyHash.cs" />
-    <Compile Include="System.Configuration.Assemblies\AssemblyHashAlgorithm.cs" />
-    <Compile Include="System.Configuration.Assemblies\AssemblyVersionCompatibility.cs" />
-    <Compile Include="System.Configuration.Assemblies\ProcessorID.cs" />
-    <Compile Include="System.Deployment.Internal\InternalActivationContextHelper.cs" />
-    <Compile Include="System.Deployment.Internal\InternalApplicationIdentityHelper.cs" />
-    <Compile Include="System.Diagnostics.CodeAnalysis\SuppressMessageAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts.Internal\ContractHelper.cs" />
-    <Compile Include="System.Diagnostics.Contracts\Contract.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractAbbreviatorAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractArgumentValidatorAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractClassAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractClassForAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractException.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractFailedEventArgs.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractFailureKind.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractInvariantMethodAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractOptionAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractPublicPropertyNameAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractReferenceAssemblyAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractRuntimeIgnoredAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractShouldAssertException.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractVerificationAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\PureAttribute.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder1.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocument.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocumentWriter.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolMethod.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolNamespace.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolReader.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolScope.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolVariable.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolWriter.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymAddressKind.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymbolToken.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymDocumentType.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageType.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageVendor.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventAttribute.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventCommand.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventCommandEventArgs.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventKeywords.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventLevel.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventSource.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventSourceAttribute.cs" />
-    <Compile Include="System.Diagnostics.Tracing\NonEventAttribute.cs" />
-    <Compile Include="System.Diagnostics\ConditionalAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggableAttribute.cs" />
-    <Compile Include="System.Diagnostics\Debugger.cs" />
-    <Compile Include="System.Diagnostics\DebuggerBrowsableAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerBrowsableState.cs" />
-    <Compile Include="System.Diagnostics\DebuggerDisplayAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerHiddenAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerNonUserCodeAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerStepperBoundaryAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerStepThroughAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerTypeProxyAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerVisualizerAttribute.cs" />
-    <Compile Include="System.Diagnostics\StackFrame.cs" />
-    <Compile Include="System.Diagnostics\StackTrace.cs" />
-    <Compile Include="System.Globalization\Calendar.cs" />
-    <Compile Include="System.Globalization\CalendarAlgorithmType.cs" />
-    <Compile Include="System.Globalization\CalendarWeekRule.cs" />
-    <Compile Include="System.Globalization\CalendricalCalculations.cs" />
-    <Compile Include="System.Globalization\CharUnicodeInfo.cs" />
-    <Compile Include="System.Globalization\ChineseLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\CodePageDataItem.cs" />
-    <Compile Include="System.Globalization\CompareInfo.cs" />
-    <Compile Include="System.Globalization\CompareOptions.cs" />
-    <Compile Include="System.Globalization\CultureInfo.cs" />
-    <Compile Include="System.Globalization\CultureNotFoundException.cs" />
-    <Compile Include="System.Globalization\CultureTypes.cs" />
-    <Compile Include="System.Globalization\DateTimeFormatInfo.cs" />
-    <Compile Include="System.Globalization\DateTimeStyles.cs" />
-    <Compile Include="System.Globalization\DaylightTime.cs" />
-    <Compile Include="System.Globalization\DigitShapes.cs" />
-    <Compile Include="System.Globalization\EastAsianLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\GregorianCalendar.cs" />
-    <Compile Include="System.Globalization\GregorianCalendarTypes.cs" />
-    <Compile Include="System.Globalization\HebrewCalendar.cs" />
-    <Compile Include="System.Globalization\HijriCalendar.cs" />
-    <Compile Include="System.Globalization\IdnMapping.cs" />
-    <Compile Include="System.Globalization\JapaneseCalendar.cs" />
-    <Compile Include="System.Globalization\JapaneseLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\JulianCalendar.cs" />
-    <Compile Include="System.Globalization\KoreanCalendar.cs" />
-    <Compile Include="System.Globalization\KoreanLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\NumberFormatInfo.cs" />
-    <Compile Include="System.Globalization\NumberStyles.cs" />
-    <Compile Include="System.Globalization\PersianCalendar.cs" />
-    <Compile Include="System.Globalization\RegionInfo.cs" />
-    <Compile Include="System.Globalization\RegionInfo.MonoTouch.cs" />
-    <Compile Include="System.Globalization\SortVersion.cs" />
-    <Compile Include="System.Globalization\StringInfo.cs" />
-    <Compile Include="System.Globalization\TaiwanCalendar.cs" />
-    <Compile Include="System.Globalization\TaiwanLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\TextElementEnumerator.cs" />
-    <Compile Include="System.Globalization\TextInfo.cs" />
-    <Compile Include="System.Globalization\ThaiBuddhistCalendar.cs" />
-    <Compile Include="System.Globalization\TimeSpanStyles.cs" />
-    <Compile Include="System.Globalization\UmAlQuraCalendar.cs" />
-    <Compile Include="System.Globalization\UnicodeCategory.cs" />
-    <Compile Include="System.IO.IsolatedStorage\INormalizeForIsolatedStorage.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorage.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageException.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFile.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileEnumerator.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileStream.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageScope.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityOptions.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityState.cs" />
-    <Compile Include="System.IO\BinaryReader.cs" />
-    <Compile Include="System.IO\BinaryWriter.cs" />
-    <Compile Include="System.IO\BufferedStream.cs" />
-    <Compile Include="System.IO\Directory.cs" />
-    <Compile Include="System.IO\DirectoryInfo.cs" />
-    <Compile Include="System.IO\DirectoryNotFoundException.cs" />
-    <Compile Include="System.IO\DriveInfo.cs" />
-    <Compile Include="System.IO\DriveNotFoundException.cs" />
-    <Compile Include="System.IO\DriveType.cs" />
-    <Compile Include="System.IO\EndOfStreamException.cs" />
-    <Compile Include="System.IO\File.cs" />
-    <Compile Include="System.IO\FileAccess.cs" />
-    <Compile Include="System.IO\FileAttributes.cs" />
-    <Compile Include="System.IO\FileInfo.cs" />
-    <Compile Include="System.IO\FileLoadException.cs" />
-    <Compile Include="System.IO\FileMode.cs" />
-    <Compile Include="System.IO\FileNotFoundException.cs" />
-    <Compile Include="System.IO\FileOptions.cs" />
-    <Compile Include="System.IO\FileShare.cs" />
-    <Compile Include="System.IO\FileStream.cs" />
-    <Compile Include="System.IO\FileStreamAsyncResult.cs" />
-    <Compile Include="System.IO\FileSystemInfo.cs" />
-    <Compile Include="System.IO\IOException.cs" />
-    <Compile Include="System.IO\LogcatTextWriter.cs" />
-    <Compile Include="System.IO\MemoryStream.cs" />
-    <Compile Include="System.IO\MonoFileType.cs" />
-    <Compile Include="System.IO\MonoIO.cs" />
-    <Compile Include="System.IO\MonoIOError.cs" />
-    <Compile Include="System.IO\MonoIOStat.cs" />
-    <Compile Include="System.IO\Path.cs" />
-    <Compile Include="System.IO\PathTooLongException.cs" />
-    <Compile Include="System.IO\SearchOption.cs" />
-    <Compile Include="System.IO\SearchPattern.cs" />
-    <Compile Include="System.IO\SeekOrigin.cs" />
-    <Compile Include="System.IO\Stream.cs" />
-    <Compile Include="System.IO\StreamReader.cs" />
-    <Compile Include="System.IO\StreamWriter.cs" />
-    <Compile Include="System.IO\StringReader.cs" />
-    <Compile Include="System.IO\StringWriter.cs" />
-    <Compile Include="System.IO\TextReader.cs" />
-    <Compile Include="System.IO\TextWriter.cs" />
-    <Compile Include="System.IO\UnexceptionalStreamReader.cs" />
-    <Compile Include="System.IO\UnexceptionalStreamWriter.cs" />
-    <Compile Include="System.IO\UnmanagedMemoryAccessor.cs" />
-    <Compile Include="System.IO\UnmanagedMemoryStream.cs" />
-    <Compile Include="System.Reflection.Emit\AssemblyBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\AssemblyBuilderAccess.cs" />
-    <Compile Include="System.Reflection.Emit\ConstructorBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\ConstructorOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\CustomAttributeBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\DerivedTypes.cs" />
-    <Compile Include="System.Reflection.Emit\DynamicILInfo.cs" />
-    <Compile Include="System.Reflection.Emit\DynamicMethod.cs" />
-    <Compile Include="System.Reflection.Emit\EnumBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\EventBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\EventOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\EventToken.cs" />
-    <Compile Include="System.Reflection.Emit\FieldBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\FieldOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\FieldToken.cs" />
-    <Compile Include="System.Reflection.Emit\FlowControl.cs" />
-    <Compile Include="System.Reflection.Emit\GenericTypeParameterBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\ILGenerator.cs" />
-    <Compile Include="System.Reflection.Emit\Label.cs" />
-    <Compile Include="System.Reflection.Emit\LocalBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\MethodBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\MethodOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\MethodRental.cs" />
-    <Compile Include="System.Reflection.Emit\MethodToken.cs" />
-    <Compile Include="System.Reflection.Emit\ModuleBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\MonoArrayMethod.cs" />
-    <Compile Include="System.Reflection.Emit\OpCode.cs" />
-    <Compile Include="System.Reflection.Emit\OpCodeNames.cs" />
-    <Compile Include="System.Reflection.Emit\OpCodes.cs" />
-    <Compile Include="System.Reflection.Emit\OpCodeType.cs" />
-    <Compile Include="System.Reflection.Emit\OperandType.cs" />
-    <Compile Include="System.Reflection.Emit\PackingSize.cs" />
-    <Compile Include="System.Reflection.Emit\ParameterBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\ParameterToken.cs" />
-    <Compile Include="System.Reflection.Emit\PEFileKinds.cs" />
-    <Compile Include="System.Reflection.Emit\PropertyBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\PropertyOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\PropertyToken.cs" />
-    <Compile Include="System.Reflection.Emit\SignatureHelper.cs" />
-    <Compile Include="System.Reflection.Emit\SignatureToken.cs" />
-    <Compile Include="System.Reflection.Emit\StackBehaviour.cs" />
-    <Compile Include="System.Reflection.Emit\StringToken.cs" />
-    <Compile Include="System.Reflection.Emit\TypeBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\TypeToken.cs" />
-    <Compile Include="System.Reflection.Emit\UnmanagedMarshal.cs" />
-    <Compile Include="System.Reflection\AmbiguousMatchException.cs" />
-    <Compile Include="System.Reflection\Assembly.cs" />
-    <Compile Include="System.Reflection\AssemblyAlgorithmIdAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyCompanyAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyConfigurationAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyContentType.cs" />
-    <Compile Include="System.Reflection\AssemblyCopyrightAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyCultureAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyDefaultAliasAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyDelaySignAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyDescriptionAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyFileVersionAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyFlagsAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyInformationalVersionAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyKeyFileAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyKeyNameAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyMetadataAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyName.cs" />
-    <Compile Include="System.Reflection\AssemblyNameFlags.cs" />
-    <Compile Include="System.Reflection\AssemblyNameProxy.cs" />
-    <Compile Include="System.Reflection\AssemblyProductAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblySignatureKeyAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyTitleAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyTradeMarkAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyVersionAttribute.cs" />
-    <Compile Include="System.Reflection\Binder.cs" />
-    <Compile Include="System.Reflection\BindingFlags.cs" />
-    <Compile Include="System.Reflection\CallingConventions.cs" />
-    <Compile Include="System.Reflection\ConstructorInfo.cs" />
-    <Compile Include="System.Reflection\CustomAttributeData.cs" />
-    <Compile Include="System.Reflection\CustomAttributeExtensions.cs" />
-    <Compile Include="System.Reflection\CustomAttributeFormatException.cs" />
-    <Compile Include="System.Reflection\CustomAttributeNamedArgument.cs" />
-    <Compile Include="System.Reflection\CustomAttributeTypedArgument.cs" />
-    <Compile Include="System.Reflection\DefaultMemberAttribute.cs" />
-    <Compile Include="System.Reflection\EventAttributes.cs" />
-    <Compile Include="System.Reflection\EventInfo.cs" />
-    <Compile Include="System.Reflection\ExceptionHandlingClause.cs" />
-    <Compile Include="System.Reflection\ExceptionHandlingClauseOptions.cs" />
-    <Compile Include="System.Reflection\FieldAttributes.cs" />
-    <Compile Include="System.Reflection\FieldInfo.cs" />
-    <Compile Include="System.Reflection\GenericParameterAttributes.cs" />
-    <Compile Include="System.Reflection\ICustomAttributeProvider.cs" />
-    <Compile Include="System.Reflection\ImageFileMachine.cs" />
-    <Compile Include="System.Reflection\InterfaceMapping.cs" />
-    <Compile Include="System.Reflection\IntrospectionExtensions.cs" />
-    <Compile Include="System.Reflection\InvalidFilterCriteriaException.cs" />
-    <Compile Include="System.Reflection\IReflect.cs" />
-    <Compile Include="System.Reflection\IReflectableType.cs" />
-    <Compile Include="System.Reflection\LocalVariableInfo.cs" />
-    <Compile Include="System.Reflection\ManifestResourceInfo.cs" />
-    <Compile Include="System.Reflection\MemberFilter.cs" />
-    <Compile Include="System.Reflection\MemberInfo.cs" />
-    <Compile Include="System.Reflection\MemberInfoSerializationHolder.cs" />
-    <Compile Include="System.Reflection\MemberTypes.cs" />
-    <Compile Include="System.Reflection\MethodAttributes.cs" />
-    <Compile Include="System.Reflection\MethodBase.cs" />
-    <Compile Include="System.Reflection\MethodBody.cs" />
-    <Compile Include="System.Reflection\MethodImplAttributes.cs" />
-    <Compile Include="System.Reflection\MethodInfo.cs" />
-    <Compile Include="System.Reflection\Missing.cs" />
-    <Compile Include="System.Reflection\Module.cs" />
-    <Compile Include="System.Reflection\ModuleResolveEventHandler.cs" />
-    <Compile Include="System.Reflection\MonoAssembly.cs" />
-    <Compile Include="System.Reflection\MonoEvent.cs" />
-    <Compile Include="System.Reflection\MonoField.cs" />
-    <Compile Include="System.Reflection\MonoGenericClass.cs" />
-    <Compile Include="System.Reflection\MonoGenericMethod.cs" />
-    <Compile Include="System.Reflection\MonoMethod.cs" />
-    <Compile Include="System.Reflection\MonoModule.cs" />
-    <Compile Include="System.Reflection\MonoParameterInfo.cs" />
-    <Compile Include="System.Reflection\MonoProperty.cs" />
-    <Compile Include="System.Reflection\ObfuscateAssemblyAttribute.cs" />
-    <Compile Include="System.Reflection\ObfuscationAttribute.cs" />
-    <Compile Include="System.Reflection\ParameterAttributes.cs" />
-    <Compile Include="System.Reflection\ParameterInfo.cs" />
-    <Compile Include="System.Reflection\ParameterModifier.cs" />
-    <Compile Include="System.Reflection\Pointer.cs" />
-    <Compile Include="System.Reflection\PortableExecutableKinds.cs" />
-    <Compile Include="System.Reflection\ProcessorArchitecture.cs" />
-    <Compile Include="System.Reflection\PropertyAttributes.cs" />
-    <Compile Include="System.Reflection\PropertyInfo.cs" />
-    <Compile Include="System.Reflection\ReflectionContext.cs" />
-    <Compile Include="System.Reflection\ReflectionTypeLoadException.cs" />
-    <Compile Include="System.Reflection\ResourceAttributes.cs" />
-    <Compile Include="System.Reflection\ResourceLocation.cs" />
-    <Compile Include="System.Reflection\RuntimeReflectionExtensions.cs" />
-    <Compile Include="System.Reflection\StrongNameKeyPair.cs" />
-    <Compile Include="System.Reflection\TargetException.cs" />
-    <Compile Include="System.Reflection\TargetInvocationException.cs" />
-    <Compile Include="System.Reflection\TargetParameterCountException.cs" />
-    <Compile Include="System.Reflection\TypeAttributes.cs" />
-    <Compile Include="System.Reflection\TypeDelegator.cs" />
-    <Compile Include="System.Reflection\TypeFilter.cs" />
-    <Compile Include="System.Reflection\TypeInfo.cs" />
-    <Compile Include="System.Resources\IResourceReader.cs" />
-    <Compile Include="System.Resources\IResourceWriter.cs" />
-    <Compile Include="System.Resources\MissingManifestResourceException.cs" />
-    <Compile Include="System.Resources\MissingSatelliteAssemblyException.cs" />
-    <Compile Include="System.Resources\NeutralResourcesLanguageAttribute.cs" />
-    <Compile Include="System.Resources\ResourceManager.cs" />
-    <Compile Include="System.Resources\ResourceReader.cs" />
-    <Compile Include="System.Resources\ResourceSet.cs" />
-    <Compile Include="System.Resources\ResourceWriter.cs" />
-    <Compile Include="System.Resources\RuntimeResourceSet.cs" />
-    <Compile Include="System.Resources\SatelliteContractVersionAttribute.cs" />
-    <Compile Include="System.Resources\UltimateResourceFallbackLocation.cs" />
-    <Compile Include="System.Resources\Win32Resources.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AccessedThroughPropertyAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AsyncStateMachineAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AsyncTaskMethodBuilder.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AsyncTaskMethodBuilder_T.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AsyncVoidMethodBuilder.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallConvCdecl.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallConvFastcall.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallConvStdcall.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallConvThiscall.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallerFilePathAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallerLineNumberAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallerMemberNameAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilationRelaxations.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilationRelaxationsAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilerGeneratedAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilerGlobalScopeAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilerMarshalOverride.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ConditionalWeakTable.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ConfiguredTaskAwaitable.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ConfiguredTaskAwaitable_T.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ContractHelper.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CustomConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DateTimeConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DecimalConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DefaultDependencyAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DependencyAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DiscardableAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\FixedAddressValueTypeAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\FixedBufferAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\HasCopySemanticsAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IAsyncStateMachine.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ICriticalNotifyCompletion.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IDispatchConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IndexerNameAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\INotifyCompletion.cs" />
-    <Compile Include="System.Runtime.CompilerServices\InternalsVisibleToAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsBoxed.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsByValue.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsConst.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsCopyConstructed.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsExplicitlyDereferenced.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsImplicitlyDereferenced.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsJitIntrinsic.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsLong.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsPinned.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsSignUnspecifiedByte.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsUdtReturn.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsVolatile.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IteratorStateMachineAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IUnknownConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\LoadHint.cs" />
-    <Compile Include="System.Runtime.CompilerServices\MethodCodeType.cs" />
-    <Compile Include="System.Runtime.CompilerServices\MethodImplAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\MethodImplOptions.cs" />
-    <Compile Include="System.Runtime.CompilerServices\NativeCppClassAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ReferenceAssemblyAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\RequiredAttributeAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\RuntimeCompatibilityAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\RuntimeHelpers.cs" />
-    <Compile Include="System.Runtime.CompilerServices\RuntimeWrappedException.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ScopelessEnumAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\SpecialNameAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\StateMachineAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\StringFreezingAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\SuppressIldasmAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\TaskAwaiter.cs" />
-    <Compile Include="System.Runtime.CompilerServices\TaskAwaiter_T.cs" />
-    <Compile Include="System.Runtime.CompilerServices\TypeForwardedFromAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\TypeForwardedToAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\UnsafeValueTypeAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\YieldAwaitable.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\CER.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\Consistency.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\CriticialFinalizerObject.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\PrePrepareMethodAttribute.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\ReliabilityContractAttribute.cs" />
-    <Compile Include="System.Runtime.ExceptionServices\ExceptionDispatchInfo.cs" />
-    <Compile Include="System.Runtime.ExceptionServices\FirstChanceExceptionEventArgs.cs" />
-    <Compile Include="System.Runtime.ExceptionServices\HandleProcessCorruptedStateExceptionsAttribute.cs" />
-    <Compile Include="System.Runtime.Hosting\ActivationArguments.cs" />
-    <Compile Include="System.Runtime.Hosting\ApplicationActivator.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\BIND_OPTS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\BINDPTR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\CALLCONV.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\CONNECTDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DESCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DISPPARAMS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ELEMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\EXCEPINFO.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FILETIME.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IBindCtx.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IConnectionPoint.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IConnectionPointContainer.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDLDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDLFLAG.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumConnectionPoints.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumConnections.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumMoniker.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumString.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumVARIANT.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IMoniker.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IMPLTYPEFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\INVOKEKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IPersistFile.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IRunningObjectTable.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IStream.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeComp.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeInfo2.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeLib.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeLib2.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\LIBFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\PARAMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\PARAMFLAG.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATSTG.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\SYSKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEATTR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPELIBATTR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.Expando\IExpando.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DefaultInterfaceAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DesignerNamespaceResolveEventArgs.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationToken.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationTokenTable.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\IActivationFactory.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\InterfaceImplementedInVersionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\NamespaceResolveEventArgs.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReadOnlyArrayAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReturnValueNameAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMarshal.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMetadata.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WriteOnlyArrayAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Activator.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Assembly.cs" />
-    <Compile Include="System.Runtime.InteropServices\_AssemblyBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_AssemblyName.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Attribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ConstructorBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ConstructorInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_CustomAttributeBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_EnumBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_EventBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_EventInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Exception.cs" />
-    <Compile Include="System.Runtime.InteropServices\_FieldBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_FieldInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ILGenerator.cs" />
-    <Compile Include="System.Runtime.InteropServices\_LocalBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MemberInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodBase.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodRental.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Module.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ModuleBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ParameterBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ParameterInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_PropertyBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_PropertyInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_SignatureHelper.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Thread.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Type.cs" />
-    <Compile Include="System.Runtime.InteropServices\_TypeBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\AllowReversePInvokeCallsAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ArrayWithOffset.cs" />
-    <Compile Include="System.Runtime.InteropServices\AssemblyRegistrationFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\AutomationProxyAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\BestFitMappingAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\BIND_OPTS.cs" />
-    <Compile Include="System.Runtime.InteropServices\BINDPTR.cs" />
-    <Compile Include="System.Runtime.InteropServices\BStrWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\CALLCONV.cs" />
-    <Compile Include="System.Runtime.InteropServices\CallingConvention.cs" />
-    <Compile Include="System.Runtime.InteropServices\CharSet.cs" />
-    <Compile Include="System.Runtime.InteropServices\ClassInterfaceAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ClassInterfaceType.cs" />
-    <Compile Include="System.Runtime.InteropServices\CoClassAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComAliasNameAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComCompatibleVersionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComConversionLossAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComDefaultInterfaceAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComEventInterfaceAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\COMException.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComImportAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComInterfaceType.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComMemberType.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComRegisterFunctionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComSourceInterfacesAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComUnregisterFunctionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComVisible.cs" />
-    <Compile Include="System.Runtime.InteropServices\CONNECTDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices\CriticalHandle.cs" />
-    <Compile Include="System.Runtime.InteropServices\CurrencyWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\DefaultCharSetAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\DESCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\DispatchWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\DispIdAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\DISPPARAMS.cs" />
-    <Compile Include="System.Runtime.InteropServices\DllImportAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ELEMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\ErrorWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\EXCEPINFO.cs" />
-    <Compile Include="System.Runtime.InteropServices\ExporterEventKind.cs" />
-    <Compile Include="System.Runtime.InteropServices\ExtensibleClassFactory.cs" />
-    <Compile Include="System.Runtime.InteropServices\ExternalException.cs" />
-    <Compile Include="System.Runtime.InteropServices\FieldOffsetAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\FILETIME.cs" />
-    <Compile Include="System.Runtime.InteropServices\FUNCDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\FUNCFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\FUNCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\GCHandle.cs" />
-    <Compile Include="System.Runtime.InteropServices\GCHandleType.cs" />
-    <Compile Include="System.Runtime.InteropServices\GuidAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\HandleRef.cs" />
-    <Compile Include="System.Runtime.InteropServices\ICustomAdapter.cs" />
-    <Compile Include="System.Runtime.InteropServices\ICustomFactory.cs" />
-    <Compile Include="System.Runtime.InteropServices\ICustomMarshaler.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDispatchImplAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDispatchImplType.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDLDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDLFLAG.cs" />
-    <Compile Include="System.Runtime.InteropServices\IMPLTYPEFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\ImportedFromTypeLibAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />
-    <Compile Include="System.Runtime.InteropServices\InAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\InterfaceTypeAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\InvalidComObjectException.cs" />
-    <Compile Include="System.Runtime.InteropServices\InvalidOleVariantTypeException.cs" />
-    <Compile Include="System.Runtime.InteropServices\INVOKEKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\IRegistrationServices.cs" />
-    <Compile Include="System.Runtime.InteropServices\ITypeLibConverter.cs" />
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNameProvider.cs" />
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNotifySink.cs" />
-    <Compile Include="System.Runtime.InteropServices\ITypeLibImporterNotifySink.cs" />
-    <Compile Include="System.Runtime.InteropServices\LayoutKind.cs" />
-    <Compile Include="System.Runtime.InteropServices\LCIDConversionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\LIBFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\Marshal.cs" />
-    <Compile Include="System.Runtime.InteropServices\MarshalAsAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\MarshalDirectiveException.cs" />
-    <Compile Include="System.Runtime.InteropServices\ObjectCreationDelegate.cs" />
-    <Compile Include="System.Runtime.InteropServices\OptionalAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\OutAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\PARAMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\PARAMFLAG.cs" />
-    <Compile Include="System.Runtime.InteropServices\PreserveSigAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\PrimaryInteropAssemblyAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ProgIdAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\RegistrationClassContext.cs" />
-    <Compile Include="System.Runtime.InteropServices\RegistrationConnectionType.cs" />
-    <Compile Include="System.Runtime.InteropServices\RegistrationServices.cs" />
-    <Compile Include="System.Runtime.InteropServices\RuntimeEnvironment.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeArrayRankMismatchException.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeArrayTypeMismatchException.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeBuffer.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeHandle.cs" />
-    <Compile Include="System.Runtime.InteropServices\SEHException.cs" />
-    <Compile Include="System.Runtime.InteropServices\SetWin32ContextInIDispatchAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\STATSTG.cs" />
-    <Compile Include="System.Runtime.InteropServices\StructLayoutAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\SYSKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEATTR.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeIdentifierAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPELIBATTR.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibConverter.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibExporterFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibFuncAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibFuncFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibImportClassAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibImporterFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibTypeAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibTypeFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibVarAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibVarFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibVersionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIBindCtx.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPoint.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPointContainer.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumConnectionPoints.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumConnections.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumMoniker.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumString.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumVARIANT.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIMoniker.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIPersistFile.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIRunningObjectTable.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIStream.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeComp.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeLib.cs" />
-    <Compile Include="System.Runtime.InteropServices\UnknownWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\UnmanagedFunctionPointerAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\UnmanagedType.cs" />
-    <Compile Include="System.Runtime.InteropServices\VARDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\VarEnum.cs" />
-    <Compile Include="System.Runtime.InteropServices\VARFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\VariantWrapper.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\ActivationServices.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\ActivatorLevel.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\AppDomainLevelActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\ConstructionLevelActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\ContextLevelActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\IActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionCallMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionReturnMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivationAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\UrlAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\AggregateDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelObjectWithProperties.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelSinkWithProperties.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelWithProperties.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelDataStore.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelServices.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelSinkStackEntry.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ClientChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\CrossAppDomainChannel.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannel.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelDataStore.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiver.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiverHook.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSender.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSinkBase.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientResponseChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ISecurableChannel.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerFormatterSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerResponseChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ITransportHeaders.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ServerChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ServerProcessing.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\SinkProviderData.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\TransportHeaders.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\Context.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextProperty.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextChannel.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextDelegate.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextProperty.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextPropertyActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeClientContextSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeDynamicSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeEnvoySink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeObjectSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeServerContextSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicMessageSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicProperty.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\SynchronizationAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\ClientSponsor.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\ILease.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\ISponsor.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\Lease.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseManager.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseState.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\LifetimeServices.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ArgInfo.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\AsyncResult.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\CADMessages.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\CallContext.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ClientContextTerminatorSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCall.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCallDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionResponse.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\EnvoyTerminatorSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ErrorMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\Header.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\HeaderHandler.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IInternalMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageCtrl.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodCallMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodReturnMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\InternalMessageWrapper.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IRemotingFormatter.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ISerializationRootObject.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\LogicalCallContext.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MessageSurrogateFilter.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCall.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallMessageWrapper.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodResponse.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnMessageWrapper.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MonoMethodMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\OneWayAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogate.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogateSelector.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ReturnMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerContextTerminatorSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerObjectTerminatorSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\StackBuilderSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\ISoapXsd.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapAnyUri.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapBase64Binary.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDate.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDateTime.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDay.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDuration.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntities.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntity.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHelper.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHexBinary.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapId.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdref.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdrefs.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapLanguage.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonth.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonthDay.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapName.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNcName.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNegativeInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtoken.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtokens.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonNegativeInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonPositiveInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNormalizedString.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNotation.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapPositiveInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapQName.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapTime.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapToken.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYear.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYearMonth.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapFieldAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapMethodAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapOption.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapParameterAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapTypeAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\XmlFieldOrderOption.cs" />
-    <Compile Include="System.Runtime.Remoting.Proxies\ProxyAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Proxies\RealProxy.cs" />
-    <Compile Include="System.Runtime.Remoting.Proxies\RemotingProxy.cs" />
-    <Compile Include="System.Runtime.Remoting.Services\EnterpriseServicesHelper.cs" />
-    <Compile Include="System.Runtime.Remoting.Services\ITrackingHandler.cs" />
-    <Compile Include="System.Runtime.Remoting.Services\TrackingServices.cs" />
-    <Compile Include="System.Runtime.Remoting\ActivatedClientTypeEntry.cs" />
-    <Compile Include="System.Runtime.Remoting\ActivatedServiceTypeEntry.cs" />
-    <Compile Include="System.Runtime.Remoting\CustomErrorsModes.cs" />
-    <Compile Include="System.Runtime.Remoting\EnvoyInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\IChannelInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\Identity.cs" />
-    <Compile Include="System.Runtime.Remoting\IEnvoyInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\InternalRemotingServices.cs" />
-    <Compile Include="System.Runtime.Remoting\IObjectHandle.cs" />
-    <Compile Include="System.Runtime.Remoting\IRemotingTypeInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\ObjectHandle.cs" />
-    <Compile Include="System.Runtime.Remoting\ObjRef.cs" />
-    <Compile Include="System.Runtime.Remoting\RemotingConfiguration.cs" />
-    <Compile Include="System.Runtime.Remoting\RemotingException.cs" />
-    <Compile Include="System.Runtime.Remoting\RemotingServices.cs" />
-    <Compile Include="System.Runtime.Remoting\RemotingTimeoutException.cs" />
-    <Compile Include="System.Runtime.Remoting\ServerException.cs" />
-    <Compile Include="System.Runtime.Remoting\ServerIdentity.cs" />
-    <Compile Include="System.Runtime.Remoting\SoapServices.cs" />
-    <Compile Include="System.Runtime.Remoting\TypeEntry.cs" />
-    <Compile Include="System.Runtime.Remoting\TypeInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\WellKnownClientTypeEntry.cs" />
-    <Compile Include="System.Runtime.Remoting\WellKnownObjectMode.cs" />
-    <Compile Include="System.Runtime.Remoting\WellKnownServiceTypeEntry.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\BinaryCommon.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\BinaryFormatter.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\CodeGenerator.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\MessageFormatter.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\ObjectReader.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\ObjectWriter.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterAssemblyStyle.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterTopObjectStyle.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterTypeStyle.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\IFieldInfo.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalArrayTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalElementTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalMemberTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalMemberValueE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalNameSpaceE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalObjectPositionE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalObjectTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalParseStateE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalParseTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalPrimitiveTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalRM.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalSerializerTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalST.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\ISoapMessage.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\ServerFault.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\SoapFault.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\SoapMessage.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\TypeFilterLevel.cs" />
-    <Compile Include="System.Runtime.Serialization\Formatter.cs" />
-    <Compile Include="System.Runtime.Serialization\FormatterConverter.cs" />
-    <Compile Include="System.Runtime.Serialization\FormatterServices.cs" />
-    <Compile Include="System.Runtime.Serialization\IDeserializationCallback.cs" />
-    <Compile Include="System.Runtime.Serialization\IFormatter.cs" />
-    <Compile Include="System.Runtime.Serialization\IFormatterConverter.cs" />
-    <Compile Include="System.Runtime.Serialization\IObjectReference.cs" />
-    <Compile Include="System.Runtime.Serialization\ISafeSerializationData.cs" />
-    <Compile Include="System.Runtime.Serialization\ISerializable.cs" />
-    <Compile Include="System.Runtime.Serialization\ISerializationSurrogate.cs" />
-    <Compile Include="System.Runtime.Serialization\ISurrogateSelector.cs" />
-    <Compile Include="System.Runtime.Serialization\ObjectIDGenerator.cs" />
-    <Compile Include="System.Runtime.Serialization\ObjectManager.cs" />
-    <Compile Include="System.Runtime.Serialization\OnDeserializedAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\OnDeserializingAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\OnSerializedAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\OnSerializingAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\OptionalFieldAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\SafeSerializationEventArgs.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationBinder.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationCallbacks.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationEntry.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationException.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationInfo.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationInfoEnumerator.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationObjectManager.cs" />
-    <Compile Include="System.Runtime.Serialization\StreamingContext.cs" />
-    <Compile Include="System.Runtime.Serialization\StreamingContextStates.cs" />
-    <Compile Include="System.Runtime.Serialization\SurrogateSelector.cs" />
-    <Compile Include="System.Runtime.Versioning\ComponentGuaranteesAttribute.cs" />
-    <Compile Include="System.Runtime.Versioning\ComponentGuaranteesOptions.cs" />
-    <Compile Include="System.Runtime.Versioning\ResourceConsumptionAttribute.cs" />
-    <Compile Include="System.Runtime.Versioning\ResourceExposureAttribute.cs" />
-    <Compile Include="System.Runtime.Versioning\ResourceScope.cs" />
-    <Compile Include="System.Runtime.Versioning\TargetFrameworkAttribute.cs" />
-    <Compile Include="System.Runtime.Versioning\VersioningHelper.cs" />
-    <Compile Include="System.Runtime\AssemblyTargetedPatchBandAttribute.cs" />
-    <Compile Include="System.Runtime\GCLargeObjectHeapCompactionMode.cs" />
-    <Compile Include="System.Runtime\GCLatencyMode.cs" />
-    <Compile Include="System.Runtime\GCSettings.cs" />
-    <Compile Include="System.Runtime\MemoryFailPoint.cs" />
-    <Compile Include="System.Runtime\TargetedPatchingOptOutAttribute.cs" />
-    <Compile Include="System.Security.AccessControl\AccessControlActions.cs" />
-    <Compile Include="System.Security.AccessControl\AccessControlModification.cs" />
-    <Compile Include="System.Security.AccessControl\AccessControlSections.cs" />
-    <Compile Include="System.Security.AccessControl\AccessControlType.cs" />
-    <Compile Include="System.Security.AccessControl\AccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\AccessRule_T.cs" />
-    <Compile Include="System.Security.AccessControl\AceEnumerator.cs" />
-    <Compile Include="System.Security.AccessControl\AceFlags.cs" />
-    <Compile Include="System.Security.AccessControl\AceQualifier.cs" />
-    <Compile Include="System.Security.AccessControl\AceType.cs" />
-    <Compile Include="System.Security.AccessControl\AuditFlags.cs" />
-    <Compile Include="System.Security.AccessControl\AuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\AuditRule_T.cs" />
-    <Compile Include="System.Security.AccessControl\AuthorizationRule.cs" />
-    <Compile Include="System.Security.AccessControl\AuthorizationRuleCollection.cs" />
-    <Compile Include="System.Security.AccessControl\CommonAce.cs" />
-    <Compile Include="System.Security.AccessControl\CommonAcl.cs" />
-    <Compile Include="System.Security.AccessControl\CommonObjectSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\CommonSecurityDescriptor.cs" />
-    <Compile Include="System.Security.AccessControl\CompoundAce.cs" />
-    <Compile Include="System.Security.AccessControl\CompoundAceType.cs" />
-    <Compile Include="System.Security.AccessControl\ControlFlags.cs" />
-    <Compile Include="System.Security.AccessControl\CryptoKeyAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\CryptoKeyAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\CryptoKeyRights.cs" />
-    <Compile Include="System.Security.AccessControl\CryptoKeySecurity.cs" />
-    <Compile Include="System.Security.AccessControl\CustomAce.cs" />
-    <Compile Include="System.Security.AccessControl\DirectoryObjectSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\DirectorySecurity.cs" />
-    <Compile Include="System.Security.AccessControl\DiscretionaryAcl.cs" />
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\EventWaitHandleRights.cs" />
-    <Compile Include="System.Security.AccessControl\EventWaitHandleSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\FileSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\FileSystemAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\FileSystemAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\FileSystemRights.cs" />
-    <Compile Include="System.Security.AccessControl\FileSystemSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\GenericAce.cs" />
-    <Compile Include="System.Security.AccessControl\GenericAcl.cs" />
-    <Compile Include="System.Security.AccessControl\GenericSecurityDescriptor.cs" />
-    <Compile Include="System.Security.AccessControl\InheritanceFlags.cs" />
-    <Compile Include="System.Security.AccessControl\KnownAce.cs" />
-    <Compile Include="System.Security.AccessControl\MutexAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\MutexAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\MutexRights.cs" />
-    <Compile Include="System.Security.AccessControl\MutexSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\NativeObjectSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectAce.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectAceFlags.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectSecurity_T.cs" />
-    <Compile Include="System.Security.AccessControl\PrivilegeNotHeldException.cs" />
-    <Compile Include="System.Security.AccessControl\PropagationFlags.cs" />
-    <Compile Include="System.Security.AccessControl\QualifiedAce.cs" />
-    <Compile Include="System.Security.AccessControl\RawAcl.cs" />
-    <Compile Include="System.Security.AccessControl\RawSecurityDescriptor.cs" />
-    <Compile Include="System.Security.AccessControl\RegistryAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\RegistryAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\RegistryRights.cs" />
-    <Compile Include="System.Security.AccessControl\RegistrySecurity.cs" />
-    <Compile Include="System.Security.AccessControl\ResourceType.cs" />
-    <Compile Include="System.Security.AccessControl\SddlAccessRight.cs" />
-    <Compile Include="System.Security.AccessControl\SecurityInfos.cs" />
-    <Compile Include="System.Security.AccessControl\SystemAcl.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate20.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ContentType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyStorageFlags.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricKeyExchangeDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricKeyExchangeFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricSignatureDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricSignatureFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\Base64Constants.cs" />
-    <Compile Include="System.Security.Cryptography\CipherMode.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoAPITransform.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoConfig.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoConfig.fullaot.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoConfig_2_1.cs" />
-    <Compile Include="System.Security.Cryptography\CryptographicException.cs" />
-    <Compile Include="System.Security.Cryptography\CryptographicUnexpectedOperationExcpetion.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoStream.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoStreamMode.cs" />
-    <Compile Include="System.Security.Cryptography\CspKeyContainerInfo.cs" />
-    <Compile Include="System.Security.Cryptography\CspParameters.cs" />
-    <Compile Include="System.Security.Cryptography\CspProviderFlags.cs" />
-    <Compile Include="System.Security.Cryptography\DeriveBytes.cs" />
-    <Compile Include="System.Security.Cryptography\DES.cs" />
-    <Compile Include="System.Security.Cryptography\DESCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\DSA.cs" />
-    <Compile Include="System.Security.Cryptography\DSACryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\DSAParameters.cs" />
-    <Compile Include="System.Security.Cryptography\DSASignatureDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\DSASignatureFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\FromBase64Transform.cs" />
-    <Compile Include="System.Security.Cryptography\HashAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\HMAC.cs" />
-    <Compile Include="System.Security.Cryptography\HMACMD5.cs" />
-    <Compile Include="System.Security.Cryptography\HMACRIPEMD160.cs" />
-    <Compile Include="System.Security.Cryptography\HMACSHA1.cs" />
-    <Compile Include="System.Security.Cryptography\HMACSHA256.cs" />
-    <Compile Include="System.Security.Cryptography\HMACSHA384.cs" />
-    <Compile Include="System.Security.Cryptography\HMACSHA512.cs" />
-    <Compile Include="System.Security.Cryptography\ICryptoTransform.cs" />
-    <Compile Include="System.Security.Cryptography\ICspAsymmetricAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\KeyedHashAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\KeyNumber.cs" />
-    <Compile Include="System.Security.Cryptography\KeySizes.cs" />
-    <Compile Include="System.Security.Cryptography\MACTripleDES.cs" />
-    <Compile Include="System.Security.Cryptography\MaskGenerationMethod.cs" />
-    <Compile Include="System.Security.Cryptography\MD5.cs" />
-    <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\PaddingMode.cs" />
-    <Compile Include="System.Security.Cryptography\PasswordDeriveBytes.cs" />
-    <Compile Include="System.Security.Cryptography\PKCS1MaskGenerationMethod.cs" />
-    <Compile Include="System.Security.Cryptography\RandomNumberGenerator.cs" />
-    <Compile Include="System.Security.Cryptography\RC2.cs" />
-    <Compile Include="System.Security.Cryptography\RC2CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\Rfc2898DeriveBytes.cs" />
-    <Compile Include="System.Security.Cryptography\Rijndael.cs" />
-    <Compile Include="System.Security.Cryptography\RijndaelManaged.cs" />
-    <Compile Include="System.Security.Cryptography\RijndaelManagedTransform.cs" />
-    <Compile Include="System.Security.Cryptography\RIPEMD160.cs" />
-    <Compile Include="System.Security.Cryptography\RIPEMD160Managed.cs" />
-    <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\RSA.cs" />
-    <Compile Include="System.Security.Cryptography\RSACryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\RSAOAEPKeyExchangeDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAOAEPKeyExchangeFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAParameters.cs" />
-    <Compile Include="System.Security.Cryptography\RSAPKCS1KeyExchangeDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAPKCS1KeyExchangeFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1Managed.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256Managed.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384Managed.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512Managed.cs" />
-    <Compile Include="System.Security.Cryptography\SHAConstants.cs" />
-    <Compile Include="System.Security.Cryptography\SignatureDescription.cs" />
-    <Compile Include="System.Security.Cryptography\SymmetricAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\ToBase64Transform.cs" />
-    <Compile Include="System.Security.Cryptography\TripleDES.cs" />
-    <Compile Include="System.Security.Cryptography\TripleDESCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Permissions\CodeAccessSecurityAttribute.cs" />
-    <Compile Include="System.Security.Permissions\EnvironmentPermission.cs" />
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAccess.cs" />
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\FileDialogPermission.cs" />
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAccess.cs" />
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\FileIOPermission.cs" />
-    <Compile Include="System.Security.Permissions\FileIOPermissionAccess.cs" />
-    <Compile Include="System.Security.Permissions\FileIOPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\GacIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\GacIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\HostProtectionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\HostProtectionPermission.cs" />
-    <Compile Include="System.Security.Permissions\HostProtectionResource.cs" />
-    <Compile Include="System.Security.Permissions\IBuiltInPermission.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStorageContainment.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermission.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermission.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\IUnrestrictedPermission.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermission.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntry.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryCollection.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryEnumerator.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionFlags.cs" />
-    <Compile Include="System.Security.Permissions\PermissionSetAttribute.cs" />
-    <Compile Include="System.Security.Permissions\PermissionState.cs" />
-    <Compile Include="System.Security.Permissions\PrincipalPermission.cs" />
-    <Compile Include="System.Security.Permissions\PrincipalPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\ReflectionPermission.cs" />
-    <Compile Include="System.Security.Permissions\ReflectionPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\ReflectionPermissionFlag.cs" />
-    <Compile Include="System.Security.Permissions\RegistryPermission.cs" />
-    <Compile Include="System.Security.Permissions\RegistryPermissionAccess.cs" />
-    <Compile Include="System.Security.Permissions\RegistryPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\SecurityAction.cs" />
-    <Compile Include="System.Security.Permissions\SecurityAttribute.cs" />
-    <Compile Include="System.Security.Permissions\SecurityPermission.cs" />
-    <Compile Include="System.Security.Permissions\SecurityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\SecurityPermissionFlag.cs" />
-    <Compile Include="System.Security.Permissions\SiteIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\SiteIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\StrongNameIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\StrongNamePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\StrongNamePublicKeyBlob.cs" />
-    <Compile Include="System.Security.Permissions\UIPermission.cs" />
-    <Compile Include="System.Security.Permissions\UIPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\UIPermissionClipboard.cs" />
-    <Compile Include="System.Security.Permissions\UIPermissionWindow.cs" />
-    <Compile Include="System.Security.Permissions\UrlIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\UrlIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Policy\AllMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\ApplicationDirectory.cs" />
-    <Compile Include="System.Security.Policy\ApplicationDirectoryMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\ApplicationSecurityInfo.cs" />
-    <Compile Include="System.Security.Policy\ApplicationSecurityManager.cs" />
-    <Compile Include="System.Security.Policy\ApplicationTrust.cs" />
-    <Compile Include="System.Security.Policy\ApplicationTrustCollection.cs" />
-    <Compile Include="System.Security.Policy\ApplicationTrustEnumerator.cs" />
-    <Compile Include="System.Security.Policy\ApplicationVersionMatch.cs" />
-    <Compile Include="System.Security.Policy\CodeConnectAccess.cs" />
-    <Compile Include="System.Security.Policy\CodeGroup.cs" />
-    <Compile Include="System.Security.Policy\DefaultPolicies.cs" />
-    <Compile Include="System.Security.Policy\Evidence.cs" />
-    <Compile Include="System.Security.Policy\EvidenceBase.cs" />
-    <Compile Include="System.Security.Policy\FileCodeGroup.cs" />
-    <Compile Include="System.Security.Policy\FirstMatchCodeGroup.cs" />
-    <Compile Include="System.Security.Policy\Gac.cs" />
-    <Compile Include="System.Security.Policy\GacMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\Hash.cs" />
-    <Compile Include="System.Security.Policy\HashMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\IApplicationTrustManager.cs" />
-    <Compile Include="System.Security.Policy\IBuiltInEvidence.cs" />
-    <Compile Include="System.Security.Policy\IConstantMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\IIdentityPermissionFactory.cs" />
-    <Compile Include="System.Security.Policy\IMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\MembershipConditionHelper.cs" />
-    <Compile Include="System.Security.Policy\MonoTrustManager.cs" />
-    <Compile Include="System.Security.Policy\NetCodeGroup.cs" />
-    <Compile Include="System.Security.Policy\PermissionRequestEvidence.cs" />
-    <Compile Include="System.Security.Policy\PolicyException.cs" />
-    <Compile Include="System.Security.Policy\PolicyLevel.cs" />
-    <Compile Include="System.Security.Policy\PolicyStatement.cs" />
-    <Compile Include="System.Security.Policy\PolicyStatementAttribute.cs" />
-    <Compile Include="System.Security.Policy\Publisher.cs" />
-    <Compile Include="System.Security.Policy\PublisherMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\Site.cs" />
-    <Compile Include="System.Security.Policy\SiteMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\StrongName.cs" />
-    <Compile Include="System.Security.Policy\StrongNameMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\TrustManagerContext.cs" />
-    <Compile Include="System.Security.Policy\TrustManagerUIContext.cs" />
-    <Compile Include="System.Security.Policy\UnionCodeGroup.cs" />
-    <Compile Include="System.Security.Policy\Url.cs" />
-    <Compile Include="System.Security.Policy\UrlMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\Zone.cs" />
-    <Compile Include="System.Security.Policy\ZoneMembershipCondition.cs" />
-    <Compile Include="System.Security.Principal\GenericIdentity.cs" />
-    <Compile Include="System.Security.Principal\GenericPrincipal.cs" />
-    <Compile Include="System.Security.Principal\IdentityNotMappedException.cs" />
-    <Compile Include="System.Security.Principal\IdentityReference.cs" />
-    <Compile Include="System.Security.Principal\IdentityReferenceCollection.cs" />
-    <Compile Include="System.Security.Principal\IIdentity.cs" />
-    <Compile Include="System.Security.Principal\IPrincipal.cs" />
-    <Compile Include="System.Security.Principal\NTAccount.cs" />
-    <Compile Include="System.Security.Principal\PrincipalPolicy.cs" />
-    <Compile Include="System.Security.Principal\SecurityIdentifier.cs" />
-    <Compile Include="System.Security.Principal\TokenAccessLevels.cs" />
-    <Compile Include="System.Security.Principal\TokenImpersonationLevel.cs" />
-    <Compile Include="System.Security.Principal\WellKnownAccount.cs" />
-    <Compile Include="System.Security.Principal\WellKnownSidType.cs" />
-    <Compile Include="System.Security.Principal\WindowsAccountType.cs" />
-    <Compile Include="System.Security.Principal\WindowsBuiltInRole.cs" />
-    <Compile Include="System.Security.Principal\WindowsIdentity.cs" />
-    <Compile Include="System.Security.Principal\WindowsImpersonationContext.cs" />
-    <Compile Include="System.Security.Principal\WindowsPrincipal.cs" />
-    <Compile Include="System.Security\AllowPartiallyTrustedCallersAttribute.cs" />
-    <Compile Include="System.Security\CodeAccessPermission.cs" />
-    <Compile Include="System.Security\HostProtectionException.cs" />
-    <Compile Include="System.Security\HostSecurityManager.cs" />
-    <Compile Include="System.Security\HostSecurityManagerFlags.cs" />
-    <Compile Include="System.Security\IEvidenceFactory.cs" />
-    <Compile Include="System.Security\IPermission.cs" />
-    <Compile Include="System.Security\ISecurityEncodable.cs" />
-    <Compile Include="System.Security\ISecurityPolicyEncodable.cs" />
-    <Compile Include="System.Security\IStackWalk.cs" />
-    <Compile Include="System.Security\NamedPermissionSet.cs" />
-    <Compile Include="System.Security\PermissionBuilder.cs" />
-    <Compile Include="System.Security\PermissionSet.cs" />
-    <Compile Include="System.Security\PolicyLevelType.cs" />
-    <Compile Include="System.Security\SecureString.cs" />
-    <Compile Include="System.Security\SecurityContext.cs" />
-    <Compile Include="System.Security\SecurityContextSource.cs" />
-    <Compile Include="System.Security\SecurityCriticalAttribute.cs" />
-    <Compile Include="System.Security\SecurityCriticalScope.cs" />
-    <Compile Include="System.Security\SecurityElement.cs" />
-    <Compile Include="System.Security\SecurityException.cs" />
-    <Compile Include="System.Security\SecurityFrame.cs" />
-    <Compile Include="System.Security\SecurityManager.cs" />
-    <Compile Include="System.Security\SecurityManager_mobile.cs" />
-    <Compile Include="System.Security\SecurityRulesAttribute.cs" />
-    <Compile Include="System.Security\SecurityRuleSet.cs" />
-    <Compile Include="System.Security\SecuritySafeCriticalAttribute.cs" />
-    <Compile Include="System.Security\SecurityState.cs" />
-    <Compile Include="System.Security\SecurityTransparentAttribute.cs" />
-    <Compile Include="System.Security\SecurityTreatAsSafeAttribute.cs" />
-    <Compile Include="System.Security\SecurityZone.cs" />
-    <Compile Include="System.Security\SuppressUnmanagedCodeSecurityAttribute.cs" />
-    <Compile Include="System.Security\UnverifiableCodeAttribute.cs" />
-    <Compile Include="System.Security\VerificationException.cs" />
-    <Compile Include="System.Security\XmlSyntaxException.cs" />
-    <Compile Include="System.Text\ASCIIEncoding.cs" />
-    <Compile Include="System.Text\CodePageEncoding.cs" />
-    <Compile Include="System.Text\Decoder.cs" />
-    <Compile Include="System.Text\DecoderExceptionFallback.cs" />
-    <Compile Include="System.Text\DecoderExceptionFallbackBuffer.cs" />
-    <Compile Include="System.Text\DecoderFallback.cs" />
-    <Compile Include="System.Text\DecoderFallbackBuffer.cs" />
-    <Compile Include="System.Text\DecoderFallbackException.cs" />
-    <Compile Include="System.Text\DecoderReplacementFallback.cs" />
-    <Compile Include="System.Text\DecoderReplacementFallbackBuffer.cs" />
-    <Compile Include="System.Text\Encoder.cs" />
-    <Compile Include="System.Text\EncoderExceptionFallback.cs" />
-    <Compile Include="System.Text\EncoderExceptionFallbackBuffer.cs" />
-    <Compile Include="System.Text\EncoderFallback.cs" />
-    <Compile Include="System.Text\EncoderFallbackBuffer.cs" />
-    <Compile Include="System.Text\EncoderFallbackException.cs" />
-    <Compile Include="System.Text\EncoderReplacementFallback.cs" />
-    <Compile Include="System.Text\EncoderReplacementFallbackBuffer.cs" />
-    <Compile Include="System.Text\Encoding.cs" />
-    <Compile Include="System.Text\EncodingInfo.cs" />
-    <Compile Include="System.Text\Latin1Encoding.cs" />
-    <Compile Include="System.Text\MLangCodePageEncoding.cs" />
-    <Compile Include="System.Text\NormalizationForm.cs" />
-    <Compile Include="System.Text\StringBuilder.cs" />
-    <Compile Include="System.Text\SurrogateEncoder.cs" />
-    <Compile Include="System.Text\UnicodeEncoding.cs" />
-    <Compile Include="System.Text\UTF32Encoding.cs" />
-    <Compile Include="System.Text\UTF7Encoding.cs" />
-    <Compile Include="System.Text\UTF8Encoding.cs" />
-    <Compile Include="System.Threading.Tasks\ConcurrentExclusiveSchedulerPair.cs" />
-    <Compile Include="System.Threading.Tasks\CyclicDeque.cs" />
-    <Compile Include="System.Threading.Tasks\DecoupledTask.cs" />
-    <Compile Include="System.Threading.Tasks\IConcurrentDeque.cs" />
-    <Compile Include="System.Threading.Tasks\Parallel.cs" />
-    <Compile Include="System.Threading.Tasks\ParallelLoopResult.cs" />
-    <Compile Include="System.Threading.Tasks\ParallelLoopState.cs" />
-    <Compile Include="System.Threading.Tasks\ParallelOptions.cs" />
-    <Compile Include="System.Threading.Tasks\PopResult.cs" />
-    <Compile Include="System.Threading.Tasks\SimpleConcurrentBag.cs" />
-    <Compile Include="System.Threading.Tasks\SynchronizationContextScheduler.cs" />
-    <Compile Include="System.Threading.Tasks\Task.cs" />
-    <Compile Include="System.Threading.Tasks\Task_T.cs" />
-    <Compile Include="System.Threading.Tasks\TaskActionInvoker.cs" />
-    <Compile Include="System.Threading.Tasks\TaskCanceledException.cs" />
-    <Compile Include="System.Threading.Tasks\TaskCompletionQueue.cs" />
-    <Compile Include="System.Threading.Tasks\TaskCompletionSource.cs" />
-    <Compile Include="System.Threading.Tasks\TaskConstants.cs" />
-    <Compile Include="System.Threading.Tasks\TaskConstants_T.cs" />
-    <Compile Include="System.Threading.Tasks\TaskContinuation.cs" />
-    <Compile Include="System.Threading.Tasks\TaskContinuationOptions.cs" />
-    <Compile Include="System.Threading.Tasks\TaskCreationOptions.cs" />
-    <Compile Include="System.Threading.Tasks\TaskDebuggerView.cs" />
-    <Compile Include="System.Threading.Tasks\TaskExceptionSlot.cs" />
-    <Compile Include="System.Threading.Tasks\TaskExtensionsImpl.cs" />
-    <Compile Include="System.Threading.Tasks\TaskFactory.cs" />
-    <Compile Include="System.Threading.Tasks\TaskFactory_T.cs" />
-    <Compile Include="System.Threading.Tasks\TaskScheduler.cs" />
-    <Compile Include="System.Threading.Tasks\TaskSchedulerException.cs" />
-    <Compile Include="System.Threading.Tasks\TaskStatus.cs" />
-    <Compile Include="System.Threading.Tasks\TpScheduler.cs" />
-    <Compile Include="System.Threading.Tasks\UnobservedTaskExceptionEventArgs.cs" />
-    <Compile Include="System.Threading\AbandonedMutexException.cs" />
-    <Compile Include="System.Threading\ApartmentState.cs" />
-    <Compile Include="System.Threading\AsyncFlowControl.cs" />
-    <Compile Include="System.Threading\AtomicBoolean.cs" />
-    <Compile Include="System.Threading\AutoResetEvent.cs" />
-    <Compile Include="System.Threading\CancellationToken.cs" />
-    <Compile Include="System.Threading\CancellationTokenRegistration.cs" />
-    <Compile Include="System.Threading\CancellationTokenSource.cs" />
-    <Compile Include="System.Threading\CompressedStack.cs" />
-    <Compile Include="System.Threading\ContextCallback.cs" />
-    <Compile Include="System.Threading\CountdownEvent.cs" />
-    <Compile Include="System.Threading\EventResetMode.cs" />
-    <Compile Include="System.Threading\EventWaitHandle.cs" />
-    <Compile Include="System.Threading\ExecutionContext.cs" />
-    <Compile Include="System.Threading\HostExecutionContext.cs" />
-    <Compile Include="System.Threading\HostExecutionContextManager.cs" />
-    <Compile Include="System.Threading\Interlocked.cs" />
-    <Compile Include="System.Threading\IOCompletionCallback.cs" />
-    <Compile Include="System.Threading\LazyInitializer.cs" />
-    <Compile Include="System.Threading\LazyThreadSafetyMode.cs" />
-    <Compile Include="System.Threading\LockCookie.cs" />
-    <Compile Include="System.Threading\LockQueue.cs" />
-    <Compile Include="System.Threading\LockRecursionException.cs" />
-    <Compile Include="System.Threading\ManualResetEvent.cs" />
-    <Compile Include="System.Threading\ManualResetEventSlim.cs" />
-    <Compile Include="System.Threading\Monitor.cs" />
-    <Compile Include="System.Threading\Mutex.cs" />
-    <Compile Include="System.Threading\NamedDataSlot.cs" />
-    <Compile Include="System.Threading\NativeEventCalls.cs" />
-    <Compile Include="System.Threading\NativeOverlapped.cs" />
-    <Compile Include="System.Threading\Overlapped.cs" />
-    <Compile Include="System.Threading\ParameterizedThreadStart.cs" />
-    <Compile Include="System.Threading\ReaderWriterLock.cs" />
-    <Compile Include="System.Threading\RegisteredWaitHandle.cs" />
-    <Compile Include="System.Threading\SemaphoreSlim.cs" />
-    <Compile Include="System.Threading\SendOrPostCallback.cs" />
-    <Compile Include="System.Threading\SpinLock.cs" />
-    <Compile Include="System.Threading\SpinWait.cs" />
-    <Compile Include="System.Threading\SynchronizationContext.cs" />
-    <Compile Include="System.Threading\SynchronizationLockException.cs" />
-    <Compile Include="System.Threading\Thread.cs" />
-    <Compile Include="System.Threading\ThreadAbortException.cs" />
-    <Compile Include="System.Threading\ThreadInterruptedException.cs" />
-    <Compile Include="System.Threading\ThreadLocal.cs" />
-    <Compile Include="System.Threading\ThreadPool.cs" />
-    <Compile Include="System.Threading\ThreadPriority.cs" />
-    <Compile Include="System.Threading\ThreadStart.cs" />
-    <Compile Include="System.Threading\ThreadStartException.cs" />
-    <Compile Include="System.Threading\ThreadState.cs" />
-    <Compile Include="System.Threading\ThreadStateException.cs" />
-    <Compile Include="System.Threading\Timeout.cs" />
-    <Compile Include="System.Threading\Timer.cs" />
-    <Compile Include="System.Threading\TimerCallback.cs" />
-    <Compile Include="System.Threading\Volatile.cs" />
-    <Compile Include="System.Threading\WaitCallback.cs" />
-    <Compile Include="System.Threading\WaitHandle.cs" />
-    <Compile Include="System.Threading\WaitHandleCannotBeOpenedException.cs" />
-    <Compile Include="System.Threading\WaitOrTimerCallback.cs" />
-    <Compile Include="System.Threading\Watch.cs" />
-    <Compile Include="System\__ComObject.cs" />
-    <Compile Include="System\_AppDomain.cs" />
-    <Compile Include="System\AccessViolationException.cs" />
-    <Compile Include="System\Action.cs" />
-    <Compile Include="System\ActivationContext.cs" />
-    <Compile Include="System\Activator.cs" />
-    <Compile Include="System\AggregateException.cs" />
-    <Compile Include="System\AndroidPlatform.cs" />
-    <Compile Include="System\AppDomain.cs" />
-    <Compile Include="System\AppDomainInitializer.cs" />
-    <Compile Include="System\AppDomainManager.cs" />
-    <Compile Include="System\AppDomainSetup.cs" />
-    <Compile Include="System\AppDomainUnloadedException.cs" />
-    <Compile Include="System\ApplicationException.cs" />
-    <Compile Include="System\ApplicationId.cs" />
-    <Compile Include="System\ApplicationIdentity.cs" />
-    <Compile Include="System\ArgIterator.cs" />
-    <Compile Include="System\ArgumentException.cs" />
-    <Compile Include="System\ArgumentNullException.cs" />
-    <Compile Include="System\ArgumentOutOfRangeException.cs" />
-    <Compile Include="System\ArithmeticException.cs" />
-    <Compile Include="System\Array.cs" />
-    <Compile Include="System\ArraySegment.cs" />
-    <Compile Include="System\ArrayTypeMismatchException.cs" />
-    <Compile Include="System\AssemblyLoadEventArgs.cs" />
-    <Compile Include="System\AssemblyLoadEventHandler.cs" />
-    <Compile Include="System\AsyncCallback.cs" />
-    <Compile Include="System\Attribute.cs" />
-    <Compile Include="System\AttributeTargets.cs" />
-    <Compile Include="System\AttributeUsageAttribute.cs" />
-    <Compile Include="System\BadImageFormatException.cs" />
-    <Compile Include="System\Base64FormattingOptions.cs" />
-    <Compile Include="System\BitConverter.cs" />
-    <Compile Include="System\Boolean.cs" />
-    <Compile Include="System\Buffer.cs" />
-    <Compile Include="System\Byte.cs" />
-    <Compile Include="System\CannotUnloadAppDomainException.cs" />
-    <Compile Include="System\Char.cs" />
-    <Compile Include="System\CharEnumerator.cs" />
-    <Compile Include="System\CLSCompliantAttribute.cs" />
-    <Compile Include="System\Comparison.cs" />
-    <Compile Include="System\Console.cs" />
-    <Compile Include="System\Console.iOS.cs" />
-    <Compile Include="System\ConsoleCancelEventArgs.cs" />
-    <Compile Include="System\ConsoleCancelEventHandler.cs" />
-    <Compile Include="System\ConsoleColor.cs" />
-    <Compile Include="System\ConsoleDriver.cs" />
-    <Compile Include="System\ConsoleKey.cs" />
-    <Compile Include="System\ConsoleKeyInfo.cs" />
-    <Compile Include="System\ConsoleModifiers.cs" />
-    <Compile Include="System\ConsoleSpecialKey.cs" />
-    <Compile Include="System\ContextBoundObject.cs" />
-    <Compile Include="System\ContextMarshalException.cs" />
-    <Compile Include="System\ContextStaticAttribute.cs" />
-    <Compile Include="System\ControlCharacters.cs" />
-    <Compile Include="System\Convert.cs" />
-    <Compile Include="System\Converter.cs" />
-    <Compile Include="System\CrossAppDomainDelegate.cs" />
-    <Compile Include="System\CStreamReader.cs" />
-    <Compile Include="System\CStreamWriter.cs" />
-    <Compile Include="System\DataMisalignedException.cs" />
-    <Compile Include="System\DateTime.cs" />
-    <Compile Include="System\DateTimeKind.cs" />
-    <Compile Include="System\DateTimeOffset.cs" />
-    <Compile Include="System\DateTimeUtils.cs" />
-    <Compile Include="System\DayOfWeek.cs" />
-    <Compile Include="System\DBNull.cs" />
-    <Compile Include="System\Decimal.cs" />
-    <Compile Include="System\Delegate.cs" />
-    <Compile Include="System\DelegateSerializationHolder.cs" />
-    <Compile Include="System\DivideByZeroException.cs" />
-    <Compile Include="System\DllNotFoundException.cs" />
-    <Compile Include="System\DomainManagerInitializationFlags.cs" />
-    <Compile Include="System\Double.cs" />
-    <Compile Include="System\DuplicateWaitObjectException.cs" />
-    <Compile Include="System\EmptyArray.cs" />
-    <Compile Include="System\EntryPointNotFoundException.cs" />
-    <Compile Include="System\Enum.cs" />
-    <Compile Include="System\Environment.cs" />
-    <Compile Include="System\EnvironmentVariableTarget.cs" />
-    <Compile Include="System\EventArgs.cs" />
-    <Compile Include="System\EventHandler.cs" />
-    <Compile Include="System\Exception.cs" />
-    <Compile Include="System\ExecutionEngineException.cs" />
-    <Compile Include="System\FieldAccessException.cs" />
-    <Compile Include="System\FlagsAttribute.cs" />
-    <Compile Include="System\FormatException.cs" />
-    <Compile Include="System\Funcs.cs" />
-    <Compile Include="System\GC.cs" />
-    <Compile Include="System\GCCollectionMode.cs" />
-    <Compile Include="System\GCNotificationStatus.cs" />
-    <Compile Include="System\Guid.cs" />
-    <Compile Include="System\IAppDomainSetup.cs" />
-    <Compile Include="System\IAsyncResult.cs" />
-    <Compile Include="System\ICloneable.cs" />
-    <Compile Include="System\IComparable.cs" />
-    <Compile Include="System\IConsoleDriver.cs" />
-    <Compile Include="System\IConvertible.cs" />
-    <Compile Include="System\ICustomFormatter.cs" />
-    <Compile Include="System\IDisposable.cs" />
-    <Compile Include="System\IEquatable.cs" />
-    <Compile Include="System\IFormatProvider.cs" />
-    <Compile Include="System\IFormattable.cs" />
-    <Compile Include="System\IndexOutOfRangeException.cs" />
-    <Compile Include="System\InsufficientExecutionStackException.cs" />
-    <Compile Include="System\InsufficientMemoryException.cs" />
-    <Compile Include="System\Int16.cs" />
-    <Compile Include="System\Int32.cs" />
-    <Compile Include="System\Int64.cs" />
-    <Compile Include="System\IntPtr.cs" />
-    <Compile Include="System\InvalidCastException.cs" />
-    <Compile Include="System\InvalidOperationException.cs" />
-    <Compile Include="System\InvalidProgramException.cs" />
-    <Compile Include="System\InvalidTimeZoneException.cs" />
-    <Compile Include="System\IObservable.cs" />
-    <Compile Include="System\IObserver.cs" />
-    <Compile Include="System\IProgress.cs" />
-    <Compile Include="System\IServiceProvider.cs" />
-    <Compile Include="System\KnownTerminals.cs" />
-    <Compile Include="System\Lazy.cs" />
-    <Compile Include="System\LoaderOptimization.cs" />
-    <Compile Include="System\LoaderOptimizationAttribute.cs" />
-    <Compile Include="System\LocalDataStoreSlot.cs" />
-    <Compile Include="System\MarshalByRefObject.cs" />
-    <Compile Include="System\Math.cs" />
-    <Compile Include="System\MemberAccessException.cs" />
-    <Compile Include="System\MethodAccessException.cs" />
-    <Compile Include="System\MidpointRounding.cs" />
-    <Compile Include="System\MissingFieldException.cs" />
-    <Compile Include="System\MissingMemberException.cs" />
-    <Compile Include="System\MissingMethodException.cs" />
-    <Compile Include="System\ModuleHandle.cs" />
-    <Compile Include="System\MonoAsyncCall.cs" />
-    <Compile Include="System\MonoCQItem.cs" />
-    <Compile Include="System\MonoCustomAttrs.cs" />
-    <Compile Include="System\MonoListItem.cs" />
-    <Compile Include="System\MonoTouchAOTHelper.cs" />
-    <Compile Include="System\MonoType.cs" />
-    <Compile Include="System\MTAThreadAttribute.cs" />
-    <Compile Include="System\MulticastDelegate.cs" />
-    <Compile Include="System\MulticastNotSupportedException.cs" />
-    <Compile Include="System\NonSerializedAttribute.cs" />
-    <Compile Include="System\NotFiniteNumberException.cs" />
-    <Compile Include="System\NotImplementedException.cs" />
-    <Compile Include="System\NotSupportedException.cs" />
-    <Compile Include="System\Nullable.cs" />
-    <Compile Include="System\NullConsoleDriver.cs" />
-    <Compile Include="System\NullReferenceException.cs" />
-    <Compile Include="System\NumberFormatter.cs" />
-    <Compile Include="System\Object.cs" />
-    <Compile Include="System\ObjectDisposedException.cs" />
-    <Compile Include="System\ObsoleteAttribute.cs" />
-    <Compile Include="System\OperatingSystem.cs" />
-    <Compile Include="System\OperationCanceledException.cs" />
-    <Compile Include="System\OutOfMemoryException.cs" />
-    <Compile Include="System\OverflowException.cs" />
-    <Compile Include="System\ParamArrayAttribute.cs" />
-    <Compile Include="System\PlatformID.cs" />
-    <Compile Include="System\PlatformNotSupportedException.cs" />
-    <Compile Include="System\Predicate.cs" />
-    <Compile Include="System\Progress.cs" />
-    <Compile Include="System\Random.cs" />
-    <Compile Include="System\RankException.cs" />
-    <Compile Include="System\ResolveEventArgs.cs" />
-    <Compile Include="System\ResolveEventHandler.cs" />
-    <Compile Include="System\RuntimeArgumentHandle.cs" />
-    <Compile Include="System\RuntimeFieldHandle.cs" />
-    <Compile Include="System\RuntimeMethodHandle.cs" />
-    <Compile Include="System\RuntimeTypeHandle.cs" />
-    <Compile Include="System\SByte.cs" />
-    <Compile Include="System\SerializableAttribute.cs" />
-    <Compile Include="System\Single.cs" />
-    <Compile Include="System\StackOverflowException.cs" />
-    <Compile Include="System\STAThreadAttribute.cs" />
-    <Compile Include="System\String.cs" />
-    <Compile Include="System\StringComparer.cs" />
-    <Compile Include="System\StringComparison.cs" />
-    <Compile Include="System\StringSplitOptions.cs" />
-    <Compile Include="System\SystemException.cs" />
-    <Compile Include="System\TermInfoBooleans.cs" />
-    <Compile Include="System\TermInfoDriver.cs" />
-    <Compile Include="System\TermInfoNumbers.cs" />
-    <Compile Include="System\TermInfoReader.cs" />
-    <Compile Include="System\TermInfoStrings.cs" />
-    <Compile Include="System\ThreadStaticAttribute.cs" />
-    <Compile Include="System\TimeoutException.cs" />
-    <Compile Include="System\TimeSpan.cs" />
-    <Compile Include="System\TimeZone.cs" />
-    <Compile Include="System\TimeZoneNotFoundException.cs" />
-    <Compile Include="System\Tuple.cs" />
-    <Compile Include="System\Tuples.cs" />
-    <Compile Include="System\Type.cs" />
-    <Compile Include="System\TypeAccessException.cs" />
-    <Compile Include="System\TypeCode.cs" />
-    <Compile Include="System\TypedReference.cs" />
-    <Compile Include="System\TypeInitializationException.cs" />
-    <Compile Include="System\TypeLoadException.cs" />
-    <Compile Include="System\TypeIdentifier.cs" />
-    <Compile Include="System\TypeSpec.cs" />
-    <Compile Include="System\TypeUnloadedException.cs" />
-    <Compile Include="System\UInt16.cs" />
-    <Compile Include="System\UInt32.cs" />
-    <Compile Include="System\UInt64.cs" />
-    <Compile Include="System\UIntPtr.cs" />
-    <Compile Include="System\UnauthorizedAccessException.cs" />
-    <Compile Include="System\UnhandledExceptionEventArgs.cs" />
-    <Compile Include="System\UnhandledExceptionEventHandler.cs" />
-    <Compile Include="System\UnitySerializationHolder.cs" />
-    <Compile Include="System\ValueType.cs" />
-    <Compile Include="System\Variant.cs" />
-    <Compile Include="System\Version.cs" />
-    <Compile Include="System\Void.cs" />
-    <Compile Include="System\WeakReference.cs" />
-    <Compile Include="System\WeakReference_T.cs" />
-    <Compile Include="System\WindowsConsoleDriver.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>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="resources/collation.core.bin">
-      <LogicalName>collation.core.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.tailoring.bin">
-      <LogicalName>collation.tailoring.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkCHS.bin">
-      <LogicalName>collation.cjkCHS.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkCHT.bin">
-      <LogicalName>collation.cjkCHT.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkJA.bin">
-      <LogicalName>collation.cjkJA.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkKO.bin">
-      <LogicalName>collation.cjkKO.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkKOlv2.bin">
-      <LogicalName>collation.cjkKOlv2.bin</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/corlib/corlib-build.csproj b/mcs/class/corlib/corlib-build.csproj
deleted file mode 100644
index a83ee4830e9..00000000000
--- a/mcs/class/corlib/corlib-build.csproj
+++ /dev/null
@@ -1,1759 +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>{2BDF80D1-6F06-4908-B351-835292B7A9B9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>612,618,1699</NoWarn>
-    <OutputPath>./../../class/lib/build</OutputPath>
-    <NoStdLib>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>mscorlib</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <NoWarn>612,618,1699</NoWarn>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <NoWarn>612,618,1699</NoWarn>
-    <Optimize>true</Optimize>
-    <DefineConstants>INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
-  is a problem to compile the Mono mscorlib.dll -->
-  <PropertyGroup>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\ConfidenceFactor.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\PrimalityTests.cs" />
-    <Compile Include="..\Mono.Security\Mono.Math\BigInteger.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeBase.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoTools.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\KeyPairPersistence.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS1.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS8.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RC4.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RSAManaged.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\SymmetricTransform.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\PKCS12.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X501Name.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Certificate.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CertificateCollection.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Chain.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509ChainStatusFlags.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CRL.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extension.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extensions.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Store.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509StoreManager.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Stores.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X520Attributes.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1Convert.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\BitConverterLE.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\PKCS7.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security\StrongName.cs" />
-    <Compile Include="..\System.Core\System.Security.Cryptography\Aes.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.AdjustmentRule.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.Android.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.MonoTouch.cs" />
-    <Compile Include="..\System.Core\System\TimeZoneInfo.TransitionTime.cs" />
-    <Compile Include="..\System\System.Threading\SemaphoreFullException.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\CriticalHandleMinusOneIsInvalid.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\CriticalHandleZeroOrMinusOneIsInvalid.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeFileHandle.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeHandleMinusOneIsInvalid.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeRegistryHandle.cs" />
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeWaitHandle.cs" />
-    <Compile Include="Microsoft.Win32\IRegistryApi.cs" />
-    <Compile Include="Microsoft.Win32\Registry.cs" />
-    <Compile Include="Microsoft.Win32\RegistryHive.cs" />
-    <Compile Include="Microsoft.Win32\RegistryKey.cs" />
-    <Compile Include="Microsoft.Win32\RegistryKeyPermissionCheck.cs" />
-    <Compile Include="Microsoft.Win32\RegistryOptions.cs" />
-    <Compile Include="Microsoft.Win32\RegistryValueKind.cs" />
-    <Compile Include="Microsoft.Win32\RegistryValueOptions.cs" />
-    <Compile Include="Microsoft.Win32\RegistryView.cs" />
-    <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
-    <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
-    <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-    <Compile Include="Mono.Globalization.Unicode\CodePointIndexer.cs" />
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTable.cs" />
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTableUtil.cs" />
-    <Compile Include="Mono.Globalization.Unicode\Normalization.cs" />
-    <Compile Include="Mono.Globalization.Unicode\NormalizationTableUtil.cs" />
-    <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
-    <Compile Include="Mono.Globalization.Unicode\SortKey.cs" />
-    <Compile Include="Mono.Globalization.Unicode\SortKeyBuffer.cs" />
-    <Compile Include="Mono.Interop\ComInteropProxy.cs" />
-    <Compile Include="Mono.Interop\IDispatch.cs" />
-    <Compile Include="Mono.Interop\IUnknown.cs" />
-    <Compile Include="Mono.Security.Cryptography\DSAManaged.cs" />
-    <Compile Include="Mono.Security.Cryptography\HMACAlgorithm.cs" />
-    <Compile Include="Mono.Security.Cryptography\MACAlgorithm.cs" />
-    <Compile Include="Mono.Security\StrongNameManager.cs" />
-    <Compile Include="Mono.Security\Uri.cs" />
-    <Compile Include="Mono.Xml\SecurityParser.cs" />
-    <Compile Include="Mono.Xml\SmallXmlParser.cs" />
-    <Compile Include="Mono\DataConverter.cs" />
-    <Compile Include="Mono\Runtime.cs" />
-    <Compile Include="System.Collections.Concurrent.Partitioners\EnumerablePartitioner.cs" />
-    <Compile Include="System.Collections.Concurrent.Partitioners\ListPartitioner.cs" />
-    <Compile Include="System.Collections.Concurrent.Partitioners\UserRangePartitioner.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentDictionary.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentOrderedList.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentQueue.cs" />
-    <Compile Include="System.Collections.Concurrent\ConcurrentStack.cs" />
-    <Compile Include="System.Collections.Concurrent\EnumerablePartitionerOptions.cs" />
-    <Compile Include="System.Collections.Concurrent\IProducerConsumerCollection.cs" />
-    <Compile Include="System.Collections.Concurrent\OrderablePartitioner.cs" />
-    <Compile Include="System.Collections.Concurrent\Partitioner.cs" />
-    <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />
-    <Compile Include="System.Collections.Generic\CollectionDebuggerView.cs" />
-    <Compile Include="System.Collections.Generic\Comparer.cs" />
-    <Compile Include="System.Collections.Generic\Dictionary.cs" />
-    <Compile Include="System.Collections.Generic\EqualityComparer.cs" />
-    <Compile Include="System.Collections.Generic\ICollection.cs" />
-    <Compile Include="System.Collections.Generic\IComparer.cs" />
-    <Compile Include="System.Collections.Generic\IDictionary.cs" />
-    <Compile Include="System.Collections.Generic\IEnumerable.cs" />
-    <Compile Include="System.Collections.Generic\IEnumerator.cs" />
-    <Compile Include="System.Collections.Generic\IEqualityComparer.cs" />
-    <Compile Include="System.Collections.Generic\IList.cs" />
-    <Compile Include="System.Collections.Generic\IReadOnlyCollection.cs" />
-    <Compile Include="System.Collections.Generic\IReadOnlyDictionary.cs" />
-    <Compile Include="System.Collections.Generic\IReadOnlyList.cs" />
-    <Compile Include="System.Collections.Generic\KeyNotFoundException.cs" />
-    <Compile Include="System.Collections.Generic\KeyValuePair.cs" />
-    <Compile Include="System.Collections.Generic\List.cs" />
-    <Compile Include="System.Collections.ObjectModel\Collection.cs" />
-    <Compile Include="System.Collections.ObjectModel\KeyedCollection.cs" />
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyCollection.cs" />
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyDictionary.cs" />
-    <Compile Include="System.Collections\ArrayList.cs" />
-    <Compile Include="System.Collections\BitArray.cs" />
-    <Compile Include="System.Collections\CaseInsensitiveComparer.cs" />
-    <Compile Include="System.Collections\CaseInsensitiveHashCodeProvider.cs" />
-    <Compile Include="System.Collections\CollectionBase.cs" />
-    <Compile Include="System.Collections\CollectionDebuggerView.cs" />
-    <Compile Include="System.Collections\Comparer.cs" />
-    <Compile Include="System.Collections\DictionaryBase.cs" />
-    <Compile Include="System.Collections\DictionaryEntry.cs" />
-    <Compile Include="System.Collections\HashPrimeNumbers.cs" />
-    <Compile Include="System.Collections\Hashtable.cs" />
-    <Compile Include="System.Collections\ICollection.cs" />
-    <Compile Include="System.Collections\IComparer.cs" />
-    <Compile Include="System.Collections\IDictionary.cs" />
-    <Compile Include="System.Collections\IDictionaryEnumerator.cs" />
-    <Compile Include="System.Collections\IEnumerable.cs" />
-    <Compile Include="System.Collections\IEnumerator.cs" />
-    <Compile Include="System.Collections\IEqualityComparer.cs" />
-    <Compile Include="System.Collections\IHashCodeProvider.cs" />
-    <Compile Include="System.Collections\IList.cs" />
-    <Compile Include="System.Collections\IStructuralComparable.cs" />
-    <Compile Include="System.Collections\IStructuralEquatable.cs" />
-    <Compile Include="System.Collections\Queue.cs" />
-    <Compile Include="System.Collections\ReadOnlyCollectionBase.cs" />
-    <Compile Include="System.Collections\SortedList.cs" />
-    <Compile Include="System.Collections\Stack.cs" />
-    <Compile Include="System.Collections\StructuralComparisons.cs" />
-    <Compile Include="System.Configuration.Assemblies\AssemblyHash.cs" />
-    <Compile Include="System.Configuration.Assemblies\AssemblyHashAlgorithm.cs" />
-    <Compile Include="System.Configuration.Assemblies\AssemblyVersionCompatibility.cs" />
-    <Compile Include="System.Configuration.Assemblies\ProcessorID.cs" />
-    <Compile Include="System.Deployment.Internal\InternalActivationContextHelper.cs" />
-    <Compile Include="System.Deployment.Internal\InternalApplicationIdentityHelper.cs" />
-    <Compile Include="System.Diagnostics.CodeAnalysis\SuppressMessageAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts.Internal\ContractHelper.cs" />
-    <Compile Include="System.Diagnostics.Contracts\Contract.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractAbbreviatorAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractArgumentValidatorAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractClassAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractClassForAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractException.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractFailedEventArgs.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractFailureKind.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractInvariantMethodAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractOptionAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractPublicPropertyNameAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractReferenceAssemblyAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractRuntimeIgnoredAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractShouldAssertException.cs" />
-    <Compile Include="System.Diagnostics.Contracts\ContractVerificationAttribute.cs" />
-    <Compile Include="System.Diagnostics.Contracts\PureAttribute.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder1.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocument.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocumentWriter.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolMethod.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolNamespace.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolReader.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolScope.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolVariable.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolWriter.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymAddressKind.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymbolToken.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymDocumentType.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageType.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageVendor.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventAttribute.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventCommand.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventCommandEventArgs.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventKeywords.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventLevel.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventSource.cs" />
-    <Compile Include="System.Diagnostics.Tracing\EventSourceAttribute.cs" />
-    <Compile Include="System.Diagnostics.Tracing\NonEventAttribute.cs" />
-    <Compile Include="System.Diagnostics\ConditionalAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggableAttribute.cs" />
-    <Compile Include="System.Diagnostics\Debugger.cs" />
-    <Compile Include="System.Diagnostics\DebuggerBrowsableAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerBrowsableState.cs" />
-    <Compile Include="System.Diagnostics\DebuggerDisplayAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerHiddenAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerNonUserCodeAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerStepperBoundaryAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerStepThroughAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerTypeProxyAttribute.cs" />
-    <Compile Include="System.Diagnostics\DebuggerVisualizerAttribute.cs" />
-    <Compile Include="System.Diagnostics\StackFrame.cs" />
-    <Compile Include="System.Diagnostics\StackTrace.cs" />
-    <Compile Include="System.Globalization\Calendar.cs" />
-    <Compile Include="System.Globalization\CalendarAlgorithmType.cs" />
-    <Compile Include="System.Globalization\CalendarWeekRule.cs" />
-    <Compile Include="System.Globalization\CalendricalCalculations.cs" />
-    <Compile Include="System.Globalization\CharUnicodeInfo.cs" />
-    <Compile Include="System.Globalization\ChineseLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\CodePageDataItem.cs" />
-    <Compile Include="System.Globalization\CompareInfo.cs" />
-    <Compile Include="System.Globalization\CompareOptions.cs" />
-    <Compile Include="System.Globalization\CultureInfo.cs" />
-    <Compile Include="System.Globalization\CultureNotFoundException.cs" />
-    <Compile Include="System.Globalization\CultureTypes.cs" />
-    <Compile Include="System.Globalization\DateTimeFormatInfo.cs" />
-    <Compile Include="System.Globalization\DateTimeStyles.cs" />
-    <Compile Include="System.Globalization\DaylightTime.cs" />
-    <Compile Include="System.Globalization\DigitShapes.cs" />
-    <Compile Include="System.Globalization\EastAsianLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\GregorianCalendar.cs" />
-    <Compile Include="System.Globalization\GregorianCalendarTypes.cs" />
-    <Compile Include="System.Globalization\HebrewCalendar.cs" />
-    <Compile Include="System.Globalization\HijriCalendar.cs" />
-    <Compile Include="System.Globalization\IdnMapping.cs" />
-    <Compile Include="System.Globalization\JapaneseCalendar.cs" />
-    <Compile Include="System.Globalization\JapaneseLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\JulianCalendar.cs" />
-    <Compile Include="System.Globalization\KoreanCalendar.cs" />
-    <Compile Include="System.Globalization\KoreanLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\NumberFormatInfo.cs" />
-    <Compile Include="System.Globalization\NumberStyles.cs" />
-    <Compile Include="System.Globalization\PersianCalendar.cs" />
-    <Compile Include="System.Globalization\RegionInfo.cs" />
-    <Compile Include="System.Globalization\RegionInfo.MonoTouch.cs" />
-    <Compile Include="System.Globalization\SortVersion.cs" />
-    <Compile Include="System.Globalization\StringInfo.cs" />
-    <Compile Include="System.Globalization\TaiwanCalendar.cs" />
-    <Compile Include="System.Globalization\TaiwanLunisolarCalendar.cs" />
-    <Compile Include="System.Globalization\TextElementEnumerator.cs" />
-    <Compile Include="System.Globalization\TextInfo.cs" />
-    <Compile Include="System.Globalization\ThaiBuddhistCalendar.cs" />
-    <Compile Include="System.Globalization\TimeSpanStyles.cs" />
-    <Compile Include="System.Globalization\UmAlQuraCalendar.cs" />
-    <Compile Include="System.Globalization\UnicodeCategory.cs" />
-    <Compile Include="System.IO.IsolatedStorage\INormalizeForIsolatedStorage.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorage.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageException.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFile.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileEnumerator.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileStream.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageScope.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityOptions.cs" />
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityState.cs" />
-    <Compile Include="System.IO\BinaryReader.cs" />
-    <Compile Include="System.IO\BinaryWriter.cs" />
-    <Compile Include="System.IO\BufferedStream.cs" />
-    <Compile Include="System.IO\Directory.cs" />
-    <Compile Include="System.IO\DirectoryInfo.cs" />
-    <Compile Include="System.IO\DirectoryNotFoundException.cs" />
-    <Compile Include="System.IO\DriveInfo.cs" />
-    <Compile Include="System.IO\DriveNotFoundException.cs" />
-    <Compile Include="System.IO\DriveType.cs" />
-    <Compile Include="System.IO\EndOfStreamException.cs" />
-    <Compile Include="System.IO\File.cs" />
-    <Compile Include="System.IO\FileAccess.cs" />
-    <Compile Include="System.IO\FileAttributes.cs" />
-    <Compile Include="System.IO\FileInfo.cs" />
-    <Compile Include="System.IO\FileLoadException.cs" />
-    <Compile Include="System.IO\FileMode.cs" />
-    <Compile Include="System.IO\FileNotFoundException.cs" />
-    <Compile Include="System.IO\FileOptions.cs" />
-    <Compile Include="System.IO\FileShare.cs" />
-    <Compile Include="System.IO\FileStream.cs" />
-    <Compile Include="System.IO\FileStreamAsyncResult.cs" />
-    <Compile Include="System.IO\FileSystemInfo.cs" />
-    <Compile Include="System.IO\IOException.cs" />
-    <Compile Include="System.IO\LogcatTextWriter.cs" />
-    <Compile Include="System.IO\MemoryStream.cs" />
-    <Compile Include="System.IO\MonoFileType.cs" />
-    <Compile Include="System.IO\MonoIO.cs" />
-    <Compile Include="System.IO\MonoIOError.cs" />
-    <Compile Include="System.IO\MonoIOStat.cs" />
-    <Compile Include="System.IO\Path.cs" />
-    <Compile Include="System.IO\PathTooLongException.cs" />
-    <Compile Include="System.IO\SearchOption.cs" />
-    <Compile Include="System.IO\SearchPattern.cs" />
-    <Compile Include="System.IO\SeekOrigin.cs" />
-    <Compile Include="System.IO\Stream.cs" />
-    <Compile Include="System.IO\StreamReader.cs" />
-    <Compile Include="System.IO\StreamWriter.cs" />
-    <Compile Include="System.IO\StringReader.cs" />
-    <Compile Include="System.IO\StringWriter.cs" />
-    <Compile Include="System.IO\TextReader.cs" />
-    <Compile Include="System.IO\TextWriter.cs" />
-    <Compile Include="System.IO\UnexceptionalStreamReader.cs" />
-    <Compile Include="System.IO\UnexceptionalStreamWriter.cs" />
-    <Compile Include="System.IO\UnmanagedMemoryAccessor.cs" />
-    <Compile Include="System.IO\UnmanagedMemoryStream.cs" />
-    <Compile Include="System.Reflection.Emit\AssemblyBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\AssemblyBuilderAccess.cs" />
-    <Compile Include="System.Reflection.Emit\ConstructorBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\ConstructorOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\CustomAttributeBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\DerivedTypes.cs" />
-    <Compile Include="System.Reflection.Emit\DynamicILInfo.cs" />
-    <Compile Include="System.Reflection.Emit\DynamicMethod.cs" />
-    <Compile Include="System.Reflection.Emit\EnumBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\EventBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\EventOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\EventToken.cs" />
-    <Compile Include="System.Reflection.Emit\FieldBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\FieldOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\FieldToken.cs" />
-    <Compile Include="System.Reflection.Emit\FlowControl.cs" />
-    <Compile Include="System.Reflection.Emit\GenericTypeParameterBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\ILGenerator.cs" />
-    <Compile Include="System.Reflection.Emit\Label.cs" />
-    <Compile Include="System.Reflection.Emit\LocalBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\MethodBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\MethodOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\MethodRental.cs" />
-    <Compile Include="System.Reflection.Emit\MethodToken.cs" />
-    <Compile Include="System.Reflection.Emit\ModuleBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\MonoArrayMethod.cs" />
-    <Compile Include="System.Reflection.Emit\OpCode.cs" />
-    <Compile Include="System.Reflection.Emit\OpCodeNames.cs" />
-    <Compile Include="System.Reflection.Emit\OpCodes.cs" />
-    <Compile Include="System.Reflection.Emit\OpCodeType.cs" />
-    <Compile Include="System.Reflection.Emit\OperandType.cs" />
-    <Compile Include="System.Reflection.Emit\PackingSize.cs" />
-    <Compile Include="System.Reflection.Emit\ParameterBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\ParameterToken.cs" />
-    <Compile Include="System.Reflection.Emit\PEFileKinds.cs" />
-    <Compile Include="System.Reflection.Emit\PropertyBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\PropertyOnTypeBuilderInst.cs" />
-    <Compile Include="System.Reflection.Emit\PropertyToken.cs" />
-    <Compile Include="System.Reflection.Emit\SignatureHelper.cs" />
-    <Compile Include="System.Reflection.Emit\SignatureToken.cs" />
-    <Compile Include="System.Reflection.Emit\StackBehaviour.cs" />
-    <Compile Include="System.Reflection.Emit\StringToken.cs" />
-    <Compile Include="System.Reflection.Emit\TypeBuilder.cs" />
-    <Compile Include="System.Reflection.Emit\TypeToken.cs" />
-    <Compile Include="System.Reflection.Emit\UnmanagedMarshal.cs" />
-    <Compile Include="System.Reflection\AmbiguousMatchException.cs" />
-    <Compile Include="System.Reflection\Assembly.cs" />
-    <Compile Include="System.Reflection\AssemblyAlgorithmIdAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyCompanyAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyConfigurationAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyContentType.cs" />
-    <Compile Include="System.Reflection\AssemblyCopyrightAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyCultureAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyDefaultAliasAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyDelaySignAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyDescriptionAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyFileVersionAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyFlagsAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyInformationalVersionAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyKeyFileAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyKeyNameAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyMetadataAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyName.cs" />
-    <Compile Include="System.Reflection\AssemblyNameFlags.cs" />
-    <Compile Include="System.Reflection\AssemblyNameProxy.cs" />
-    <Compile Include="System.Reflection\AssemblyProductAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblySignatureKeyAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyTitleAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyTradeMarkAttribute.cs" />
-    <Compile Include="System.Reflection\AssemblyVersionAttribute.cs" />
-    <Compile Include="System.Reflection\Binder.cs" />
-    <Compile Include="System.Reflection\BindingFlags.cs" />
-    <Compile Include="System.Reflection\CallingConventions.cs" />
-    <Compile Include="System.Reflection\ConstructorInfo.cs" />
-    <Compile Include="System.Reflection\CustomAttributeData.cs" />
-    <Compile Include="System.Reflection\CustomAttributeExtensions.cs" />
-    <Compile Include="System.Reflection\CustomAttributeFormatException.cs" />
-    <Compile Include="System.Reflection\CustomAttributeNamedArgument.cs" />
-    <Compile Include="System.Reflection\CustomAttributeTypedArgument.cs" />
-    <Compile Include="System.Reflection\DefaultMemberAttribute.cs" />
-    <Compile Include="System.Reflection\EventAttributes.cs" />
-    <Compile Include="System.Reflection\EventInfo.cs" />
-    <Compile Include="System.Reflection\ExceptionHandlingClause.cs" />
-    <Compile Include="System.Reflection\ExceptionHandlingClauseOptions.cs" />
-    <Compile Include="System.Reflection\FieldAttributes.cs" />
-    <Compile Include="System.Reflection\FieldInfo.cs" />
-    <Compile Include="System.Reflection\GenericParameterAttributes.cs" />
-    <Compile Include="System.Reflection\ICustomAttributeProvider.cs" />
-    <Compile Include="System.Reflection\ImageFileMachine.cs" />
-    <Compile Include="System.Reflection\InterfaceMapping.cs" />
-    <Compile Include="System.Reflection\IntrospectionExtensions.cs" />
-    <Compile Include="System.Reflection\InvalidFilterCriteriaException.cs" />
-    <Compile Include="System.Reflection\IReflect.cs" />
-    <Compile Include="System.Reflection\IReflectableType.cs" />
-    <Compile Include="System.Reflection\LocalVariableInfo.cs" />
-    <Compile Include="System.Reflection\ManifestResourceInfo.cs" />
-    <Compile Include="System.Reflection\MemberFilter.cs" />
-    <Compile Include="System.Reflection\MemberInfo.cs" />
-    <Compile Include="System.Reflection\MemberInfoSerializationHolder.cs" />
-    <Compile Include="System.Reflection\MemberTypes.cs" />
-    <Compile Include="System.Reflection\MethodAttributes.cs" />
-    <Compile Include="System.Reflection\MethodBase.cs" />
-    <Compile Include="System.Reflection\MethodBody.cs" />
-    <Compile Include="System.Reflection\MethodImplAttributes.cs" />
-    <Compile Include="System.Reflection\MethodInfo.cs" />
-    <Compile Include="System.Reflection\Missing.cs" />
-    <Compile Include="System.Reflection\Module.cs" />
-    <Compile Include="System.Reflection\ModuleResolveEventHandler.cs" />
-    <Compile Include="System.Reflection\MonoAssembly.cs" />
-    <Compile Include="System.Reflection\MonoEvent.cs" />
-    <Compile Include="System.Reflection\MonoField.cs" />
-    <Compile Include="System.Reflection\MonoGenericClass.cs" />
-    <Compile Include="System.Reflection\MonoGenericMethod.cs" />
-    <Compile Include="System.Reflection\MonoMethod.cs" />
-    <Compile Include="System.Reflection\MonoModule.cs" />
-    <Compile Include="System.Reflection\MonoParameterInfo.cs" />
-    <Compile Include="System.Reflection\MonoProperty.cs" />
-    <Compile Include="System.Reflection\ObfuscateAssemblyAttribute.cs" />
-    <Compile Include="System.Reflection\ObfuscationAttribute.cs" />
-    <Compile Include="System.Reflection\ParameterAttributes.cs" />
-    <Compile Include="System.Reflection\ParameterInfo.cs" />
-    <Compile Include="System.Reflection\ParameterModifier.cs" />
-    <Compile Include="System.Reflection\Pointer.cs" />
-    <Compile Include="System.Reflection\PortableExecutableKinds.cs" />
-    <Compile Include="System.Reflection\ProcessorArchitecture.cs" />
-    <Compile Include="System.Reflection\PropertyAttributes.cs" />
-    <Compile Include="System.Reflection\PropertyInfo.cs" />
-    <Compile Include="System.Reflection\ReflectionContext.cs" />
-    <Compile Include="System.Reflection\ReflectionTypeLoadException.cs" />
-    <Compile Include="System.Reflection\ResourceAttributes.cs" />
-    <Compile Include="System.Reflection\ResourceLocation.cs" />
-    <Compile Include="System.Reflection\RuntimeReflectionExtensions.cs" />
-    <Compile Include="System.Reflection\StrongNameKeyPair.cs" />
-    <Compile Include="System.Reflection\TargetException.cs" />
-    <Compile Include="System.Reflection\TargetInvocationException.cs" />
-    <Compile Include="System.Reflection\TargetParameterCountException.cs" />
-    <Compile Include="System.Reflection\TypeAttributes.cs" />
-    <Compile Include="System.Reflection\TypeDelegator.cs" />
-    <Compile Include="System.Reflection\TypeFilter.cs" />
-    <Compile Include="System.Reflection\TypeInfo.cs" />
-    <Compile Include="System.Resources\IResourceReader.cs" />
-    <Compile Include="System.Resources\IResourceWriter.cs" />
-    <Compile Include="System.Resources\MissingManifestResourceException.cs" />
-    <Compile Include="System.Resources\MissingSatelliteAssemblyException.cs" />
-    <Compile Include="System.Resources\NeutralResourcesLanguageAttribute.cs" />
-    <Compile Include="System.Resources\ResourceManager.cs" />
-    <Compile Include="System.Resources\ResourceReader.cs" />
-    <Compile Include="System.Resources\ResourceSet.cs" />
-    <Compile Include="System.Resources\ResourceWriter.cs" />
-    <Compile Include="System.Resources\RuntimeResourceSet.cs" />
-    <Compile Include="System.Resources\SatelliteContractVersionAttribute.cs" />
-    <Compile Include="System.Resources\UltimateResourceFallbackLocation.cs" />
-    <Compile Include="System.Resources\Win32Resources.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AccessedThroughPropertyAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AsyncStateMachineAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AsyncTaskMethodBuilder.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AsyncTaskMethodBuilder_T.cs" />
-    <Compile Include="System.Runtime.CompilerServices\AsyncVoidMethodBuilder.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallConvCdecl.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallConvFastcall.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallConvStdcall.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallConvThiscall.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallerFilePathAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallerLineNumberAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CallerMemberNameAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilationRelaxations.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilationRelaxationsAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilerGeneratedAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilerGlobalScopeAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CompilerMarshalOverride.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ConditionalWeakTable.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ConfiguredTaskAwaitable.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ConfiguredTaskAwaitable_T.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ContractHelper.cs" />
-    <Compile Include="System.Runtime.CompilerServices\CustomConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DateTimeConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DecimalConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DefaultDependencyAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DependencyAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\DiscardableAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ExtensionAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\FixedAddressValueTypeAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\FixedBufferAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\HasCopySemanticsAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IAsyncStateMachine.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ICriticalNotifyCompletion.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IDispatchConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IndexerNameAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\INotifyCompletion.cs" />
-    <Compile Include="System.Runtime.CompilerServices\InternalsVisibleToAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsBoxed.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsByValue.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsConst.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsCopyConstructed.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsExplicitlyDereferenced.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsImplicitlyDereferenced.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsJitIntrinsic.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsLong.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsPinned.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsSignUnspecifiedByte.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsUdtReturn.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IsVolatile.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IteratorStateMachineAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\IUnknownConstantAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\LoadHint.cs" />
-    <Compile Include="System.Runtime.CompilerServices\MethodCodeType.cs" />
-    <Compile Include="System.Runtime.CompilerServices\MethodImplAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\MethodImplOptions.cs" />
-    <Compile Include="System.Runtime.CompilerServices\NativeCppClassAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ReferenceAssemblyAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\RequiredAttributeAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\RuntimeCompatibilityAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\RuntimeHelpers.cs" />
-    <Compile Include="System.Runtime.CompilerServices\RuntimeWrappedException.cs" />
-    <Compile Include="System.Runtime.CompilerServices\ScopelessEnumAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\SpecialNameAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\StateMachineAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\StringFreezingAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\SuppressIldasmAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\TaskAwaiter.cs" />
-    <Compile Include="System.Runtime.CompilerServices\TaskAwaiter_T.cs" />
-    <Compile Include="System.Runtime.CompilerServices\TypeForwardedFromAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\TypeForwardedToAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\UnsafeValueTypeAttribute.cs" />
-    <Compile Include="System.Runtime.CompilerServices\YieldAwaitable.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\CER.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\Consistency.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\CriticialFinalizerObject.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\PrePrepareMethodAttribute.cs" />
-    <Compile Include="System.Runtime.ConstrainedExecution\ReliabilityContractAttribute.cs" />
-    <Compile Include="System.Runtime.ExceptionServices\ExceptionDispatchInfo.cs" />
-    <Compile Include="System.Runtime.ExceptionServices\FirstChanceExceptionEventArgs.cs" />
-    <Compile Include="System.Runtime.ExceptionServices\HandleProcessCorruptedStateExceptionsAttribute.cs" />
-    <Compile Include="System.Runtime.Hosting\ActivationArguments.cs" />
-    <Compile Include="System.Runtime.Hosting\ApplicationActivator.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\BIND_OPTS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\BINDPTR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\CALLCONV.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\CONNECTDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DESCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DISPPARAMS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ELEMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\EXCEPINFO.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FILETIME.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FUNCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IBindCtx.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IConnectionPoint.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IConnectionPointContainer.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDLDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDLFLAG.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumConnectionPoints.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumConnections.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumMoniker.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumString.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumVARIANT.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IMoniker.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IMPLTYPEFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\INVOKEKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IPersistFile.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IRunningObjectTable.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IStream.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeComp.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeInfo2.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeLib.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ITypeLib2.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\LIBFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\PARAMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\PARAMFLAG.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATSTG.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\SYSKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEATTR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPEKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYPELIBATTR.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices.ComTypes\VARKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices.Expando\IExpando.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DefaultInterfaceAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DesignerNamespaceResolveEventArgs.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationToken.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationTokenTable.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\IActivationFactory.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\InterfaceImplementedInVersionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\NamespaceResolveEventArgs.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReadOnlyArrayAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReturnValueNameAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMarshal.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMetadata.cs" />
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WriteOnlyArrayAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Activator.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Assembly.cs" />
-    <Compile Include="System.Runtime.InteropServices\_AssemblyBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_AssemblyName.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Attribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ConstructorBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ConstructorInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_CustomAttributeBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_EnumBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_EventBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_EventInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Exception.cs" />
-    <Compile Include="System.Runtime.InteropServices\_FieldBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_FieldInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ILGenerator.cs" />
-    <Compile Include="System.Runtime.InteropServices\_LocalBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MemberInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodBase.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodRental.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Module.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ModuleBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ParameterBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ParameterInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_PropertyBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_PropertyInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_SignatureHelper.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Thread.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Type.cs" />
-    <Compile Include="System.Runtime.InteropServices\_TypeBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\AllowReversePInvokeCallsAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ArrayWithOffset.cs" />
-    <Compile Include="System.Runtime.InteropServices\AssemblyRegistrationFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\AutomationProxyAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\BestFitMappingAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\BIND_OPTS.cs" />
-    <Compile Include="System.Runtime.InteropServices\BINDPTR.cs" />
-    <Compile Include="System.Runtime.InteropServices\BStrWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\CALLCONV.cs" />
-    <Compile Include="System.Runtime.InteropServices\CallingConvention.cs" />
-    <Compile Include="System.Runtime.InteropServices\CharSet.cs" />
-    <Compile Include="System.Runtime.InteropServices\ClassInterfaceAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ClassInterfaceType.cs" />
-    <Compile Include="System.Runtime.InteropServices\CoClassAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComAliasNameAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComCompatibleVersionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComConversionLossAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComDefaultInterfaceAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComEventInterfaceAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\COMException.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComImportAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComInterfaceType.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComMemberType.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComRegisterFunctionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComSourceInterfacesAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComUnregisterFunctionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComVisible.cs" />
-    <Compile Include="System.Runtime.InteropServices\CONNECTDATA.cs" />
-    <Compile Include="System.Runtime.InteropServices\CriticalHandle.cs" />
-    <Compile Include="System.Runtime.InteropServices\CurrencyWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\DefaultCharSetAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\DESCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\DispatchWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\DispIdAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\DISPPARAMS.cs" />
-    <Compile Include="System.Runtime.InteropServices\DllImportAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ELEMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\ErrorWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\EXCEPINFO.cs" />
-    <Compile Include="System.Runtime.InteropServices\ExporterEventKind.cs" />
-    <Compile Include="System.Runtime.InteropServices\ExtensibleClassFactory.cs" />
-    <Compile Include="System.Runtime.InteropServices\ExternalException.cs" />
-    <Compile Include="System.Runtime.InteropServices\FieldOffsetAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\FILETIME.cs" />
-    <Compile Include="System.Runtime.InteropServices\FUNCDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\FUNCFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\FUNCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\GCHandle.cs" />
-    <Compile Include="System.Runtime.InteropServices\GCHandleType.cs" />
-    <Compile Include="System.Runtime.InteropServices\GuidAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\HandleRef.cs" />
-    <Compile Include="System.Runtime.InteropServices\ICustomAdapter.cs" />
-    <Compile Include="System.Runtime.InteropServices\ICustomFactory.cs" />
-    <Compile Include="System.Runtime.InteropServices\ICustomMarshaler.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDispatchImplAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDispatchImplType.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDLDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDLFLAG.cs" />
-    <Compile Include="System.Runtime.InteropServices\IMPLTYPEFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\ImportedFromTypeLibAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />
-    <Compile Include="System.Runtime.InteropServices\InAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\InterfaceTypeAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\InvalidComObjectException.cs" />
-    <Compile Include="System.Runtime.InteropServices\InvalidOleVariantTypeException.cs" />
-    <Compile Include="System.Runtime.InteropServices\INVOKEKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\IRegistrationServices.cs" />
-    <Compile Include="System.Runtime.InteropServices\ITypeLibConverter.cs" />
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNameProvider.cs" />
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNotifySink.cs" />
-    <Compile Include="System.Runtime.InteropServices\ITypeLibImporterNotifySink.cs" />
-    <Compile Include="System.Runtime.InteropServices\LayoutKind.cs" />
-    <Compile Include="System.Runtime.InteropServices\LCIDConversionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\LIBFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\Marshal.cs" />
-    <Compile Include="System.Runtime.InteropServices\MarshalAsAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\MarshalDirectiveException.cs" />
-    <Compile Include="System.Runtime.InteropServices\ObjectCreationDelegate.cs" />
-    <Compile Include="System.Runtime.InteropServices\OptionalAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\OutAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\PARAMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\PARAMFLAG.cs" />
-    <Compile Include="System.Runtime.InteropServices\PreserveSigAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\PrimaryInteropAssemblyAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\ProgIdAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\RegistrationClassContext.cs" />
-    <Compile Include="System.Runtime.InteropServices\RegistrationConnectionType.cs" />
-    <Compile Include="System.Runtime.InteropServices\RegistrationServices.cs" />
-    <Compile Include="System.Runtime.InteropServices\RuntimeEnvironment.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeArrayRankMismatchException.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeArrayTypeMismatchException.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeBuffer.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeHandle.cs" />
-    <Compile Include="System.Runtime.InteropServices\SEHException.cs" />
-    <Compile Include="System.Runtime.InteropServices\SetWin32ContextInIDispatchAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\STATSTG.cs" />
-    <Compile Include="System.Runtime.InteropServices\StructLayoutAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\SYSKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEATTR.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeIdentifierAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPELIBATTR.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibConverter.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibExporterFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibFuncAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibFuncFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibImportClassAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibImporterFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibTypeAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibTypeFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibVarAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibVarFlags.cs" />
-    <Compile Include="System.Runtime.InteropServices\TypeLibVersionAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIBindCtx.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPoint.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPointContainer.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumConnectionPoints.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumConnections.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumMoniker.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumString.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumVARIANT.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIMoniker.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIPersistFile.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIRunningObjectTable.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMIStream.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeComp.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeLib.cs" />
-    <Compile Include="System.Runtime.InteropServices\UnknownWrapper.cs" />
-    <Compile Include="System.Runtime.InteropServices\UnmanagedFunctionPointerAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\UnmanagedType.cs" />
-    <Compile Include="System.Runtime.InteropServices\VARDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\VarEnum.cs" />
-    <Compile Include="System.Runtime.InteropServices\VARFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\VariantWrapper.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\ActivationServices.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\ActivatorLevel.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\AppDomainLevelActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\ConstructionLevelActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\ContextLevelActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\IActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionCallMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionReturnMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivationAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Activation\UrlAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\AggregateDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelObjectWithProperties.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelSinkWithProperties.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelWithProperties.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelDataStore.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelServices.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelSinkStackEntry.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ClientChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\CrossAppDomainChannel.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannel.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelDataStore.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiver.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiverHook.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSender.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSinkBase.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IClientResponseChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ISecurableChannel.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerFormatterSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\IServerResponseChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ITransportHeaders.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ServerChannelSinkStack.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSinkProvider.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\ServerProcessing.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\SinkProviderData.cs" />
-    <Compile Include="System.Runtime.Remoting.Channels\TransportHeaders.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\Context.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextProperty.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextChannel.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextDelegate.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextProperty.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextPropertyActivator.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeClientContextSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeDynamicSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeEnvoySink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeObjectSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeServerContextSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicMessageSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicProperty.cs" />
-    <Compile Include="System.Runtime.Remoting.Contexts\SynchronizationAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\ClientSponsor.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\ILease.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\ISponsor.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\Lease.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseManager.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseState.cs" />
-    <Compile Include="System.Runtime.Remoting.Lifetime\LifetimeServices.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ArgInfo.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\AsyncResult.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\CADMessages.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\CallContext.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ClientContextTerminatorSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCall.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCallDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionResponse.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\EnvoyTerminatorSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ErrorMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\Header.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\HeaderHandler.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IInternalMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageCtrl.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodCallMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodReturnMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\InternalMessageWrapper.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\IRemotingFormatter.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ISerializationRootObject.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\LogicalCallContext.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MessageSurrogateFilter.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCall.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallMessageWrapper.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodResponse.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnDictionary.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnMessageWrapper.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\MonoMethodMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\OneWayAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogate.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogateSelector.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ReturnMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerContextTerminatorSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerObjectTerminatorSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\StackBuilderSink.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\ISoapXsd.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapAnyUri.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapBase64Binary.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDate.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDateTime.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDay.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDuration.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntities.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntity.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHelper.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHexBinary.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapId.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdref.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdrefs.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapLanguage.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonth.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonthDay.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapName.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNcName.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNegativeInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtoken.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtokens.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonNegativeInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonPositiveInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNormalizedString.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNotation.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapPositiveInteger.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapQName.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapTime.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapToken.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYear.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYearMonth.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapFieldAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapMethodAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapOption.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapParameterAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapTypeAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Metadata\XmlFieldOrderOption.cs" />
-    <Compile Include="System.Runtime.Remoting.Proxies\ProxyAttribute.cs" />
-    <Compile Include="System.Runtime.Remoting.Proxies\RealProxy.cs" />
-    <Compile Include="System.Runtime.Remoting.Proxies\RemotingProxy.cs" />
-    <Compile Include="System.Runtime.Remoting.Services\EnterpriseServicesHelper.cs" />
-    <Compile Include="System.Runtime.Remoting.Services\ITrackingHandler.cs" />
-    <Compile Include="System.Runtime.Remoting.Services\TrackingServices.cs" />
-    <Compile Include="System.Runtime.Remoting\ActivatedClientTypeEntry.cs" />
-    <Compile Include="System.Runtime.Remoting\ActivatedServiceTypeEntry.cs" />
-    <Compile Include="System.Runtime.Remoting\CustomErrorsModes.cs" />
-    <Compile Include="System.Runtime.Remoting\EnvoyInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\IChannelInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\Identity.cs" />
-    <Compile Include="System.Runtime.Remoting\IEnvoyInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\InternalRemotingServices.cs" />
-    <Compile Include="System.Runtime.Remoting\IObjectHandle.cs" />
-    <Compile Include="System.Runtime.Remoting\IRemotingTypeInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\ObjectHandle.cs" />
-    <Compile Include="System.Runtime.Remoting\ObjRef.cs" />
-    <Compile Include="System.Runtime.Remoting\RemotingConfiguration.cs" />
-    <Compile Include="System.Runtime.Remoting\RemotingException.cs" />
-    <Compile Include="System.Runtime.Remoting\RemotingServices.cs" />
-    <Compile Include="System.Runtime.Remoting\RemotingTimeoutException.cs" />
-    <Compile Include="System.Runtime.Remoting\ServerException.cs" />
-    <Compile Include="System.Runtime.Remoting\ServerIdentity.cs" />
-    <Compile Include="System.Runtime.Remoting\SoapServices.cs" />
-    <Compile Include="System.Runtime.Remoting\TypeEntry.cs" />
-    <Compile Include="System.Runtime.Remoting\TypeInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\WellKnownClientTypeEntry.cs" />
-    <Compile Include="System.Runtime.Remoting\WellKnownObjectMode.cs" />
-    <Compile Include="System.Runtime.Remoting\WellKnownServiceTypeEntry.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\BinaryCommon.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\BinaryFormatter.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\CodeGenerator.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\MessageFormatter.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\ObjectReader.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters.Binary\ObjectWriter.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterAssemblyStyle.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterTopObjectStyle.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\FormatterTypeStyle.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\IFieldInfo.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalArrayTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalElementTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalMemberTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalMemberValueE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalNameSpaceE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalObjectPositionE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalObjectTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalParseStateE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalParseTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalPrimitiveTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalRM.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalSerializerTypeE.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\InternalST.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\ISoapMessage.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\ServerFault.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\SoapFault.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\SoapMessage.cs" />
-    <Compile Include="System.Runtime.Serialization.Formatters\TypeFilterLevel.cs" />
-    <Compile Include="System.Runtime.Serialization\Formatter.cs" />
-    <Compile Include="System.Runtime.Serialization\FormatterConverter.cs" />
-    <Compile Include="System.Runtime.Serialization\FormatterServices.cs" />
-    <Compile Include="System.Runtime.Serialization\IDeserializationCallback.cs" />
-    <Compile Include="System.Runtime.Serialization\IFormatter.cs" />
-    <Compile Include="System.Runtime.Serialization\IFormatterConverter.cs" />
-    <Compile Include="System.Runtime.Serialization\IObjectReference.cs" />
-    <Compile Include="System.Runtime.Serialization\ISafeSerializationData.cs" />
-    <Compile Include="System.Runtime.Serialization\ISerializable.cs" />
-    <Compile Include="System.Runtime.Serialization\ISerializationSurrogate.cs" />
-    <Compile Include="System.Runtime.Serialization\ISurrogateSelector.cs" />
-    <Compile Include="System.Runtime.Serialization\ObjectIDGenerator.cs" />
-    <Compile Include="System.Runtime.Serialization\ObjectManager.cs" />
-    <Compile Include="System.Runtime.Serialization\OnDeserializedAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\OnDeserializingAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\OnSerializedAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\OnSerializingAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\OptionalFieldAttribute.cs" />
-    <Compile Include="System.Runtime.Serialization\SafeSerializationEventArgs.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationBinder.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationCallbacks.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationEntry.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationException.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationInfo.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationInfoEnumerator.cs" />
-    <Compile Include="System.Runtime.Serialization\SerializationObjectManager.cs" />
-    <Compile Include="System.Runtime.Serialization\StreamingContext.cs" />
-    <Compile Include="System.Runtime.Serialization\StreamingContextStates.cs" />
-    <Compile Include="System.Runtime.Serialization\SurrogateSelector.cs" />
-    <Compile Include="System.Runtime.Versioning\ComponentGuaranteesAttribute.cs" />
-    <Compile Include="System.Runtime.Versioning\ComponentGuaranteesOptions.cs" />
-    <Compile Include="System.Runtime.Versioning\ResourceConsumptionAttribute.cs" />
-    <Compile Include="System.Runtime.Versioning\ResourceExposureAttribute.cs" />
-    <Compile Include="System.Runtime.Versioning\ResourceScope.cs" />
-    <Compile Include="System.Runtime.Versioning\TargetFrameworkAttribute.cs" />
-    <Compile Include="System.Runtime.Versioning\VersioningHelper.cs" />
-    <Compile Include="System.Runtime\AssemblyTargetedPatchBandAttribute.cs" />
-    <Compile Include="System.Runtime\GCLargeObjectHeapCompactionMode.cs" />
-    <Compile Include="System.Runtime\GCLatencyMode.cs" />
-    <Compile Include="System.Runtime\GCSettings.cs" />
-    <Compile Include="System.Runtime\MemoryFailPoint.cs" />
-    <Compile Include="System.Runtime\TargetedPatchingOptOutAttribute.cs" />
-    <Compile Include="System.Security.AccessControl\AccessControlActions.cs" />
-    <Compile Include="System.Security.AccessControl\AccessControlModification.cs" />
-    <Compile Include="System.Security.AccessControl\AccessControlSections.cs" />
-    <Compile Include="System.Security.AccessControl\AccessControlType.cs" />
-    <Compile Include="System.Security.AccessControl\AccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\AccessRule_T.cs" />
-    <Compile Include="System.Security.AccessControl\AceEnumerator.cs" />
-    <Compile Include="System.Security.AccessControl\AceFlags.cs" />
-    <Compile Include="System.Security.AccessControl\AceQualifier.cs" />
-    <Compile Include="System.Security.AccessControl\AceType.cs" />
-    <Compile Include="System.Security.AccessControl\AuditFlags.cs" />
-    <Compile Include="System.Security.AccessControl\AuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\AuditRule_T.cs" />
-    <Compile Include="System.Security.AccessControl\AuthorizationRule.cs" />
-    <Compile Include="System.Security.AccessControl\AuthorizationRuleCollection.cs" />
-    <Compile Include="System.Security.AccessControl\CommonAce.cs" />
-    <Compile Include="System.Security.AccessControl\CommonAcl.cs" />
-    <Compile Include="System.Security.AccessControl\CommonObjectSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\CommonSecurityDescriptor.cs" />
-    <Compile Include="System.Security.AccessControl\CompoundAce.cs" />
-    <Compile Include="System.Security.AccessControl\CompoundAceType.cs" />
-    <Compile Include="System.Security.AccessControl\ControlFlags.cs" />
-    <Compile Include="System.Security.AccessControl\CryptoKeyAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\CryptoKeyAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\CryptoKeyRights.cs" />
-    <Compile Include="System.Security.AccessControl\CryptoKeySecurity.cs" />
-    <Compile Include="System.Security.AccessControl\CustomAce.cs" />
-    <Compile Include="System.Security.AccessControl\DirectoryObjectSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\DirectorySecurity.cs" />
-    <Compile Include="System.Security.AccessControl\DiscretionaryAcl.cs" />
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\EventWaitHandleRights.cs" />
-    <Compile Include="System.Security.AccessControl\EventWaitHandleSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\FileSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\FileSystemAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\FileSystemAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\FileSystemRights.cs" />
-    <Compile Include="System.Security.AccessControl\FileSystemSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\GenericAce.cs" />
-    <Compile Include="System.Security.AccessControl\GenericAcl.cs" />
-    <Compile Include="System.Security.AccessControl\GenericSecurityDescriptor.cs" />
-    <Compile Include="System.Security.AccessControl\InheritanceFlags.cs" />
-    <Compile Include="System.Security.AccessControl\KnownAce.cs" />
-    <Compile Include="System.Security.AccessControl\MutexAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\MutexAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\MutexRights.cs" />
-    <Compile Include="System.Security.AccessControl\MutexSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\NativeObjectSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectAce.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectAceFlags.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectSecurity.cs" />
-    <Compile Include="System.Security.AccessControl\ObjectSecurity_T.cs" />
-    <Compile Include="System.Security.AccessControl\PrivilegeNotHeldException.cs" />
-    <Compile Include="System.Security.AccessControl\PropagationFlags.cs" />
-    <Compile Include="System.Security.AccessControl\QualifiedAce.cs" />
-    <Compile Include="System.Security.AccessControl\RawAcl.cs" />
-    <Compile Include="System.Security.AccessControl\RawSecurityDescriptor.cs" />
-    <Compile Include="System.Security.AccessControl\RegistryAccessRule.cs" />
-    <Compile Include="System.Security.AccessControl\RegistryAuditRule.cs" />
-    <Compile Include="System.Security.AccessControl\RegistryRights.cs" />
-    <Compile Include="System.Security.AccessControl\RegistrySecurity.cs" />
-    <Compile Include="System.Security.AccessControl\ResourceType.cs" />
-    <Compile Include="System.Security.AccessControl\SddlAccessRight.cs" />
-    <Compile Include="System.Security.AccessControl\SecurityInfos.cs" />
-    <Compile Include="System.Security.AccessControl\SystemAcl.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate20.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ContentType.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyStorageFlags.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricKeyExchangeDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricKeyExchangeFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricSignatureDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\AsymmetricSignatureFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\Base64Constants.cs" />
-    <Compile Include="System.Security.Cryptography\CipherMode.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoAPITransform.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoConfig.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoConfig.fullaot.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoConfig_2_1.cs" />
-    <Compile Include="System.Security.Cryptography\CryptographicException.cs" />
-    <Compile Include="System.Security.Cryptography\CryptographicUnexpectedOperationExcpetion.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoStream.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoStreamMode.cs" />
-    <Compile Include="System.Security.Cryptography\CspKeyContainerInfo.cs" />
-    <Compile Include="System.Security.Cryptography\CspParameters.cs" />
-    <Compile Include="System.Security.Cryptography\CspProviderFlags.cs" />
-    <Compile Include="System.Security.Cryptography\DeriveBytes.cs" />
-    <Compile Include="System.Security.Cryptography\DES.cs" />
-    <Compile Include="System.Security.Cryptography\DESCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\DSA.cs" />
-    <Compile Include="System.Security.Cryptography\DSACryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\DSAParameters.cs" />
-    <Compile Include="System.Security.Cryptography\DSASignatureDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\DSASignatureFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\FromBase64Transform.cs" />
-    <Compile Include="System.Security.Cryptography\HashAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\HMAC.cs" />
-    <Compile Include="System.Security.Cryptography\HMACMD5.cs" />
-    <Compile Include="System.Security.Cryptography\HMACRIPEMD160.cs" />
-    <Compile Include="System.Security.Cryptography\HMACSHA1.cs" />
-    <Compile Include="System.Security.Cryptography\HMACSHA256.cs" />
-    <Compile Include="System.Security.Cryptography\HMACSHA384.cs" />
-    <Compile Include="System.Security.Cryptography\HMACSHA512.cs" />
-    <Compile Include="System.Security.Cryptography\ICryptoTransform.cs" />
-    <Compile Include="System.Security.Cryptography\ICspAsymmetricAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\KeyedHashAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\KeyNumber.cs" />
-    <Compile Include="System.Security.Cryptography\KeySizes.cs" />
-    <Compile Include="System.Security.Cryptography\MACTripleDES.cs" />
-    <Compile Include="System.Security.Cryptography\MaskGenerationMethod.cs" />
-    <Compile Include="System.Security.Cryptography\MD5.cs" />
-    <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\PaddingMode.cs" />
-    <Compile Include="System.Security.Cryptography\PasswordDeriveBytes.cs" />
-    <Compile Include="System.Security.Cryptography\PKCS1MaskGenerationMethod.cs" />
-    <Compile Include="System.Security.Cryptography\RandomNumberGenerator.cs" />
-    <Compile Include="System.Security.Cryptography\RC2.cs" />
-    <Compile Include="System.Security.Cryptography\RC2CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\Rfc2898DeriveBytes.cs" />
-    <Compile Include="System.Security.Cryptography\Rijndael.cs" />
-    <Compile Include="System.Security.Cryptography\RijndaelManaged.cs" />
-    <Compile Include="System.Security.Cryptography\RijndaelManagedTransform.cs" />
-    <Compile Include="System.Security.Cryptography\RIPEMD160.cs" />
-    <Compile Include="System.Security.Cryptography\RIPEMD160Managed.cs" />
-    <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\RSA.cs" />
-    <Compile Include="System.Security.Cryptography\RSACryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\RSAOAEPKeyExchangeDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAOAEPKeyExchangeFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAParameters.cs" />
-    <Compile Include="System.Security.Cryptography\RSAPKCS1KeyExchangeDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAPKCS1KeyExchangeFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureDeformatter.cs" />
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureFormatter.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1Managed.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256Managed.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384Managed.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512Managed.cs" />
-    <Compile Include="System.Security.Cryptography\SHAConstants.cs" />
-    <Compile Include="System.Security.Cryptography\SignatureDescription.cs" />
-    <Compile Include="System.Security.Cryptography\SymmetricAlgorithm.cs" />
-    <Compile Include="System.Security.Cryptography\ToBase64Transform.cs" />
-    <Compile Include="System.Security.Cryptography\TripleDES.cs" />
-    <Compile Include="System.Security.Cryptography\TripleDESCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Permissions\CodeAccessSecurityAttribute.cs" />
-    <Compile Include="System.Security.Permissions\EnvironmentPermission.cs" />
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAccess.cs" />
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\FileDialogPermission.cs" />
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAccess.cs" />
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\FileIOPermission.cs" />
-    <Compile Include="System.Security.Permissions\FileIOPermissionAccess.cs" />
-    <Compile Include="System.Security.Permissions\FileIOPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\GacIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\GacIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\HostProtectionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\HostProtectionPermission.cs" />
-    <Compile Include="System.Security.Permissions\HostProtectionResource.cs" />
-    <Compile Include="System.Security.Permissions\IBuiltInPermission.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStorageContainment.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermission.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermission.cs" />
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\IUnrestrictedPermission.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermission.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntry.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryCollection.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryEnumerator.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionFlags.cs" />
-    <Compile Include="System.Security.Permissions\PermissionSetAttribute.cs" />
-    <Compile Include="System.Security.Permissions\PermissionState.cs" />
-    <Compile Include="System.Security.Permissions\PrincipalPermission.cs" />
-    <Compile Include="System.Security.Permissions\PrincipalPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\ReflectionPermission.cs" />
-    <Compile Include="System.Security.Permissions\ReflectionPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\ReflectionPermissionFlag.cs" />
-    <Compile Include="System.Security.Permissions\RegistryPermission.cs" />
-    <Compile Include="System.Security.Permissions\RegistryPermissionAccess.cs" />
-    <Compile Include="System.Security.Permissions\RegistryPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\SecurityAction.cs" />
-    <Compile Include="System.Security.Permissions\SecurityAttribute.cs" />
-    <Compile Include="System.Security.Permissions\SecurityPermission.cs" />
-    <Compile Include="System.Security.Permissions\SecurityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\SecurityPermissionFlag.cs" />
-    <Compile Include="System.Security.Permissions\SiteIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\SiteIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\StrongNameIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\StrongNamePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\StrongNamePublicKeyBlob.cs" />
-    <Compile Include="System.Security.Permissions\UIPermission.cs" />
-    <Compile Include="System.Security.Permissions\UIPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\UIPermissionClipboard.cs" />
-    <Compile Include="System.Security.Permissions\UIPermissionWindow.cs" />
-    <Compile Include="System.Security.Permissions\UrlIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\UrlIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermission.cs" />
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermissionAttribute.cs" />
-    <Compile Include="System.Security.Policy\AllMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\ApplicationDirectory.cs" />
-    <Compile Include="System.Security.Policy\ApplicationDirectoryMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\ApplicationSecurityInfo.cs" />
-    <Compile Include="System.Security.Policy\ApplicationSecurityManager.cs" />
-    <Compile Include="System.Security.Policy\ApplicationTrust.cs" />
-    <Compile Include="System.Security.Policy\ApplicationTrustCollection.cs" />
-    <Compile Include="System.Security.Policy\ApplicationTrustEnumerator.cs" />
-    <Compile Include="System.Security.Policy\ApplicationVersionMatch.cs" />
-    <Compile Include="System.Security.Policy\CodeConnectAccess.cs" />
-    <Compile Include="System.Security.Policy\CodeGroup.cs" />
-    <Compile Include="System.Security.Policy\DefaultPolicies.cs" />
-    <Compile Include="System.Security.Policy\Evidence.cs" />
-    <Compile Include="System.Security.Policy\EvidenceBase.cs" />
-    <Compile Include="System.Security.Policy\FileCodeGroup.cs" />
-    <Compile Include="System.Security.Policy\FirstMatchCodeGroup.cs" />
-    <Compile Include="System.Security.Policy\Gac.cs" />
-    <Compile Include="System.Security.Policy\GacMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\Hash.cs" />
-    <Compile Include="System.Security.Policy\HashMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\IApplicationTrustManager.cs" />
-    <Compile Include="System.Security.Policy\IBuiltInEvidence.cs" />
-    <Compile Include="System.Security.Policy\IConstantMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\IIdentityPermissionFactory.cs" />
-    <Compile Include="System.Security.Policy\IMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\MembershipConditionHelper.cs" />
-    <Compile Include="System.Security.Policy\MonoTrustManager.cs" />
-    <Compile Include="System.Security.Policy\NetCodeGroup.cs" />
-    <Compile Include="System.Security.Policy\PermissionRequestEvidence.cs" />
-    <Compile Include="System.Security.Policy\PolicyException.cs" />
-    <Compile Include="System.Security.Policy\PolicyLevel.cs" />
-    <Compile Include="System.Security.Policy\PolicyStatement.cs" />
-    <Compile Include="System.Security.Policy\PolicyStatementAttribute.cs" />
-    <Compile Include="System.Security.Policy\Publisher.cs" />
-    <Compile Include="System.Security.Policy\PublisherMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\Site.cs" />
-    <Compile Include="System.Security.Policy\SiteMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\StrongName.cs" />
-    <Compile Include="System.Security.Policy\StrongNameMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\TrustManagerContext.cs" />
-    <Compile Include="System.Security.Policy\TrustManagerUIContext.cs" />
-    <Compile Include="System.Security.Policy\UnionCodeGroup.cs" />
-    <Compile Include="System.Security.Policy\Url.cs" />
-    <Compile Include="System.Security.Policy\UrlMembershipCondition.cs" />
-    <Compile Include="System.Security.Policy\Zone.cs" />
-    <Compile Include="System.Security.Policy\ZoneMembershipCondition.cs" />
-    <Compile Include="System.Security.Principal\GenericIdentity.cs" />
-    <Compile Include="System.Security.Principal\GenericPrincipal.cs" />
-    <Compile Include="System.Security.Principal\IdentityNotMappedException.cs" />
-    <Compile Include="System.Security.Principal\IdentityReference.cs" />
-    <Compile Include="System.Security.Principal\IdentityReferenceCollection.cs" />
-    <Compile Include="System.Security.Principal\IIdentity.cs" />
-    <Compile Include="System.Security.Principal\IPrincipal.cs" />
-    <Compile Include="System.Security.Principal\NTAccount.cs" />
-    <Compile Include="System.Security.Principal\PrincipalPolicy.cs" />
-    <Compile Include="System.Security.Principal\SecurityIdentifier.cs" />
-    <Compile Include="System.Security.Principal\TokenAccessLevels.cs" />
-    <Compile Include="System.Security.Principal\TokenImpersonationLevel.cs" />
-    <Compile Include="System.Security.Principal\WellKnownAccount.cs" />
-    <Compile Include="System.Security.Principal\WellKnownSidType.cs" />
-    <Compile Include="System.Security.Principal\WindowsAccountType.cs" />
-    <Compile Include="System.Security.Principal\WindowsBuiltInRole.cs" />
-    <Compile Include="System.Security.Principal\WindowsIdentity.cs" />
-    <Compile Include="System.Security.Principal\WindowsImpersonationContext.cs" />
-    <Compile Include="System.Security.Principal\WindowsPrincipal.cs" />
-    <Compile Include="System.Security\AllowPartiallyTrustedCallersAttribute.cs" />
-    <Compile Include="System.Security\CodeAccessPermission.cs" />
-    <Compile Include="System.Security\HostProtectionException.cs" />
-    <Compile Include="System.Security\HostSecurityManager.cs" />
-    <Compile Include="System.Security\HostSecurityManagerFlags.cs" />
-    <Compile Include="System.Security\IEvidenceFactory.cs" />
-    <Compile Include="System.Security\IPermission.cs" />
-    <Compile Include="System.Security\ISecurityEncodable.cs" />
-    <Compile Include="System.Security\ISecurityPolicyEncodable.cs" />
-    <Compile Include="System.Security\IStackWalk.cs" />
-    <Compile Include="System.Security\NamedPermissionSet.cs" />
-    <Compile Include="System.Security\PermissionBuilder.cs" />
-    <Compile Include="System.Security\PermissionSet.cs" />
-    <Compile Include="System.Security\PolicyLevelType.cs" />
-    <Compile Include="System.Security\SecureString.cs" />
-    <Compile Include="System.Security\SecurityContext.cs" />
-    <Compile Include="System.Security\SecurityContextSource.cs" />
-    <Compile Include="System.Security\SecurityCriticalAttribute.cs" />
-    <Compile Include="System.Security\SecurityCriticalScope.cs" />
-    <Compile Include="System.Security\SecurityElement.cs" />
-    <Compile Include="System.Security\SecurityException.cs" />
-    <Compile Include="System.Security\SecurityFrame.cs" />
-    <Compile Include="System.Security\SecurityManager.cs" />
-    <Compile Include="System.Security\SecurityManager_mobile.cs" />
-    <Compile Include="System.Security\SecurityRulesAttribute.cs" />
-    <Compile Include="System.Security\SecurityRuleSet.cs" />
-    <Compile Include="System.Security\SecuritySafeCriticalAttribute.cs" />
-    <Compile Include="System.Security\SecurityState.cs" />
-    <Compile Include="System.Security\SecurityTransparentAttribute.cs" />
-    <Compile Include="System.Security\SecurityTreatAsSafeAttribute.cs" />
-    <Compile Include="System.Security\SecurityZone.cs" />
-    <Compile Include="System.Security\SuppressUnmanagedCodeSecurityAttribute.cs" />
-    <Compile Include="System.Security\UnverifiableCodeAttribute.cs" />
-    <Compile Include="System.Security\VerificationException.cs" />
-    <Compile Include="System.Security\XmlSyntaxException.cs" />
-    <Compile Include="System.Text\ASCIIEncoding.cs" />
-    <Compile Include="System.Text\CodePageEncoding.cs" />
-    <Compile Include="System.Text\Decoder.cs" />
-    <Compile Include="System.Text\DecoderExceptionFallback.cs" />
-    <Compile Include="System.Text\DecoderExceptionFallbackBuffer.cs" />
-    <Compile Include="System.Text\DecoderFallback.cs" />
-    <Compile Include="System.Text\DecoderFallbackBuffer.cs" />
-    <Compile Include="System.Text\DecoderFallbackException.cs" />
-    <Compile Include="System.Text\DecoderReplacementFallback.cs" />
-    <Compile Include="System.Text\DecoderReplacementFallbackBuffer.cs" />
-    <Compile Include="System.Text\Encoder.cs" />
-    <Compile Include="System.Text\EncoderExceptionFallback.cs" />
-    <Compile Include="System.Text\EncoderExceptionFallbackBuffer.cs" />
-    <Compile Include="System.Text\EncoderFallback.cs" />
-    <Compile Include="System.Text\EncoderFallbackBuffer.cs" />
-    <Compile Include="System.Text\EncoderFallbackException.cs" />
-    <Compile Include="System.Text\EncoderReplacementFallback.cs" />
-    <Compile Include="System.Text\EncoderReplacementFallbackBuffer.cs" />
-    <Compile Include="System.Text\Encoding.cs" />
-    <Compile Include="System.Text\EncodingInfo.cs" />
-    <Compile Include="System.Text\Latin1Encoding.cs" />
-    <Compile Include="System.Text\MLangCodePageEncoding.cs" />
-    <Compile Include="System.Text\NormalizationForm.cs" />
-    <Compile Include="System.Text\StringBuilder.cs" />
-    <Compile Include="System.Text\SurrogateEncoder.cs" />
-    <Compile Include="System.Text\UnicodeEncoding.cs" />
-    <Compile Include="System.Text\UTF32Encoding.cs" />
-    <Compile Include="System.Text\UTF7Encoding.cs" />
-    <Compile Include="System.Text\UTF8Encoding.cs" />
-    <Compile Include="System.Threading.Tasks\ConcurrentExclusiveSchedulerPair.cs" />
-    <Compile Include="System.Threading.Tasks\CyclicDeque.cs" />
-    <Compile Include="System.Threading.Tasks\DecoupledTask.cs" />
-    <Compile Include="System.Threading.Tasks\IConcurrentDeque.cs" />
-    <Compile Include="System.Threading.Tasks\Parallel.cs" />
-    <Compile Include="System.Threading.Tasks\ParallelLoopResult.cs" />
-    <Compile Include="System.Threading.Tasks\ParallelLoopState.cs" />
-    <Compile Include="System.Threading.Tasks\ParallelOptions.cs" />
-    <Compile Include="System.Threading.Tasks\PopResult.cs" />
-    <Compile Include="System.Threading.Tasks\SimpleConcurrentBag.cs" />
-    <Compile Include="System.Threading.Tasks\SynchronizationContextScheduler.cs" />
-    <Compile Include="System.Threading.Tasks\Task.cs" />
-    <Compile Include="System.Threading.Tasks\Task_T.cs" />
-    <Compile Include="System.Threading.Tasks\TaskActionInvoker.cs" />
-    <Compile Include="System.Threading.Tasks\TaskCanceledException.cs" />
-    <Compile Include="System.Threading.Tasks\TaskCompletionQueue.cs" />
-    <Compile Include="System.Threading.Tasks\TaskCompletionSource.cs" />
-    <Compile Include="System.Threading.Tasks\TaskConstants.cs" />
-    <Compile Include="System.Threading.Tasks\TaskConstants_T.cs" />
-    <Compile Include="System.Threading.Tasks\TaskContinuation.cs" />
-    <Compile Include="System.Threading.Tasks\TaskContinuationOptions.cs" />
-    <Compile Include="System.Threading.Tasks\TaskCreationOptions.cs" />
-    <Compile Include="System.Threading.Tasks\TaskDebuggerView.cs" />
-    <Compile Include="System.Threading.Tasks\TaskExceptionSlot.cs" />
-    <Compile Include="System.Threading.Tasks\TaskExtensionsImpl.cs" />
-    <Compile Include="System.Threading.Tasks\TaskFactory.cs" />
-    <Compile Include="System.Threading.Tasks\TaskFactory_T.cs" />
-    <Compile Include="System.Threading.Tasks\TaskScheduler.cs" />
-    <Compile Include="System.Threading.Tasks\TaskSchedulerException.cs" />
-    <Compile Include="System.Threading.Tasks\TaskStatus.cs" />
-    <Compile Include="System.Threading.Tasks\TpScheduler.cs" />
-    <Compile Include="System.Threading.Tasks\UnobservedTaskExceptionEventArgs.cs" />
-    <Compile Include="System.Threading\AbandonedMutexException.cs" />
-    <Compile Include="System.Threading\ApartmentState.cs" />
-    <Compile Include="System.Threading\AsyncFlowControl.cs" />
-    <Compile Include="System.Threading\AtomicBoolean.cs" />
-    <Compile Include="System.Threading\AutoResetEvent.cs" />
-    <Compile Include="System.Threading\CancellationToken.cs" />
-    <Compile Include="System.Threading\CancellationTokenRegistration.cs" />
-    <Compile Include="System.Threading\CancellationTokenSource.cs" />
-    <Compile Include="System.Threading\CompressedStack.cs" />
-    <Compile Include="System.Threading\ContextCallback.cs" />
-    <Compile Include="System.Threading\CountdownEvent.cs" />
-    <Compile Include="System.Threading\EventResetMode.cs" />
-    <Compile Include="System.Threading\EventWaitHandle.cs" />
-    <Compile Include="System.Threading\ExecutionContext.cs" />
-    <Compile Include="System.Threading\HostExecutionContext.cs" />
-    <Compile Include="System.Threading\HostExecutionContextManager.cs" />
-    <Compile Include="System.Threading\Interlocked.cs" />
-    <Compile Include="System.Threading\IOCompletionCallback.cs" />
-    <Compile Include="System.Threading\LazyInitializer.cs" />
-    <Compile Include="System.Threading\LazyThreadSafetyMode.cs" />
-    <Compile Include="System.Threading\LockCookie.cs" />
-    <Compile Include="System.Threading\LockQueue.cs" />
-    <Compile Include="System.Threading\LockRecursionException.cs" />
-    <Compile Include="System.Threading\ManualResetEvent.cs" />
-    <Compile Include="System.Threading\ManualResetEventSlim.cs" />
-    <Compile Include="System.Threading\Monitor.cs" />
-    <Compile Include="System.Threading\Mutex.cs" />
-    <Compile Include="System.Threading\NamedDataSlot.cs" />
-    <Compile Include="System.Threading\NativeEventCalls.cs" />
-    <Compile Include="System.Threading\NativeOverlapped.cs" />
-    <Compile Include="System.Threading\Overlapped.cs" />
-    <Compile Include="System.Threading\ParameterizedThreadStart.cs" />
-    <Compile Include="System.Threading\ReaderWriterLock.cs" />
-    <Compile Include="System.Threading\RegisteredWaitHandle.cs" />
-    <Compile Include="System.Threading\SemaphoreSlim.cs" />
-    <Compile Include="System.Threading\SendOrPostCallback.cs" />
-    <Compile Include="System.Threading\SpinLock.cs" />
-    <Compile Include="System.Threading\SpinWait.cs" />
-    <Compile Include="System.Threading\SynchronizationContext.cs" />
-    <Compile Include="System.Threading\SynchronizationLockException.cs" />
-    <Compile Include="System.Threading\Thread.cs" />
-    <Compile Include="System.Threading\ThreadAbortException.cs" />
-    <Compile Include="System.Threading\ThreadInterruptedException.cs" />
-    <Compile Include="System.Threading\ThreadLocal.cs" />
-    <Compile Include="System.Threading\ThreadPool.cs" />
-    <Compile Include="System.Threading\ThreadPriority.cs" />
-    <Compile Include="System.Threading\ThreadStart.cs" />
-    <Compile Include="System.Threading\ThreadStartException.cs" />
-    <Compile Include="System.Threading\ThreadState.cs" />
-    <Compile Include="System.Threading\ThreadStateException.cs" />
-    <Compile Include="System.Threading\Timeout.cs" />
-    <Compile Include="System.Threading\Timer.cs" />
-    <Compile Include="System.Threading\TimerCallback.cs" />
-    <Compile Include="System.Threading\Volatile.cs" />
-    <Compile Include="System.Threading\WaitCallback.cs" />
-    <Compile Include="System.Threading\WaitHandle.cs" />
-    <Compile Include="System.Threading\WaitHandleCannotBeOpenedException.cs" />
-    <Compile Include="System.Threading\WaitOrTimerCallback.cs" />
-    <Compile Include="System.Threading\Watch.cs" />
-    <Compile Include="System\__ComObject.cs" />
-    <Compile Include="System\_AppDomain.cs" />
-    <Compile Include="System\AccessViolationException.cs" />
-    <Compile Include="System\Action.cs" />
-    <Compile Include="System\ActivationContext.cs" />
-    <Compile Include="System\Activator.cs" />
-    <Compile Include="System\AggregateException.cs" />
-    <Compile Include="System\AndroidPlatform.cs" />
-    <Compile Include="System\AppDomain.cs" />
-    <Compile Include="System\AppDomainInitializer.cs" />
-    <Compile Include="System\AppDomainManager.cs" />
-    <Compile Include="System\AppDomainSetup.cs" />
-    <Compile Include="System\AppDomainUnloadedException.cs" />
-    <Compile Include="System\ApplicationException.cs" />
-    <Compile Include="System\ApplicationId.cs" />
-    <Compile Include="System\ApplicationIdentity.cs" />
-    <Compile Include="System\ArgIterator.cs" />
-    <Compile Include="System\ArgumentException.cs" />
-    <Compile Include="System\ArgumentNullException.cs" />
-    <Compile Include="System\ArgumentOutOfRangeException.cs" />
-    <Compile Include="System\ArithmeticException.cs" />
-    <Compile Include="System\Array.cs" />
-    <Compile Include="System\ArraySegment.cs" />
-    <Compile Include="System\ArrayTypeMismatchException.cs" />
-    <Compile Include="System\AssemblyLoadEventArgs.cs" />
-    <Compile Include="System\AssemblyLoadEventHandler.cs" />
-    <Compile Include="System\AsyncCallback.cs" />
-    <Compile Include="System\Attribute.cs" />
-    <Compile Include="System\AttributeTargets.cs" />
-    <Compile Include="System\AttributeUsageAttribute.cs" />
-    <Compile Include="System\BadImageFormatException.cs" />
-    <Compile Include="System\Base64FormattingOptions.cs" />
-    <Compile Include="System\BitConverter.cs" />
-    <Compile Include="System\Boolean.cs" />
-    <Compile Include="System\Buffer.cs" />
-    <Compile Include="System\Byte.cs" />
-    <Compile Include="System\CannotUnloadAppDomainException.cs" />
-    <Compile Include="System\Char.cs" />
-    <Compile Include="System\CharEnumerator.cs" />
-    <Compile Include="System\CLSCompliantAttribute.cs" />
-    <Compile Include="System\Comparison.cs" />
-    <Compile Include="System\Console.cs" />
-    <Compile Include="System\Console.iOS.cs" />
-    <Compile Include="System\ConsoleCancelEventArgs.cs" />
-    <Compile Include="System\ConsoleCancelEventHandler.cs" />
-    <Compile Include="System\ConsoleColor.cs" />
-    <Compile Include="System\ConsoleDriver.cs" />
-    <Compile Include="System\ConsoleKey.cs" />
-    <Compile Include="System\ConsoleKeyInfo.cs" />
-    <Compile Include="System\ConsoleModifiers.cs" />
-    <Compile Include="System\ConsoleSpecialKey.cs" />
-    <Compile Include="System\ContextBoundObject.cs" />
-    <Compile Include="System\ContextMarshalException.cs" />
-    <Compile Include="System\ContextStaticAttribute.cs" />
-    <Compile Include="System\ControlCharacters.cs" />
-    <Compile Include="System\Convert.cs" />
-    <Compile Include="System\Converter.cs" />
-    <Compile Include="System\CrossAppDomainDelegate.cs" />
-    <Compile Include="System\CStreamReader.cs" />
-    <Compile Include="System\CStreamWriter.cs" />
-    <Compile Include="System\DataMisalignedException.cs" />
-    <Compile Include="System\DateTime.cs" />
-    <Compile Include="System\DateTimeKind.cs" />
-    <Compile Include="System\DateTimeOffset.cs" />
-    <Compile Include="System\DateTimeUtils.cs" />
-    <Compile Include="System\DayOfWeek.cs" />
-    <Compile Include="System\DBNull.cs" />
-    <Compile Include="System\Decimal.cs" />
-    <Compile Include="System\Delegate.cs" />
-    <Compile Include="System\DelegateSerializationHolder.cs" />
-    <Compile Include="System\DivideByZeroException.cs" />
-    <Compile Include="System\DllNotFoundException.cs" />
-    <Compile Include="System\DomainManagerInitializationFlags.cs" />
-    <Compile Include="System\Double.cs" />
-    <Compile Include="System\DuplicateWaitObjectException.cs" />
-    <Compile Include="System\EmptyArray.cs" />
-    <Compile Include="System\EntryPointNotFoundException.cs" />
-    <Compile Include="System\Enum.cs" />
-    <Compile Include="System\Environment.cs" />
-    <Compile Include="System\EnvironmentVariableTarget.cs" />
-    <Compile Include="System\EventArgs.cs" />
-    <Compile Include="System\EventHandler.cs" />
-    <Compile Include="System\Exception.cs" />
-    <Compile Include="System\ExecutionEngineException.cs" />
-    <Compile Include="System\FieldAccessException.cs" />
-    <Compile Include="System\FlagsAttribute.cs" />
-    <Compile Include="System\FormatException.cs" />
-    <Compile Include="System\Funcs.cs" />
-    <Compile Include="System\GC.cs" />
-    <Compile Include="System\GCCollectionMode.cs" />
-    <Compile Include="System\GCNotificationStatus.cs" />
-    <Compile Include="System\Guid.cs" />
-    <Compile Include="System\IAppDomainSetup.cs" />
-    <Compile Include="System\IAsyncResult.cs" />
-    <Compile Include="System\ICloneable.cs" />
-    <Compile Include="System\IComparable.cs" />
-    <Compile Include="System\IConsoleDriver.cs" />
-    <Compile Include="System\IConvertible.cs" />
-    <Compile Include="System\ICustomFormatter.cs" />
-    <Compile Include="System\IDisposable.cs" />
-    <Compile Include="System\IEquatable.cs" />
-    <Compile Include="System\IFormatProvider.cs" />
-    <Compile Include="System\IFormattable.cs" />
-    <Compile Include="System\IndexOutOfRangeException.cs" />
-    <Compile Include="System\InsufficientExecutionStackException.cs" />
-    <Compile Include="System\InsufficientMemoryException.cs" />
-    <Compile Include="System\Int16.cs" />
-    <Compile Include="System\Int32.cs" />
-    <Compile Include="System\Int64.cs" />
-    <Compile Include="System\IntPtr.cs" />
-    <Compile Include="System\InvalidCastException.cs" />
-    <Compile Include="System\InvalidOperationException.cs" />
-    <Compile Include="System\InvalidProgramException.cs" />
-    <Compile Include="System\InvalidTimeZoneException.cs" />
-    <Compile Include="System\IObservable.cs" />
-    <Compile Include="System\IObserver.cs" />
-    <Compile Include="System\IProgress.cs" />
-    <Compile Include="System\IServiceProvider.cs" />
-    <Compile Include="System\KnownTerminals.cs" />
-    <Compile Include="System\Lazy.cs" />
-    <Compile Include="System\LoaderOptimization.cs" />
-    <Compile Include="System\LoaderOptimizationAttribute.cs" />
-    <Compile Include="System\LocalDataStoreSlot.cs" />
-    <Compile Include="System\MarshalByRefObject.cs" />
-    <Compile Include="System\Math.cs" />
-    <Compile Include="System\MemberAccessException.cs" />
-    <Compile Include="System\MethodAccessException.cs" />
-    <Compile Include="System\MidpointRounding.cs" />
-    <Compile Include="System\MissingFieldException.cs" />
-    <Compile Include="System\MissingMemberException.cs" />
-    <Compile Include="System\MissingMethodException.cs" />
-    <Compile Include="System\ModuleHandle.cs" />
-    <Compile Include="System\MonoAsyncCall.cs" />
-    <Compile Include="System\MonoCQItem.cs" />
-    <Compile Include="System\MonoCustomAttrs.cs" />
-    <Compile Include="System\MonoListItem.cs" />
-    <Compile Include="System\MonoTouchAOTHelper.cs" />
-    <Compile Include="System\MonoType.cs" />
-    <Compile Include="System\MTAThreadAttribute.cs" />
-    <Compile Include="System\MulticastDelegate.cs" />
-    <Compile Include="System\MulticastNotSupportedException.cs" />
-    <Compile Include="System\NonSerializedAttribute.cs" />
-    <Compile Include="System\NotFiniteNumberException.cs" />
-    <Compile Include="System\NotImplementedException.cs" />
-    <Compile Include="System\NotSupportedException.cs" />
-    <Compile Include="System\Nullable.cs" />
-    <Compile Include="System\NullConsoleDriver.cs" />
-    <Compile Include="System\NullReferenceException.cs" />
-    <Compile Include="System\NumberFormatter.cs" />
-    <Compile Include="System\Object.cs" />
-    <Compile Include="System\ObjectDisposedException.cs" />
-    <Compile Include="System\ObsoleteAttribute.cs" />
-    <Compile Include="System\OperatingSystem.cs" />
-    <Compile Include="System\OperationCanceledException.cs" />
-    <Compile Include="System\OutOfMemoryException.cs" />
-    <Compile Include="System\OverflowException.cs" />
-    <Compile Include="System\ParamArrayAttribute.cs" />
-    <Compile Include="System\PlatformID.cs" />
-    <Compile Include="System\PlatformNotSupportedException.cs" />
-    <Compile Include="System\Predicate.cs" />
-    <Compile Include="System\Progress.cs" />
-    <Compile Include="System\Random.cs" />
-    <Compile Include="System\RankException.cs" />
-    <Compile Include="System\ResolveEventArgs.cs" />
-    <Compile Include="System\ResolveEventHandler.cs" />
-    <Compile Include="System\RuntimeArgumentHandle.cs" />
-    <Compile Include="System\RuntimeFieldHandle.cs" />
-    <Compile Include="System\RuntimeMethodHandle.cs" />
-    <Compile Include="System\RuntimeTypeHandle.cs" />
-    <Compile Include="System\SByte.cs" />
-    <Compile Include="System\SerializableAttribute.cs" />
-    <Compile Include="System\Single.cs" />
-    <Compile Include="System\StackOverflowException.cs" />
-    <Compile Include="System\STAThreadAttribute.cs" />
-    <Compile Include="System\String.cs" />
-    <Compile Include="System\StringComparer.cs" />
-    <Compile Include="System\StringComparison.cs" />
-    <Compile Include="System\StringSplitOptions.cs" />
-    <Compile Include="System\SystemException.cs" />
-    <Compile Include="System\TermInfoBooleans.cs" />
-    <Compile Include="System\TermInfoDriver.cs" />
-    <Compile Include="System\TermInfoNumbers.cs" />
-    <Compile Include="System\TermInfoReader.cs" />
-    <Compile Include="System\TermInfoStrings.cs" />
-    <Compile Include="System\ThreadStaticAttribute.cs" />
-    <Compile Include="System\TimeoutException.cs" />
-    <Compile Include="System\TimeSpan.cs" />
-    <Compile Include="System\TimeZone.cs" />
-    <Compile Include="System\TimeZoneNotFoundException.cs" />
-    <Compile Include="System\Tuple.cs" />
-    <Compile Include="System\Tuples.cs" />
-    <Compile Include="System\Type.cs" />
-    <Compile Include="System\TypeAccessException.cs" />
-    <Compile Include="System\TypeCode.cs" />
-    <Compile Include="System\TypedReference.cs" />
-    <Compile Include="System\TypeInitializationException.cs" />
-    <Compile Include="System\TypeLoadException.cs" />
-    <Compile Include="System\TypeIdentifier.cs" />
-    <Compile Include="System\TypeSpec.cs" />
-    <Compile Include="System\TypeUnloadedException.cs" />
-    <Compile Include="System\UInt16.cs" />
-    <Compile Include="System\UInt32.cs" />
-    <Compile Include="System\UInt64.cs" />
-    <Compile Include="System\UIntPtr.cs" />
-    <Compile Include="System\UnauthorizedAccessException.cs" />
-    <Compile Include="System\UnhandledExceptionEventArgs.cs" />
-    <Compile Include="System\UnhandledExceptionEventHandler.cs" />
-    <Compile Include="System\UnitySerializationHolder.cs" />
-    <Compile Include="System\ValueType.cs" />
-    <Compile Include="System\Variant.cs" />
-    <Compile Include="System\Version.cs" />
-    <Compile Include="System\Void.cs" />
-    <Compile Include="System\WeakReference.cs" />
-    <Compile Include="System\WeakReference_T.cs" />
-    <Compile Include="System\WindowsConsoleDriver.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>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="resources/collation.core.bin">
-      <LogicalName>collation.core.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.tailoring.bin">
-      <LogicalName>collation.tailoring.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkCHS.bin">
-      <LogicalName>collation.cjkCHS.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkCHT.bin">
-      <LogicalName>collation.cjkCHT.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkJA.bin">
-      <LogicalName>collation.cjkJA.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkKO.bin">
-      <LogicalName>collation.cjkKO.bin</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="resources/collation.cjkKOlv2.bin">
-      <LogicalName>collation.cjkKOlv2.bin</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-</Project>
-
diff --git a/mcs/class/corlib/corlib-net_4_x.csproj b/mcs/class/corlib/corlib-net_4_x.csproj
index b4b398166e8..95f0db7329c 100644
--- a/mcs/class/corlib/corlib-net_4_x.csproj
+++ b/mcs/class/corlib/corlib-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>612,618,1635,1699</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -25,7 +28,7 @@
     <DebugType>full</DebugType>
     <NoWarn>612,618,1635,1699</NoWarn>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS</DefineConstants>
+    <DefineConstants>TRACE;INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -33,7 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <NoWarn>612,618,1635,1699</NoWarn>
     <Optimize>true</Optimize>
-    <DefineConstants>INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS</DefineConstants>
+    <DefineConstants>INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -45,654 +48,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\external\referencesource\mscorlib\\system\runtime\reliability\criticalfinalizerobject.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\\system\runtime\reliability\prepreparemethodattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\\system\runtime\reliability\reliabilitycontractattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\microsoft\win32\safehandles\safefilehandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\microsoft\win32\safehandles\saferegistryhandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\microsoft\win32\safehandles\safewaithandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\microsoft\win32\safehandles\win32safehandles.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\__filters.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\__hresults.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\_localdatastore.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\_localdatastoremgr.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\accessviolationexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\action.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\activator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\AggregateException.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\AppContext\AppContext.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\appdomainattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\appdomainunloadedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\applicationexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\applicationid.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\argumentexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\argumentnullexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\argumentoutofrangeexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\arithmeticexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\arraysegment.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\arraytypemismatchexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\asynccallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\attribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\attributetargets.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\attributeusageattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\badimageformatexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\bitconverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\boolean.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\buffer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\byte.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\cannotunloadappdomainexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\char.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\charenumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\clscompliantattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\arraylist.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\bitarray.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\caseinsensitivecomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\caseinsensitivehashcodeprovider.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\collectionbase.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\comparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\compatiblecomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\ConcurrentDictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\ConcurrentQueue.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\ConcurrentStack.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\IProducerConsumerCollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\OrderablePartitioner.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\Partitioner.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\PartitionerStatic.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\dictionarybase.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\dictionaryentry.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\emptyreadonlydictionaryinternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\comparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\debugview.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\dictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\equalitycomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\icollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\icomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\idictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ienumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ienumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\iequalitycomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ilist.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ireadonlycollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ireadonlydictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ireadonlylist.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\keynotfoundexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\keyvaluepair.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\list.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\hashtable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\icollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\icomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\idictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\idictionaryenumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\ienumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\ienumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\iequalitycomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\ihashcodeprovider.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\ilist.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\istructuralcomparable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\istructuralequatable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\keyvaluepairs.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\listdictionaryinternal.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\objectmodel\collection.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\objectmodel\keyedcollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\objectmodel\readonlycollection.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\objectmodel\readonlydictionary.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\queue.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\readonlycollectionbase.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\sortedlist.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\stack.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\structuralcomparisons.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolecanceleventargs.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolecolor.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolekey.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolekeyinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolemodifiers.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolespecialkey.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\contextboundobject.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\contextmarshalexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\contextstaticattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\convert.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\datamisalignedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\datetime.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\datetimekind.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\datetimeoffset.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\dayofweek.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\dbnull.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\decimal.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\defaultbinder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\assert.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\assertfilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\assertfilters.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\codeanalysis\suppressmessageattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\conditionalattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\contracts\contracts.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\contracts\contractsbcl.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\debuggerattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\eventing\eventactivityoptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\eventing\TraceLogging\EventSourceOptions.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\eventing\TraceLogging\TraceLoggingEventTraits.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\eventing\winmeta.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\dividebyzeroexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\dllnotfoundexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\double.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\duplicatewaitobjectexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\empty.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\entrypointnotfoundexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\enum.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\eventargs.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\eventhandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\executionengineexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\fieldaccessexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\flagsattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\formatexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\bidicategory.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendaralgorithmtype.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendardata.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendarweekrule.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\CalendricalCalculationsHelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\charunicodeinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\chineselunisolarcalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\compareinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\culturenotfoundexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\culturetypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimeformat.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimeformatinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimeformatinfoscanner.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimeparse.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimestyles.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\daylighttime.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\digitshapes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\eastasianlunisolarcalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\globalizationassembly.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\gregoriancalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\gregoriancalendarhelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\gregoriancalendartypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\hebrewcalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\hebrewnumber.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\hijricalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\japanesecalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\japaneselunisolarcalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\juliancalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\koreancalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\koreanlunisolarcalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\numberformatinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\numberstyles.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\Persiancalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\sortversion.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\stringinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\taiwancalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\taiwanlunisolarcalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\textelementenumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\textinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\thaibuddhistcalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\timespanformat.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\timespanparse.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\umalquracalendar.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\unicodecategory.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\guid.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iappdomain.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iappdomainsetup.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iasyncresult.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\icloneable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\icomparable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iconvertible.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\icustomformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\idisposable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iequatable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iformatprovider.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iformattable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\indexoutofrangeexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\insufficientexecutionstackexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\insufficientmemoryexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\int16.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\int32.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\int64.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\invalidcastexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\invalidoperationexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\invalidprogramexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\invalidtimezoneexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\__error.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\__hresults.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\binaryreader.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\binarywriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\bufferedstream.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\directorynotfoundexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\drivenotfoundexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\endofstreamexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\fileloadexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\filenotfoundexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\ioexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\memorystream.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\pathtoolongexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\pinnedbuffermemorystream.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\stream.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\streamreader.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\streamwriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\stringreader.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\stringwriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\textreader.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\textwriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\unmanagedmemoryaccessor.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\unmanagedmemorystream.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\unmanagedmemorystreamwrapper.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iobservable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iobserver.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iprogress.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iserviceobjectprovider.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\Lazy.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\math.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\memberaccessexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\methodaccessexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\midpointrounding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\missingfieldexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\missingmemberexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\missingmethodexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\multicastnotsupportedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\nonserializedattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\notfinitenumberexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\notimplementedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\notsupportedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\nullreferenceexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\number.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\objectdisposedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\obsoleteattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\operationcanceledexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\outofmemoryexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\overflowexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\paramarrayattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\paramsarray.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\platformnotsupportedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\progress.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\random.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\rankexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\ambiguousmatchexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\assemblyattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\assemblynameflags.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\assemblynameproxy.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\binder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\bindingflags.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\callingconventions.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\CustomAttributeExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\defaultmemberattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\emit\methodbuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\eventattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\fieldattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\genericparameterattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\icustomattributeprovider.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\interfacemapping.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\introspectionextensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\invalidfiltercriteriaexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\ireflect.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\ireflectabletype.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\manifestresourceinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\mdimport.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\memberfilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\memberinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\memberinfoserializationholder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\membertypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\methodattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\methodbase.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\methodbody.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\methodimplattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\missing.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\obfuscateassemblyattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\obfuscationattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\parameterattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\parametermodifier.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\pointer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\propertyattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\reflectioncontext.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\resourceattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\RuntimeReflectionExtensions.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\typeattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\typedelegator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\typefilter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\typeinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resid.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\__fastresourcecomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\__hresults.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\filebasedresourcegroveler.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\iresourcegroveler.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\iresourcereader.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\iresourcewriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\looselylinkedresourcereference.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\manifestbasedresourcegroveler.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\missingmanifestresourceexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\missingsatelliteassemblyexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\neutralresourceslanguageattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcefallbackmanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcemanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcereader.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourceset.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcetypecode.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcewriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\runtimeresourceset.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\satellitecontractversionattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\ultimateresourcefallbacklocation.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\rttype.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\accessedthroughpropertyattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\assemblyattributesgohere.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\assemblysettingattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\AsyncMethodBuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\AsyncStateMachineAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\CallerFilePathAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\CallerLineNumberAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\CallerMemberNameAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\callingconvention.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\compilationrelaxations.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\compilergeneratedattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\compilerglobalscopeattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\compilermarshaloverride.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\customconstantattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\datetimeconstantattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\decimalconstantattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\decoratednameattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\discardableattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\extensionattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\fixedaddressvaluetypeattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\fixedbufferattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\hascopysemanticsattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\IAsyncStateMachine.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\idispatchconstantattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\indexernameattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\INotifyCompletion.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\internalsvisibletoattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isboxed.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isbyvalue.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isconst.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\iscopyconstructed.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isexplicitlydereferenced.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isimplicitlydereferenced.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isjitintrinsic.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\islong.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\ispinned.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\issignunspecifiedbyte.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isudtreturn.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isvolatile.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\IteratorStateMachineAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\iunknownconstantattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\methodimplattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\nativecppclassattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\ReferenceAssemblyAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\requiredattributeattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\RuntimeCompatibilityAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\RuntimeWrappedException.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\scopelessenumattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\specialnameattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\StateMachineAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\suppressildasmattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\suppressmergecheckattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\TaskAwaiter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\typedependencyattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\TypeForwardedFromAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\TypeForwardedToAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\unsafevaluetypeattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\YieldAwaitable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\exceptionservices\corruptingexceptioncommon.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\exceptionservices\exceptionnotification.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\exceptionservices\exceptionservicescommon.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\attributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ibindctx.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iconnectionpoint.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iconnectionpointcontainer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumconnectionpoints.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumconnections.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumerable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienummoniker.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumstring.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumvariant.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iexpando.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\imoniker.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ipersistfile.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ireflect.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\irunningobjecttable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\istream.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypecomp.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypeinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypeinfo2.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypelib.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypelib2.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\expando\iexpando.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\safehandle.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ucomienumconnections.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\NgenServicingAttributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\remoting\callcontext.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\deserializationeventhandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatterconverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binarycommonclasses.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryconverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryenums.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryformatterwriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binarymethodmessage.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryobjectinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryobjectreader.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryobjectwriter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryparser.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryutilclasses.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\commonenums.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\ifieldinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\isoapmessage.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\sertrace.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\soapfault.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\soapmessage.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatterservices.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\ideserializationcallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iformatterconverter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iobjectreference.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iserializable.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iserializationsurrogate.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\isurrogateselector.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\memberholder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\objectclonehelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\objectidgenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\objectmanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\safeserializationmanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationbinder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationeventscache.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationfieldinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationinfoenumerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationobjectmanager.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\streamingcontext.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\surrogateselector.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\valuetypefixupinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\binarycompatibility.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\componentguaranteesattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\multitargetinghelpers.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\NonVersionableAttribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\resourceattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\targetframeworkattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\targetframeworkid.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\sbyte.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\attributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\Claim.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\ClaimsIdentity.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\ClaimsPrincipal.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\ClaimTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\ClaimValueTypes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\RoleClaimProvider.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\aes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetricalgorithm.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetrickeyexchangedeformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetrickeyexchangeformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetricsignaturedeformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetricsignatureformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\base64transforms.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\crypto.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\cryptoapitransform.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\cryptostream.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\derivebytes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\des.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\descryptoserviceprovider.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\dsa.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\dsasignaturedeformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\dsasignatureformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hashalgorithm.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\HashAlgorithmName.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmac.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacmd5.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacripemd160.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacsha1.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacsha256.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacsha384.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacsha512.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\icryptotransform.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\keyedhashalgorithm.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\mactripledes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\maskgenerationmethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\md5.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\passwordderivebytes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\pkcs1maskgenerationmethod.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\randomnumbergenerator.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rc2.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rc2cryptoserviceprovider.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rfc2898derivebytes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rijndael.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rijndaelmanaged.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rijndaelmanagedtransform.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\ripemd160.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\ripemd160managed.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsa.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPadding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPaddingMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangedeformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangeformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangedeformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangeformatter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\RSASignaturePadding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\RSASignaturePaddingMode.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha1.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha1managed.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha256.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha256managed.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha384.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha512.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\signaturedescription.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\symmetricalgorithm.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\tripledes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\utils.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\x509certificates\x509utils.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\principal\genericidentity.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\securitycontext.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\securitydocument.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\util\hex.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\util\parser.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\util\tokenizer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\serializableattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\single.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\stackoverflowexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\string.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\stringcomparer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\stringfreezingattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\systemexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\asciiencoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\codepageencoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoderbestfitfallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoderexceptionfallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoderfallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decodernls.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoderreplacementfallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoderbestfitfallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoderexceptionfallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoderfallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encodernls.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoderreplacementfallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encodinginfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\mlangcodepageencoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\stringbuilder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\stringbuildercache.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\surrogateencoder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\unicodeencoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\utf32encoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\utf7encoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\utf8encoding.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threadattributes.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\abandonedmutexexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\apartmentstate.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\autoresetevent.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\CancellationToken.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\CancellationTokenRegistration.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\CancellationTokenSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\CountdownEvent.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\eventresetmode.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\executioncontext.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\LazyInitializer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\lockrecursionexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\manualresetevent.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\ManualResetEventSlim.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\parameterizedthreadstart.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\semaphorefullexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\SemaphoreSlim.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\sendorpostcallback.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\SpinLock.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\SpinWait.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\synchronizationcontext.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\synchronizationlockexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\AsyncCausalityTracer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\BeginEndAwaitableAdapter.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ConcurrentExclusiveSchedulerPair.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\Future.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\FutureFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\Parallel.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ParallelLoopState.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ParallelRangeManager.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ProducerConsumerQueues.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\Task.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskCanceledException.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskCompletionSource.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskContinuation.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskExceptionHolder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskFactory.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskScheduler.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskSchedulerException.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskToApm.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ThreadPoolTaskScheduler.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\thread.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadabortexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadinterruptedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\ThreadLocal.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadpool.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadpriority.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadstart.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadstartexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadstate.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadstateexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\timeout.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\waithandlecannotbeopenedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threadstaticattribute.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\throwhelper.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\timeoutexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\timespan.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\timezoneinfo.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\timezonenotfoundexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\tuple.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\type.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typeaccessexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typedreference.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typeinitializationexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typeloadexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typeunloadedexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\uint16.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\uint32.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\uint64.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unauthorizedaccessexception.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unhandledexceptioneventargs.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unhandledexceptioneventhandler.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unityserializationholder.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unsafecharbuffer.cs" />
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\version.cs" />
+    <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -739,6 +95,689 @@
     <Compile Include="..\Mono.Security\Mono.Security\BitConverterLE.cs" />
     <Compile Include="..\Mono.Security\Mono.Security\PKCS7.cs" />
     <Compile Include="..\Mono.Security\Mono.Security\StrongName.cs" />
+    <Compile Include="..\referencesource\mscorlib\\system\runtime\reliability\criticalfinalizerobject.cs" />
+    <Compile Include="..\referencesource\mscorlib\\system\runtime\reliability\prepreparemethodattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\\system\runtime\reliability\reliabilitycontractattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\microsoft\win32\safehandles\safefilehandle.cs" />
+    <Compile Include="..\referencesource\mscorlib\microsoft\win32\safehandles\saferegistryhandle.cs" />
+    <Compile Include="..\referencesource\mscorlib\microsoft\win32\safehandles\safewaithandle.cs" />
+    <Compile Include="..\referencesource\mscorlib\microsoft\win32\safehandles\win32safehandles.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\__filters.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\__hresults.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\_localdatastore.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\_localdatastoremgr.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\accessviolationexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\action.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\activator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\AggregateException.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\AppContext\AppContext.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\appdomainattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\appdomainunloadedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\applicationexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\applicationid.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\argumentexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\argumentnullexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\argumentoutofrangeexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\arithmeticexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\arraysegment.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\arraytypemismatchexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\asynccallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\attribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\attributetargets.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\attributeusageattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\badimageformatexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\bitconverter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\boolean.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\buffer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\byte.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\cannotunloadappdomainexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\char.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\charenumerator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\clscompliantattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\arraylist.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\bitarray.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\caseinsensitivecomparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\caseinsensitivehashcodeprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\collectionbase.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\comparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\compatiblecomparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\Concurrent\ConcurrentDictionary.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\Concurrent\ConcurrentQueue.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\Concurrent\ConcurrentStack.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\Concurrent\IProducerConsumerCollection.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\Concurrent\OrderablePartitioner.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\Concurrent\Partitioner.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\Concurrent\PartitionerStatic.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\dictionarybase.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\dictionaryentry.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\emptyreadonlydictionaryinternal.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\comparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\debugview.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\dictionary.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\equalitycomparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\icollection.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\icomparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\idictionary.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\ienumerable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\ienumerator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\iequalitycomparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\ilist.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\ireadonlycollection.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\ireadonlydictionary.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\ireadonlylist.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\keynotfoundexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\keyvaluepair.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\generic\list.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\hashtable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\icollection.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\icomparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\idictionary.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\idictionaryenumerator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\ienumerable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\ienumerator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\iequalitycomparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\ihashcodeprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\ilist.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\istructuralcomparable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\istructuralequatable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\keyvaluepairs.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\listdictionaryinternal.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\objectmodel\collection.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\objectmodel\keyedcollection.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\objectmodel\readonlycollection.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\objectmodel\readonlydictionary.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\queue.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\readonlycollectionbase.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\sortedlist.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\stack.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\collections\structuralcomparisons.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\consolecanceleventargs.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\consolecolor.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\consolekey.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\consolekeyinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\consolemodifiers.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\consolespecialkey.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\contextboundobject.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\contextmarshalexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\contextstaticattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\convert.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\datamisalignedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\datetime.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\datetimekind.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\datetimeoffset.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\dayofweek.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\dbnull.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\decimal.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\defaultbinder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\assert.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\assertfilter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\assertfilters.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\codeanalysis\suppressmessageattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\conditionalattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\contracts\contracts.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\contracts\contractsbcl.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\debuggerattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\eventactivityoptions.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\TraceLogging\EventSourceOptions.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\TraceLogging\TraceLoggingEventTraits.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\winmeta.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\dividebyzeroexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\dllnotfoundexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\double.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\duplicatewaitobjectexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\empty.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\entrypointnotfoundexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\enum.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\eventargs.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\eventhandler.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\exception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\executionengineexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\fieldaccessexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\flagsattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\formatexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\bidicategory.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\calendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\calendaralgorithmtype.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\calendardata.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\calendarweekrule.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\CalendricalCalculationsHelper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\charunicodeinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\chineselunisolarcalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\compareinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\culturenotfoundexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\culturetypes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\datetimeformat.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\datetimeformatinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\datetimeformatinfoscanner.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\datetimeparse.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\datetimestyles.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\daylighttime.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\digitshapes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\eastasianlunisolarcalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\globalizationassembly.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\gregoriancalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\gregoriancalendarhelper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\gregoriancalendartypes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\hebrewcalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\hebrewnumber.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\hijricalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\japanesecalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\japaneselunisolarcalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\juliancalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\koreancalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\koreanlunisolarcalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\numberformatinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\numberstyles.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\Persiancalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\sortversion.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\stringinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\taiwancalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\taiwanlunisolarcalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\textelementenumerator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\textinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\thaibuddhistcalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\timespanformat.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\timespanparse.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\umalquracalendar.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\unicodecategory.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\guid.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iappdomain.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iappdomainsetup.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iasyncresult.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\icloneable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\icomparable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iconvertible.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\icustomformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\idisposable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iequatable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iformatprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iformattable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\indexoutofrangeexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\insufficientexecutionstackexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\insufficientmemoryexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\int16.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\int32.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\int64.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\invalidcastexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\invalidoperationexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\invalidprogramexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\invalidtimezoneexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\__error.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\__hresults.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\binaryreader.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\binarywriter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\bufferedstream.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\directorynotfoundexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\drivenotfoundexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\endofstreamexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\fileinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\fileloadexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\filenotfoundexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\filesysteminfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\ioexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\memorystream.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\pathtoolongexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\pinnedbuffermemorystream.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\stream.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\streamreader.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\streamwriter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\stringreader.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\stringwriter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\textreader.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\textwriter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\unmanagedmemoryaccessor.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\unmanagedmemorystream.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\io\unmanagedmemorystreamwrapper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iobservable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iobserver.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iprogress.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\iserviceobjectprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\Lazy.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\math.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\memberaccessexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\methodaccessexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\midpointrounding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\missingfieldexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\missingmemberexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\missingmethodexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\multicastnotsupportedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\nonserializedattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\notfinitenumberexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\notimplementedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\notsupportedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\nullreferenceexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\number.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\objectdisposedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\obsoleteattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\operationcanceledexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\outofmemoryexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\overflowexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\paramarrayattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\paramsarray.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\platformnotsupportedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\progress.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\random.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\rankexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\ambiguousmatchexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\assemblyattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\assemblynameflags.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\assemblynameproxy.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\binder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\bindingflags.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\callingconventions.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\CustomAttributeExtensions.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\defaultmemberattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\emit\methodbuilder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\emit\symboltype.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\eventattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\fieldattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\genericparameterattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\icustomattributeprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\interfacemapping.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\introspectionextensions.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\invalidfiltercriteriaexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\ireflect.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\ireflectabletype.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\manifestresourceinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\mdimport.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\memberfilter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\memberinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\memberinfoserializationholder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\membertypes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\methodattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\methodbase.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\methodbody.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\methodimplattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\methodinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\missing.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\obfuscateassemblyattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\obfuscationattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\parameterattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\parametermodifier.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\pointer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\propertyattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\reflectioncontext.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\resourceattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\RuntimeReflectionExtensions.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\typeattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\typedelegator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\typefilter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\typeinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resid.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\__fastresourcecomparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\__hresults.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\filebasedresourcegroveler.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\iresourcegroveler.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\iresourcereader.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\iresourcewriter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\looselylinkedresourcereference.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\manifestbasedresourcegroveler.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\missingmanifestresourceexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\missingsatelliteassemblyexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\neutralresourceslanguageattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\resourcefallbackmanager.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\resourcemanager.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\resourcereader.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\resourceset.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\resourcetypecode.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\resourcewriter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\runtimeresourceset.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\satellitecontractversionattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\resources\ultimateresourcefallbacklocation.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\rttype.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\accessedthroughpropertyattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\assemblyattributesgohere.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\assemblysettingattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\AsyncMethodBuilder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\AsyncStateMachineAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\CallerFilePathAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\CallerLineNumberAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\CallerMemberNameAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\callingconvention.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\compilationrelaxations.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\compilergeneratedattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\compilerglobalscopeattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\compilermarshaloverride.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\customconstantattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\datetimeconstantattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\decimalconstantattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\decoratednameattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\discardableattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\extensionattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\fixedaddressvaluetypeattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\fixedbufferattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\hascopysemanticsattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\IAsyncStateMachine.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\idispatchconstantattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\indexernameattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\INotifyCompletion.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\internalsvisibletoattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\isboxed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\isbyvalue.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\isconst.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\iscopyconstructed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\isexplicitlydereferenced.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\isimplicitlydereferenced.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\isjitintrinsic.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\islong.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\ispinned.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\issignunspecifiedbyte.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\isudtreturn.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\isvolatile.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\IteratorStateMachineAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\iunknownconstantattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\methodimplattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\nativecppclassattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\ReferenceAssemblyAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\requiredattributeattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\RuntimeCompatibilityAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\RuntimeWrappedException.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\scopelessenumattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\specialnameattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\StateMachineAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\suppressildasmattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\suppressmergecheckattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\TaskAwaiter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\typedependencyattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\TypeForwardedFromAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\TypeForwardedToAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\unsafevaluetypeattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\YieldAwaitable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\exceptionservices\corruptingexceptioncommon.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\exceptionservices\exceptionnotification.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\exceptionservices\exceptionservicescommon.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\arraywithoffset.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\attributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\bstrwrapper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\callingconvention.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\charset.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\comexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\commembertype.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ibindctx.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iconnectionpoint.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iconnectionpointcontainer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumconnectionpoints.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumconnections.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumerable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumerator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienummoniker.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumstring.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumvariant.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iexpando.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\imoniker.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ipersistfile.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ireflect.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\irunningobjecttable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\istream.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypecomp.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypeinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypeinfo2.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypelib.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypelib2.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\criticalhandle.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\currencywrapper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\dispatchwrapper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\errorwrapper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\expando\iexpando.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\externalexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\handleref.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\icustomadapter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\icustomfactory.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\icustommarshaler.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\icustomqueryinterface.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\invalidcomobjectexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\invalidolevarianttypeexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\iregistrationservices.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\layoutkind.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\marshaldirectiveexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\objectcreationdelegate.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\runtimeenvironment.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\safearrayrankmismatchexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\safearraytypemismatchexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\safehandle.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\sehexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ucomienumconnections.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\unknownwrapper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\variantWrapper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\NgenServicingAttributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\remoting\callcontext.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\deserializationeventhandler.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatterconverter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binarycommonclasses.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryconverter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryenums.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryformatterwriter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binarymethodmessage.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryobjectinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryobjectreader.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryobjectwriter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryparser.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryutilclasses.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\commonenums.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\ifieldinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\isoapmessage.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\sertrace.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\soapfault.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatters\soapmessage.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\formatterservices.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\ideserializationcallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\iformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\iformatterconverter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\iobjectreference.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\iserializable.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\iserializationsurrogate.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\isurrogateselector.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\memberholder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\objectclonehelper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\objectidgenerator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\objectmanager.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\safeserializationmanager.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\serializationattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\serializationbinder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\serializationeventscache.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\serializationexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\serializationfieldinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\serializationinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\serializationinfoenumerator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\serializationobjectmanager.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\streamingcontext.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\surrogateselector.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\valuetypefixupinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\binarycompatibility.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\componentguaranteesattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\multitargetinghelpers.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\NonVersionableAttribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\resourceattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\targetframeworkattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\targetframeworkid.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\sbyte.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\attributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\claims\Claim.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimsIdentity.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimsPrincipal.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimTypes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimValueTypes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\claims\RoleClaimProvider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\aes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\asymmetricalgorithm.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\asymmetrickeyexchangedeformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\asymmetrickeyexchangeformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\asymmetricsignaturedeformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\asymmetricsignatureformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\base64transforms.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\crypto.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\cryptoapitransform.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\cryptostream.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\derivebytes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\des.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\descryptoserviceprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\dsa.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\dsasignaturedeformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\dsasignatureformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hashalgorithm.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\HashAlgorithmName.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmac.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmacmd5.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmacripemd160.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmacsha1.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmacsha256.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmacsha384.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmacsha512.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\icryptotransform.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\keyedhashalgorithm.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\mactripledes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\maskgenerationmethod.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\md5.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\passwordderivebytes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\pkcs1maskgenerationmethod.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\randomnumbergenerator.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rc2.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rc2cryptoserviceprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rfc2898derivebytes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rijndael.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rijndaelmanaged.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rijndaelmanagedtransform.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\ripemd160.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\ripemd160managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsa.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPadding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPaddingMode.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangedeformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangeformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangedeformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangeformatter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSASignaturePadding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSASignaturePaddingMode.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha1.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha1managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha256.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha256managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\signaturedescription.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\symmetricalgorithm.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\utils.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\x509certificates\x509utils.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\principal\genericidentity.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\securitycontext.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\securitydocument.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\util\hex.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\util\parser.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\util\tokenizer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\serializableattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\single.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\stackoverflowexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\string.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\stringcomparer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\stringfreezingattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\systemexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\asciiencoding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\codepageencoding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\decoder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\decoderbestfitfallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\decoderexceptionfallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\decoderfallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\decodernls.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\decoderreplacementfallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\encoder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\encoderbestfitfallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\encoderexceptionfallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\encoderfallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\encodernls.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\encoderreplacementfallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\encoding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\encodinginfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\mlangcodepageencoding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\stringbuilder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\stringbuildercache.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\surrogateencoder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\unicodeencoding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\utf32encoding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\utf7encoding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\text\utf8encoding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threadattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\abandonedmutexexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\apartmentstate.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\autoresetevent.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\CancellationToken.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\CancellationTokenRegistration.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\CancellationTokenSource.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\CountdownEvent.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\eventresetmode.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\executioncontext.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\LazyInitializer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\lockrecursionexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\manualresetevent.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\ManualResetEventSlim.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\monitor.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\parameterizedthreadstart.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\semaphorefullexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\SemaphoreSlim.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\sendorpostcallback.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\SpinLock.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\SpinWait.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\synchronizationcontext.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\synchronizationlockexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\AsyncCausalityTracer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\BeginEndAwaitableAdapter.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\ConcurrentExclusiveSchedulerPair.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\Future.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\FutureFactory.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\Parallel.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\ParallelLoopState.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\ParallelRangeManager.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\ProducerConsumerQueues.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\Task.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\TaskCanceledException.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\TaskCompletionSource.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\TaskContinuation.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\TaskExceptionHolder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\TaskFactory.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\TaskScheduler.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\TaskSchedulerException.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\TaskToApm.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\ThreadPoolTaskScheduler.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\thread.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\threadabortexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\threadinterruptedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\ThreadLocal.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\threadpool.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\threadpriority.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\threadstart.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\threadstartexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\threadstate.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\threadstateexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\timeout.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\waithandle.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\waithandlecannotbeopenedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threadstaticattribute.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\throwhelper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\timeoutexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\timespan.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\timezoneinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\timezonenotfoundexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\tuple.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\type.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\typeaccessexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\typedreference.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\typeinitializationexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\typeloadexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\typeunloadedexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\uint16.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\uint32.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\uint64.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\unauthorizedaccessexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\unhandledexceptioneventargs.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\unhandledexceptioneventhandler.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\unityserializationholder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\unsafecharbuffer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\version.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="coreclr\AsyncLocal.cs" />
     <Compile Include="coreclr\DisablePrivateReflectionAttribute.cs" />
@@ -796,6 +835,7 @@
     <Compile Include="ReferenceSources\HashHelpers.cs" />
     <Compile Include="ReferenceSources\JitHelpers.cs" />
     <Compile Include="ReferenceSources\MethodBase.cs" />
+    <Compile Include="ReferenceSources\NativeMethods.cs" />
     <Compile Include="ReferenceSources\ParseNumbers.cs" />
     <Compile Include="ReferenceSources\RemotingFieldCachedData.cs" />
     <Compile Include="ReferenceSources\RuntimeHandles.cs" />
@@ -832,9 +872,11 @@
     <Compile Include="System.Diagnostics.Tracing\EventAttribute.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventCommand.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventCommandEventArgs.cs" />
+    <Compile Include="System.Diagnostics.Tracing\EventListener.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventSource.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventSourceAttribute.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventSourceSettings.cs" />
+    <Compile Include="System.Diagnostics.Tracing\EventWrittenEventArgs.cs" />
     <Compile Include="System.Diagnostics.Tracing\NonEventAttribute.cs" />
     <Compile Include="System.Diagnostics\Debugger.cs" />
     <Compile Include="System.Diagnostics\StackFrame.cs" />
@@ -859,13 +901,11 @@
     <Compile Include="System.IO\File.cs" />
     <Compile Include="System.IO\FileAccess.cs" />
     <Compile Include="System.IO\FileAttributes.cs" />
-    <Compile Include="System.IO\FileInfo.cs" />
     <Compile Include="System.IO\FileMode.cs" />
     <Compile Include="System.IO\FileOptions.cs" />
     <Compile Include="System.IO\FileShare.cs" />
     <Compile Include="System.IO\FileStream.cs" />
     <Compile Include="System.IO\FileStreamAsyncResult.cs" />
-    <Compile Include="System.IO\FileSystemInfo.cs" />
     <Compile Include="System.IO\HGlobalUnmanagedMemoryStream.cs" />
     <Compile Include="System.IO\LogcatTextWriter.cs" />
     <Compile Include="System.IO\MonoFileType.cs" />
@@ -936,7 +976,6 @@
     <Compile Include="System.Reflection\ImageFileMachine.cs" />
     <Compile Include="System.Reflection\LocalVariableInfo.cs" />
     <Compile Include="System.Reflection\MethodBody.cs" />
-    <Compile Include="System.Reflection\MethodInfo.cs" />
     <Compile Include="System.Reflection\Module.cs" />
     <Compile Include="System.Reflection\ModuleResolveEventHandler.cs" />
     <Compile Include="System.Reflection\MonoAssembly.cs" />
@@ -1004,68 +1043,42 @@
     <Compile Include="System.Runtime.InteropServices\_Thread.cs" />
     <Compile Include="System.Runtime.InteropServices\_Type.cs" />
     <Compile Include="System.Runtime.InteropServices\_TypeBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\ArrayWithOffset.cs" />
-    <Compile Include="System.Runtime.InteropServices\AssemblyRegistrationFlags.cs" />
     <Compile Include="System.Runtime.InteropServices\BIND_OPTS.cs" />
     <Compile Include="System.Runtime.InteropServices\BINDPTR.cs" />
-    <Compile Include="System.Runtime.InteropServices\BStrWrapper.cs" />
     <Compile Include="System.Runtime.InteropServices\CALLCONV.cs" />
-    <Compile Include="System.Runtime.InteropServices\CallingConvention.cs" />
-    <Compile Include="System.Runtime.InteropServices\CharSet.cs" />
-    <Compile Include="System.Runtime.InteropServices\COMException.cs" />
-    <Compile Include="System.Runtime.InteropServices\ComMemberType.cs" />
-    <Compile Include="System.Runtime.InteropServices\CriticalHandle.cs" />
-    <Compile Include="System.Runtime.InteropServices\CurrencyWrapper.cs" />
     <Compile Include="System.Runtime.InteropServices\DESCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\DispatchWrapper.cs" />
     <Compile Include="System.Runtime.InteropServices\DISPPARAMS.cs" />
     <Compile Include="System.Runtime.InteropServices\ELEMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\ErrorWrapper.cs" />
     <Compile Include="System.Runtime.InteropServices\EXCEPINFO.cs" />
     <Compile Include="System.Runtime.InteropServices\ExporterEventKind.cs" />
     <Compile Include="System.Runtime.InteropServices\ExtensibleClassFactory.cs" />
-    <Compile Include="System.Runtime.InteropServices\ExternalException.cs" />
     <Compile Include="System.Runtime.InteropServices\FILETIME.cs" />
     <Compile Include="System.Runtime.InteropServices\FUNCDESC.cs" />
     <Compile Include="System.Runtime.InteropServices\FUNCFLAGS.cs" />
     <Compile Include="System.Runtime.InteropServices\FUNCKIND.cs" />
     <Compile Include="System.Runtime.InteropServices\GCHandle.cs" />
     <Compile Include="System.Runtime.InteropServices\GCHandleType.cs" />
-    <Compile Include="System.Runtime.InteropServices\HandleRef.cs" />
-    <Compile Include="System.Runtime.InteropServices\ICustomAdapter.cs" />
-    <Compile Include="System.Runtime.InteropServices\ICustomFactory.cs" />
-    <Compile Include="System.Runtime.InteropServices\ICustomMarshaler.cs" />
     <Compile Include="System.Runtime.InteropServices\IDLDESC.cs" />
     <Compile Include="System.Runtime.InteropServices\IDLFLAG.cs" />
     <Compile Include="System.Runtime.InteropServices\IErrorInfo.cs" />
     <Compile Include="System.Runtime.InteropServices\IMPLTYPEFLAGS.cs" />
     <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />
-    <Compile Include="System.Runtime.InteropServices\InvalidComObjectException.cs" />
-    <Compile Include="System.Runtime.InteropServices\InvalidOleVariantTypeException.cs" />
     <Compile Include="System.Runtime.InteropServices\INVOKEKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\IRegistrationServices.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibConverter.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNameProvider.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNotifySink.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibImporterNotifySink.cs" />
-    <Compile Include="System.Runtime.InteropServices\LayoutKind.cs" />
     <Compile Include="System.Runtime.InteropServices\LIBFLAGS.cs" />
     <Compile Include="System.Runtime.InteropServices\ManagedErrorInfo.cs" />
     <Compile Include="System.Runtime.InteropServices\Marshal.cs" />
     <Compile Include="System.Runtime.InteropServices\MarshalAsAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\MarshalDirectiveException.cs" />
-    <Compile Include="System.Runtime.InteropServices\ObjectCreationDelegate.cs" />
     <Compile Include="System.Runtime.InteropServices\PARAMDESC.cs" />
     <Compile Include="System.Runtime.InteropServices\PARAMFLAG.cs" />
     <Compile Include="System.Runtime.InteropServices\RegistrationClassContext.cs" />
     <Compile Include="System.Runtime.InteropServices\RegistrationConnectionType.cs" />
     <Compile Include="System.Runtime.InteropServices\RegistrationServices.cs" />
-    <Compile Include="System.Runtime.InteropServices\RuntimeEnvironment.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeArrayRankMismatchException.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeArrayTypeMismatchException.cs" />
     <Compile Include="System.Runtime.InteropServices\SafeBuffer.cs" />
     <Compile Include="System.Runtime.InteropServices\SafeHandle.cs" />
-    <Compile Include="System.Runtime.InteropServices\SEHException.cs" />
     <Compile Include="System.Runtime.InteropServices\STATSTG.cs" />
     <Compile Include="System.Runtime.InteropServices\SYSKIND.cs" />
     <Compile Include="System.Runtime.InteropServices\TYPEATTR.cs" />
@@ -1090,10 +1103,8 @@
     <Compile Include="System.Runtime.InteropServices\UCOMITypeComp.cs" />
     <Compile Include="System.Runtime.InteropServices\UCOMITypeInfo.cs" />
     <Compile Include="System.Runtime.InteropServices\UCOMITypeLib.cs" />
-    <Compile Include="System.Runtime.InteropServices\UnknownWrapper.cs" />
     <Compile Include="System.Runtime.InteropServices\VARDESC.cs" />
     <Compile Include="System.Runtime.InteropServices\VARFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\VariantWrapper.cs" />
     <Compile Include="System.Runtime.Remoting.Activation\ActivationServices.cs" />
     <Compile Include="System.Runtime.Remoting.Activation\ActivatorLevel.cs" />
     <Compile Include="System.Runtime.Remoting.Activation\AppDomainLevelActivator.cs" />
@@ -1343,6 +1354,7 @@
     <Compile Include="System.Security.AccessControl\SddlAccessRight.cs" />
     <Compile Include="System.Security.AccessControl\SecurityInfos.cs" />
     <Compile Include="System.Security.AccessControl\SystemAcl.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\INativeCertificateHelper.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate20.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateImpl.cs" />
@@ -1561,12 +1573,10 @@
     <Compile Include="System\EmptyArray.cs" />
     <Compile Include="System\Environment.cs" />
     <Compile Include="System\EnvironmentVariableTarget.cs" />
-    <Compile Include="System\Exception.cs" />
     <Compile Include="System\GC.cs" />
     <Compile Include="System\GCCollectionMode.cs" />
     <Compile Include="System\GCNotificationStatus.cs" />
     <Compile Include="System\Guid.cs" />
-    <Compile Include="System\Guid.MonoTouch.cs" />
     <Compile Include="System\IConsoleDriver.cs" />
     <Compile Include="System\IntPtr.cs" />
     <Compile Include="System\KnownTerminals.cs" />
@@ -1620,15 +1630,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index d1202a94e80..323efb3eba7 100644
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -23,6 +23,8 @@ Mono.Globalization.Unicode/SortKeyBuffer.cs
 Mono.Globalization.Unicode/Normalization.cs
 Mono.Globalization.Unicode/NormalizationTableUtil.cs
 Mono/Runtime.cs
+Mono/RuntimeStructs.cs
+Mono/RuntimeHandles.cs
 Mono/DataConverter.cs
 Mono.Interop/ComInteropProxy.cs
 Mono.Interop/IDispatch.cs
@@ -338,66 +340,41 @@ System.Runtime.InteropServices/_SignatureHelper.cs
 System.Runtime.InteropServices/_Thread.cs
 System.Runtime.InteropServices/_Type.cs
 System.Runtime.InteropServices/_TypeBuilder.cs
-System.Runtime.InteropServices/ArrayWithOffset.cs
-System.Runtime.InteropServices/AssemblyRegistrationFlags.cs
 System.Runtime.InteropServices/BIND_OPTS.cs
 System.Runtime.InteropServices/BINDPTR.cs
-System.Runtime.InteropServices/BStrWrapper.cs
 System.Runtime.InteropServices/CALLCONV.cs
-System.Runtime.InteropServices/CallingConvention.cs
-System.Runtime.InteropServices/CharSet.cs
-System.Runtime.InteropServices/COMException.cs
-System.Runtime.InteropServices/ComMemberType.cs
-System.Runtime.InteropServices/CriticalHandle.cs
-System.Runtime.InteropServices/CurrencyWrapper.cs
 System.Runtime.InteropServices/DESCKIND.cs
-System.Runtime.InteropServices/DispatchWrapper.cs
 System.Runtime.InteropServices/DISPPARAMS.cs
 System.Runtime.InteropServices/ELEMDESC.cs
-System.Runtime.InteropServices/ErrorWrapper.cs
 System.Runtime.InteropServices/EXCEPINFO.cs
 System.Runtime.InteropServices/ExporterEventKind.cs
 System.Runtime.InteropServices/ExtensibleClassFactory.cs
-System.Runtime.InteropServices/ExternalException.cs
 System.Runtime.InteropServices/FILETIME.cs
 System.Runtime.InteropServices/FUNCDESC.cs
 System.Runtime.InteropServices/FUNCFLAGS.cs
 System.Runtime.InteropServices/FUNCKIND.cs
 System.Runtime.InteropServices/GCHandle.cs
 System.Runtime.InteropServices/GCHandleType.cs
-System.Runtime.InteropServices/HandleRef.cs
-System.Runtime.InteropServices/ICustomAdapter.cs
-System.Runtime.InteropServices/ICustomFactory.cs
-System.Runtime.InteropServices/ICustomMarshaler.cs
 System.Runtime.InteropServices/IDLDESC.cs
 System.Runtime.InteropServices/IDLFLAG.cs
 System.Runtime.InteropServices/IErrorInfo.cs
 System.Runtime.InteropServices/IMPLTYPEFLAGS.cs
 System.Runtime.InteropServices/INVOKEKIND.cs
-System.Runtime.InteropServices/IRegistrationServices.cs
 System.Runtime.InteropServices/ITypeLibConverter.cs
 System.Runtime.InteropServices/ITypeLibExporterNameProvider.cs
 System.Runtime.InteropServices/ITypeLibExporterNotifySink.cs
 System.Runtime.InteropServices/ITypeLibImporterNotifySink.cs
 System.Runtime.InteropServices/ImporterEventKind.cs
-System.Runtime.InteropServices/InvalidComObjectException.cs
-System.Runtime.InteropServices/InvalidOleVariantTypeException.cs
 System.Runtime.InteropServices/LIBFLAGS.cs
-System.Runtime.InteropServices/LayoutKind.cs
 System.Runtime.InteropServices/ManagedErrorInfo.cs
 System.Runtime.InteropServices/Marshal.cs
 System.Runtime.InteropServices/MarshalAsAttribute.cs
-System.Runtime.InteropServices/MarshalDirectiveException.cs
-System.Runtime.InteropServices/ObjectCreationDelegate.cs
 System.Runtime.InteropServices/PARAMDESC.cs
 System.Runtime.InteropServices/PARAMFLAG.cs
 System.Runtime.InteropServices/RegistrationClassContext.cs
 System.Runtime.InteropServices/RegistrationConnectionType.cs
-System.Runtime.InteropServices/SEHException.cs
 System.Runtime.InteropServices/STATSTG.cs
 System.Runtime.InteropServices/RegistrationServices.cs
-System.Runtime.InteropServices/SafeArrayRankMismatchException.cs
-System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs
 System.Runtime.InteropServices/SafeBuffer.cs
 System.Runtime.InteropServices/SafeHandle.cs
 System.Runtime.InteropServices/SYSKIND.cs
@@ -423,10 +400,8 @@ System.Runtime.InteropServices/UCOMIStream.cs
 System.Runtime.InteropServices/UCOMITypeComp.cs
 System.Runtime.InteropServices/UCOMITypeInfo.cs
 System.Runtime.InteropServices/UCOMITypeLib.cs
-System.Runtime.InteropServices/UnknownWrapper.cs
 System.Runtime.InteropServices/VARDESC.cs
 System.Runtime.InteropServices/VARFLAGS.cs
-System.Runtime.InteropServices/VariantWrapper.cs
 
 System.Runtime.InteropServices.WindowsRuntime/DefaultInterfaceAttribute.cs
 System.Runtime.InteropServices.WindowsRuntime/DesignerNamespaceResolveEventArgs.cs
@@ -1287,10 +1262,37 @@ ReferenceSources/SecurityContext.cs
 ../referencesource/mscorlib/system/runtime/exceptionservices/exceptionnotification.cs
 ../referencesource/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs
 
+../referencesource/mscorlib/system/runtime/interopservices/arraywithoffset.cs
 ../referencesource/mscorlib/system/runtime/interopservices/attributes.cs
+../referencesource/mscorlib/system/runtime/interopservices/bstrwrapper.cs
+../referencesource/mscorlib/system/runtime/interopservices/callingconvention.cs
+../referencesource/mscorlib/system/runtime/interopservices/charset.cs
+../referencesource/mscorlib/system/runtime/interopservices/comexception.cs
+../referencesource/mscorlib/system/runtime/interopservices/commembertype.cs
+../referencesource/mscorlib/system/runtime/interopservices/criticalhandle.cs
+../referencesource/mscorlib/system/runtime/interopservices/currencywrapper.cs
+../referencesource/mscorlib/system/runtime/interopservices/dispatchwrapper.cs
+../referencesource/mscorlib/system/runtime/interopservices/errorwrapper.cs
+../referencesource/mscorlib/system/runtime/interopservices/externalexception.cs
+../referencesource/mscorlib/system/runtime/interopservices/handleref.cs
+../referencesource/mscorlib/system/runtime/interopservices/icustomadapter.cs
+../referencesource/mscorlib/system/runtime/interopservices/icustomfactory.cs
+../referencesource/mscorlib/system/runtime/interopservices/icustommarshaler.cs
+../referencesource/mscorlib/system/runtime/interopservices/icustomqueryinterface.cs
+../referencesource/mscorlib/system/runtime/interopservices/invalidcomobjectexception.cs
+../referencesource/mscorlib/system/runtime/interopservices/invalidolevarianttypeexception.cs
+../referencesource/mscorlib/system/runtime/interopservices/iregistrationservices.cs
+../referencesource/mscorlib/system/runtime/interopservices/layoutkind.cs
+../referencesource/mscorlib/system/runtime/interopservices/marshaldirectiveexception.cs
+../referencesource/mscorlib/system/runtime/interopservices/objectcreationdelegate.cs
 ../referencesource/mscorlib/system/runtime/interopservices/runtimeenvironment.cs
+../referencesource/mscorlib/system/runtime/interopservices/safearrayrankmismatchexception.cs
+../referencesource/mscorlib/system/runtime/interopservices/safearraytypemismatchexception.cs
 ../referencesource/mscorlib/system/runtime/interopservices/safehandle.cs
+../referencesource/mscorlib/system/runtime/interopservices/sehexception.cs
 ../referencesource/mscorlib/system/runtime/interopservices/ucomienumconnections.cs
+../referencesource/mscorlib/system/runtime/interopservices/unknownwrapper.cs
+../referencesource/mscorlib/system/runtime/interopservices/variantWrapper.cs
 
 ../referencesource/mscorlib/system/runtime/interopservices/ComTypes/ibindctx.cs
 ../referencesource/mscorlib/system/runtime/interopservices/ComTypes/iconnectionpoint.cs
@@ -1556,6 +1558,7 @@ ReferenceSources/SecurityContext.cs
 ../referencesource/mscorlib/system/threading/lockrecursionexception.cs
 ../referencesource/mscorlib/system/threading/manualresetevent.cs
 ../referencesource/mscorlib/system/threading/ManualResetEventSlim.cs
+../referencesource/mscorlib/system/threading/monitor.cs
 ../referencesource/mscorlib/system/threading/parameterizedthreadstart.cs
 ../referencesource/mscorlib/system/threading/semaphorefullexception.cs
 ../referencesource/mscorlib/system/threading/SemaphoreSlim.cs
diff --git a/mcs/class/corlib/corlib_cmp.dll.excludes b/mcs/class/corlib/corlib_cmp.dll.excludes
deleted file mode 100644
index 1ad643198b5..00000000000
--- a/mcs/class/corlib/corlib_cmp.dll.excludes
+++ /dev/null
@@ -1,8 +0,0 @@
-System/Object.cs
-System/ValueType.cs
-System/Enum.cs
-System/Delegate.cs
-System/MulticastDelegate.cs
-System.Runtime.CompilerServices/RuntimeHelpers.cs
-System/Decimal.cs
-System/DecimalFormatter.cs
diff --git a/mcs/class/corlib/mobile_static_corlib_test.dll.excludes b/mcs/class/corlib/mobile_static_corlib_test.dll.exclude.sources
index eb17a105b75..eb17a105b75 100644
--- a/mcs/class/corlib/mobile_static_corlib_test.dll.excludes
+++ b/mcs/class/corlib/mobile_static_corlib_test.dll.exclude.sources
diff --git a/mcs/class/corlib/monodroid_corlib_test.dll.exclude.sources b/mcs/class/corlib/monodroid_corlib_test.dll.exclude.sources
new file mode 100644
index 00000000000..48e7f0461ce
--- /dev/null
+++ b/mcs/class/corlib/monodroid_corlib_test.dll.exclude.sources
@@ -0,0 +1,53 @@
+#include monodroid_corlib_test.dll.new-exclude.sources
+Microsoft.Win32/RegistryKeyTest.cs
+System/ActivatorCas.cs
+System/AppDomainCas.cs
+System/BadImageFormatExceptionCas.cs
+System/ConsoleCas.cs
+System.Diagnostics/StackFrameCas.cs
+System.Diagnostics/StackTraceCas.cs
+System/EnvironmentCas.cs
+System/ExceptionCas.cs
+System.IO/DirectoryCas.cs
+System.IO/FileLoadExceptionCas.cs
+System.IO/FileNotFoundExceptionCas.cs
+System.IO/FileStreamCas.cs
+System.IO.IsolatedStorage/IsolatedStorageFileCas.cs
+System.IO.IsolatedStorage/IsolatedStorageFileStreamCas.cs
+System.IO/PathCas.cs
+System.IO/StreamCas.cs
+System/MarshalByRefObjectCas.cs
+System.Reflection/AssemblyCas.cs
+System.Reflection/AssemblyNameCas.cs
+System.Reflection.Emit/MethodRentalCas.cs
+System.Reflection/ModuleCas.cs
+System.Reflection/StrongNameKeyPairCas.cs
+System.Reflection/VisibilityTest.cs
+System.Resources/ResourceReaderCas.cs
+System.Resources/ResourceSetCas.cs
+System.Runtime.CompilerServices/RuntimeWrappedExceptionCas.cs
+System.Runtime.InteropServices/RuntimeEnvironmentCas.cs
+System/RuntimeMethodHandleCas.cs
+System.Runtime.Serialization.Formatters.Binary/BinaryFormatterCas.cs
+System.Runtime.Versioning/ResourceConsumptionAttributeCas.cs
+System.Runtime.Versioning/ResourceExposureAttributeCas.cs
+System.Runtime.Versioning/VersioningHelperCas.cs
+System.Security.AccessControl/DirectorySecurityTest.cs
+System.Security.AccessControl/EventWaitHandleSecurityTest.cs
+System.Security.AccessControl/FileSecurityTest.cs
+System.Security/CodeAccessPermissionCas.cs
+System.Security.Cryptography/CryptoAPITransformCas.cs
+System.Security.Cryptography/CryptoConfigCas.cs
+System.Security.Cryptography.X509Certificates/X509CertificateCas.cs
+System.Security/PermissionSetCas.cs
+System.Security.Policy/ApplicationSecurityManagerCas.cs
+System.Security/SecureStringCas.cs
+System.Security/SecurityContextCas.cs
+System.Security/SecurityExceptionCas.cs
+System.Security/SecurityManagerCas.cs
+System.Threading/CompressedStackCas.cs
+System.Threading/ExecutionContextCas.cs
+System.Threading/MutexCas.cs
+System.Threading/ThreadCas.cs
+System.Threading/WaitHandleCas.cs
+System/TypedReferenceCas.cs
diff --git a/mcs/class/corlib/monodroid_corlib_test.dll.new-exclude.sources b/mcs/class/corlib/monodroid_corlib_test.dll.new-exclude.sources
new file mode 100644
index 00000000000..90b0082f607
--- /dev/null
+++ b/mcs/class/corlib/monodroid_corlib_test.dll.new-exclude.sources
@@ -0,0 +1,28 @@
+System/DateTimeOffsetTestCoreFx.cs
+System.Diagnostics.Contracts/ContractAssertTest.cs
+System.Diagnostics.Contracts/ContractCollectionMethodsTest.cs
+System.Diagnostics.Contracts/ContractHelperTest.cs
+System.Diagnostics.Contracts/ContractMustUseRewriterTest.cs
+System.IO/DirectoryTest.cs
+System.Reflection.Emit/MethodBuilderTestIL.cs
+System.Security.AccessControl/AuthorizationRuleTest.cs
+System.Security.AccessControl/CommonAceTest.cs
+System.Security.AccessControl/CommonAclTest.cs
+System.Security.AccessControl/CommonObjectSecurityTest.cs
+System.Security.AccessControl/CommonSecurityDescriptorTest.cs
+System.Security.AccessControl/CryptoKeyAccessRuleTest.cs
+System.Security.AccessControl/DirectoryObjectSecurityTest.cs
+System.Security.AccessControl/DiscretionaryAclTest.cs
+System.Security.AccessControl/MutexAccessRuleTest.cs
+System.Security.AccessControl/MutexSecurityTest.cs
+System.Security.AccessControl/ObjectAceTest.cs
+System.Security.AccessControl/ObjectSecurityTest.cs
+System.Security.AccessControl/ObjectSecurity_TTest.cs
+System.Security.AccessControl/RawAclTest.cs
+System.Security.AccessControl/RawSecurityDescriptorTest.cs
+System.Security.AccessControl/RegistrySecurityTest.cs
+System.Security.AccessControl/SystemAclTest.cs
+System.Security.Claims/ClaimsIdentityTest.cs
+System.Security.Claims/ClaimsPrincipalTest.cs
+System.Security/CodeAccessPermissionTest.cs
+System/TimeZoneTest.cs
diff --git a/mcs/class/corlib/monodroid_corlib_test.dll.sources b/mcs/class/corlib/monodroid_corlib_test.dll.sources
new file mode 100644
index 00000000000..011effe162c
--- /dev/null
+++ b/mcs/class/corlib/monodroid_corlib_test.dll.sources
@@ -0,0 +1 @@
+#include corlib_test.dll.sources
diff --git a/mcs/class/doc/NUnitGuidelines b/mcs/class/doc/NUnitGuidelines
index 5b7b87f5d95..191d5dd7ac8 100644
--- a/mcs/class/doc/NUnitGuidelines
+++ b/mcs/class/doc/NUnitGuidelines
@@ -45,45 +45,45 @@ build and the tests will be run along with all the others.
 
 * Tips
 
--- Provide an unique error message for Assertion.Assert ()
+-- Provide an unique error message for Assert.IsTrue ()
 
-Include an unique message for each Assertion.Assert () so that when the assert
+Include an unique message for each Assert.IsTrue () so that when the assert
 fails, it is trivial to locate the failing one. Otherwise, it may be
 difficult to determine which part of the test is failing. A good way
 to ensure unique messages is to use something like #A01, #A02 etc.
 
     Bad:
 
-	Assertion.AssertEquals ("array match", compare[0], i1[0]);
-	Assertion.AssertEquals ("array match", compare[1], i1[1]);
-	Assertion.AssertEquals ("array match", compare[2], i1[2]);
-	Assertion.AssertEquals ("array match", compare[3], i1[3]);
+	Assert.AreEqual (compare[0], i1[0], "array match");
+	Assert.AreEqual (compare[1], i1[1], "array match");
+	Assert.AreEqual (compare[2], i1[2], "array match");
+	Assert.AreEqual (compare[3], i1[3], "array match");
 
     Good:
 
-	Assertion.AssertEquals ("#A01", compare[0], i1[0]);
-	Assertion.AssertEquals ("#A02", compare[1], i1[1]);
-	Assertion.AssertEquals ("#A03", compare[2], i1[2]);
-	Assertion.AssertEquals ("#A04", compare[3], i1[3]);
+	Assert.AreEqual (compare[0], i1[0], "#A01");
+	Assert.AreEqual (compare[1], i1[1], "#A02");
+	Assert.AreEqual (compare[2], i1[2], "#A03");
+	Assert.AreEqual (compare[3], i1[3], "#A04");
 
-Once you used such a number in an Assertion.Assert (), don't change it later on -
+Once you used such a number in an Assert.IsTrue (), don't change it later on -
 people might use it it identify the test in bug reports or in mailing
 lists.
 
--- Use Assertion.AssertEquals () to compare things, not Assertion.Assert ().
+-- Use Assert.AreEqual () to compare things, not Assert.IsTrue ().
 
-Never compare two values with Assertion.Assert () - if the test fails, people
-have no idea what went wrong while Assertion.AssertEquals () reports the failed
+Never compare two values with Assert.IsTrue () - if the test fails, people
+have no idea what went wrong while Assert.AreEqual () reports the failed
 value. Also, make sure the second paramter is the expected value, and the third
 parameter is the actual value.
 
     Bad:
 
-        Assertion.Assert ("A01", myTicks[0] == t1.Ticks);
+        Assert.IsTrue (myTicks[0] == t1.Ticks, "A01");
 
     Good:
 
-        Assertion.AssertEquals ("A01", myTicks[0], t1.Ticks);
+        Assert.AreEqual (myTicks[0], t1.Ticks, "A01");
 
 -- Namespace
 
diff --git a/mcs/class/monodoc/monodoc-net_4_x.csproj b/mcs/class/monodoc/monodoc-net_4_x.csproj
index 6a392a4a8a8..114d68896c5 100644
--- a/mcs/class/monodoc/monodoc-net_4_x.csproj
+++ b/mcs/class/monodoc/monodoc-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>618,612,672,809,1699,169,164,162,168,219,618,612</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -526,15 +529,18 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.jay > $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.cs
+
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.jay > $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.cs
+
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
diff --git a/mcs/class/reference-assemblies/Makefile b/mcs/class/reference-assemblies/Makefile
index 60d4cbd3f18..519786c3cf2 100644
--- a/mcs/class/reference-assemblies/Makefile
+++ b/mcs/class/reference-assemblies/Makefile
@@ -18,11 +18,12 @@ install-local:
 	$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5/*.dll $(PROFILE_DIR)/4.5-api
 	$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5/Facades/*.dll $(PROFILE_DIR)/4.5-api/Facades
 
-	# Unfortunately, a few programs (most notably NUnit) have hardcoded checks for <prefix>/lib/mono/4.0/mscorlib.dll,
+	# Unfortunately, a few programs (most notably NUnit and FSharp) have hardcoded checks for <prefix>/lib/mono/4.0/mscorlib.dll or Mono.Posix.dll,
 	# so we need to place something there or those tools break. We decided to symlink to the reference assembly for now.
-	# See https://bugzilla.xamarin.com/show_bug.cgi?id=38331
+	# See https://bugzilla.xamarin.com/show_bug.cgi?id=38331 and https://bugzilla.xamarin.com/show_bug.cgi?id=41052
 	$(MKINSTALLDIRS) $(PROFILE_DIR)/4.0
 	ln -sf ../4.0-api/mscorlib.dll $(PROFILE_DIR)/4.0/mscorlib.dll
+	ln -sf ../4.0-api/Mono.Posix.dll $(PROFILE_DIR)/4.0/Mono.Posix.dll
 
 DISTFILES = $(wildcard ../../../external/binary-reference-assemblies/v4.5/Facades/*.dll) $(wildcard ../../../external/binary-reference-assemblies/v4.5/*.dll) $(wildcard ../../../external/binary-reference-assemblies/v4.0/*.dll) $(wildcard ../../../external/binary-reference-assemblies/v3.5/*.dll) $(wildcard ../../../external/binary-reference-assemblies/v2.0/*.dll) Makefile
 
diff --git a/mcs/class/referencesource/System.Data.Linq/misc/SecurityUtils.cs b/mcs/class/referencesource/System.Data.Linq/misc/SecurityUtils.cs
index 66211b4ac05..9da4616a8d8 100644
--- a/mcs/class/referencesource/System.Data.Linq/misc/SecurityUtils.cs
+++ b/mcs/class/referencesource/System.Data.Linq/misc/SecurityUtils.cs
@@ -37,7 +37,7 @@ namespace System.Windows.Forms
     /// </devdoc>
     internal static class SecurityUtils {
 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         private static volatile ReflectionPermission memberAccessPermission = null;
         private static volatile ReflectionPermission restrictedMemberAccessPermission = null;
 
@@ -62,7 +62,7 @@ namespace System.Windows.Forms
 #endif
 
         private static void DemandReflectionAccess(Type type) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             try {
                 MemberAccessPermission.Demand();
             }
@@ -74,7 +74,7 @@ namespace System.Windows.Forms
 
         [SecuritySafeCritical]
         private static void DemandGrantSet(Assembly assembly) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             PermissionSet targetGrantSet = assembly.PermissionSet;
             targetGrantSet.AddPermission(RestrictedMemberAccessPermission);
             targetGrantSet.Demand();
@@ -82,7 +82,7 @@ namespace System.Windows.Forms
         }
 
         private static bool HasReflectionPermission(Type type) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             try {
                 DemandReflectionAccess(type);
                 return true;
diff --git a/mcs/class/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Compiler.cs b/mcs/class/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Compiler.cs
index f13e16ea9a2..055962a3252 100644
--- a/mcs/class/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Compiler.cs
+++ b/mcs/class/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Compiler.cs
@@ -164,7 +164,7 @@ namespace System.Xml.Xsl.XsltOld {
         // The World of Compile
         //
         internal void Compile(NavigatorInput input, XmlResolver xmlResolver, Evidence evidence) {
-#if DISABLE_CAS_USE
+#if !FEATURE_MONO_CAS
             evidence = null;
 #endif
             Debug.Assert(input != null);
diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs
index 8103f0fce6e..662c1c9130d 100644
--- a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs
+++ b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs
@@ -2125,7 +2125,7 @@ namespace System.Data.Common {
         [ResourceExposure(ResourceScope.Machine)]
         [ResourceConsumption(ResourceScope.Machine)]
         static internal Stream GetFileStream(string filename) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             (new FileIOPermission(FileIOPermissionAccess.Read, filename)).Assert();
             try {
                 return new FileStream(filename,FileMode.Open,FileAccess.Read,FileShare.Read);
@@ -2141,7 +2141,7 @@ namespace System.Data.Common {
         [ResourceExposure(ResourceScope.Machine)]
         [ResourceConsumption(ResourceScope.Machine)]
         static internal FileVersionInfo GetVersionInfo(string filename) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             (new FileIOPermission(FileIOPermissionAccess.Read, filename)).Assert(); // MDAC 62038
             try {
                 return FileVersionInfo.GetVersionInfo(filename); // MDAC 60411
diff --git a/mcs/class/referencesource/System.Data/System/Data/XMLSchema.cs b/mcs/class/referencesource/System.Data/System/Data/XMLSchema.cs
index f23239bdfdf..6020f65eabe 100644
--- a/mcs/class/referencesource/System.Data/System/Data/XMLSchema.cs
+++ b/mcs/class/referencesource/System.Data/System/Data/XMLSchema.cs
@@ -22,7 +22,7 @@ namespace System.Data {
     internal class XMLSchema {
 
         internal static TypeConverter GetConverter(Type type) { 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             HostProtectionAttribute protAttrib = new HostProtectionAttribute();
             protAttrib.SharedState = true;
             CodeAccessPermission permission = (CodeAccessPermission)protAttrib.CreatePermission();
@@ -32,7 +32,7 @@ namespace System.Data {
                 return TypeDescriptor.GetConverter(type);
             }
             finally {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 CodeAccessPermission.RevertAssert(); 
 #endif
             }
diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/ClassDataContract.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/ClassDataContract.cs
index 9ea613ebc3a..b2448b52d74 100644
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/ClassDataContract.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/ClassDataContract.cs
@@ -580,9 +580,7 @@ namespace System.Runtime.Serialization
         internal bool RequiresMemberAccessForWrite(SecurityException securityException)
         {
 
-#if DISABLE_CAS_USE
-            return true;
-#else
+#if FEATURE_MONO_CAS
             EnsureMethodsImported();
 
             if (!IsTypeVisible(UnderlyingType))
@@ -662,6 +660,8 @@ namespace System.Runtime.Serialization
             }
 
             return false;
+#else
+            return true;
 #endif
         }
 #endif
diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Globals.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Globals.cs
index f18da31004b..b32d295f45b 100644
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Globals.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Globals.cs
@@ -1105,7 +1105,7 @@ namespace System.Runtime.Serialization
             }
         }
 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         [Fx.Tag.SecurityNote(Critical = "Holds instance of SecurityPermission that we will Demand for SerializationFormatter."
             + " Should not be modified to something else.")]
         [SecurityCritical]
diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerContext.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerContext.cs
index 6a71d9a194c..b30c82bf34e 100644
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerContext.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerContext.cs
@@ -89,7 +89,7 @@ namespace System.Runtime.Serialization
         [SecuritySafeCritical]
         public void DemandSerializationFormatterPermission()
         {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             if (!demandedSerializationFormatterPermission)
             {
                 Globals.SerializationFormatterPermission.Demand();
@@ -103,7 +103,7 @@ namespace System.Runtime.Serialization
         [SecuritySafeCritical]
         public void DemandMemberAccessPermission()
         {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             if (!demandedMemberAccessPermission)
             {
                 Globals.MemberAccessPermission.Demand();
diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs
index 3d953393b4b..a61836fc140 100644
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs
@@ -494,7 +494,7 @@ namespace System.Runtime.Serialization
         [MethodImpl(MethodImplOptions.NoInlining)]
         internal void GetObjectData(ISerializable obj, SerializationInfo serInfo, StreamingContext context)
         {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             // Demand the serialization formatter permission every time
             Globals.SerializationFormatterPermission.Demand();
 #endif
diff --git a/mcs/class/referencesource/System.ServiceModel.Internals/System/Runtime/PartialTrustHelpers.cs b/mcs/class/referencesource/System.ServiceModel.Internals/System/Runtime/PartialTrustHelpers.cs
index c243af4a06d..260c7c4265c 100644
--- a/mcs/class/referencesource/System.ServiceModel.Internals/System/Runtime/PartialTrustHelpers.cs
+++ b/mcs/class/referencesource/System.ServiceModel.Internals/System/Runtime/PartialTrustHelpers.cs
@@ -36,9 +36,7 @@ namespace System.Runtime
         [SecurityCritical]
         internal static bool IsInFullTrust()
         {
-#if DISABLE_CAS_USE
-            return true;
-#else
+#if FEATURE_MONO_CAS
             if (!SecurityManager.CurrentThreadRequiresSecurityContextCapture())
             {
                 return true;
@@ -53,6 +51,8 @@ namespace System.Runtime
             {
                 return false;
             }
+#else
+            return true;
 #endif
         }
 #if FEATURE_COMPRESSEDSTACK
@@ -114,11 +114,11 @@ namespace System.Runtime
         [SecurityCritical]
         internal static bool CheckAppDomainPermissions(PermissionSet permissions)
         {
-#if DISABLE_CAS_USE
-            return true;
-#else
+#if FEATURE_MONO_CAS
             return AppDomain.CurrentDomain.IsHomogenous &&
                    permissions.IsSubsetOf(AppDomain.CurrentDomain.PermissionSet);
+#else
+            return true;
 #endif
         }
 
@@ -126,12 +126,12 @@ namespace System.Runtime
         [SecurityCritical]
         internal static bool HasEtwPermissions()
         {
-#if DISABLE_CAS_USE
-            return true;
-#else
+#if FEATURE_MONO_CAS
             //Currently unrestricted permissions are required to create Etw provider. 
             PermissionSet permissions = new PermissionSet(PermissionState.Unrestricted);
             return CheckAppDomainPermissions(permissions);
+#else
+            return true;
 #endif
         }
 
@@ -142,9 +142,7 @@ namespace System.Runtime
             [SecuritySafeCritical]
             get
             {
-#if DISABLE_CAS_USE
-                return true;
-#else
+#if FEATURE_MONO_CAS
                 if (!checkedForFullTrust)
                 {
                     inFullTrust = AppDomain.CurrentDomain.IsFullyTrusted;
@@ -152,6 +150,8 @@ namespace System.Runtime
                 }
 
                 return inFullTrust;
+#else
+                return true;
 #endif
             }
         }
diff --git a/mcs/class/referencesource/System.Xml/System/Xml/XmlSecureResolver.cs b/mcs/class/referencesource/System.Xml/System/Xml/XmlSecureResolver.cs
index 6cd15034393..21727844bd5 100644
--- a/mcs/class/referencesource/System.Xml/System/Xml/XmlSecureResolver.cs
+++ b/mcs/class/referencesource/System.Xml/System/Xml/XmlSecureResolver.cs
@@ -15,23 +15,23 @@ namespace System.Xml {
     [PermissionSetAttribute(SecurityAction.InheritanceDemand, Name = "FullTrust")]
     public partial class XmlSecureResolver : XmlResolver {
         XmlResolver resolver;
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         PermissionSet permissionSet;
 #endif
 
-#if DISABLE_CAS_USE
-        public XmlSecureResolver(XmlResolver resolver, string securityUrl) : this(resolver, (PermissionSet) null) {}
-
-        public XmlSecureResolver(XmlResolver resolver, Evidence evidence) : this(resolver, (PermissionSet) null) {}
-#else
+#if FEATURE_MONO_CAS
         public XmlSecureResolver(XmlResolver resolver, string securityUrl) : this(resolver, CreateEvidenceForUrl(securityUrl)) {}
 
         public XmlSecureResolver(XmlResolver resolver, Evidence evidence) : this(resolver, SecurityManager.GetStandardSandbox(evidence)) {}
+#else
+        public XmlSecureResolver(XmlResolver resolver, string securityUrl) : this(resolver, (PermissionSet) null) {}
+
+        public XmlSecureResolver(XmlResolver resolver, Evidence evidence) : this(resolver, (PermissionSet) null) {}
 #endif
 
         public XmlSecureResolver(XmlResolver resolver, PermissionSet permissionSet) {
             this.resolver = resolver;
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             this.permissionSet = permissionSet;
 #endif
         }
@@ -41,7 +41,7 @@ namespace System.Xml {
         }
 
         public override object GetEntity(Uri absoluteUri, string role, Type ofObjectToReturn) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             permissionSet.PermitOnly();
 #endif
             return resolver.GetEntity(absoluteUri, role, ofObjectToReturn);
@@ -54,7 +54,7 @@ namespace System.Xml {
         }
 
         public static Evidence CreateEvidenceForUrl(string securityUrl) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             Evidence evidence = new Evidence();
             if (securityUrl != null && securityUrl.Length > 0) {
                 evidence.AddHostEvidence(new Url(securityUrl));
@@ -79,7 +79,7 @@ namespace System.Xml {
 #endif
         }
 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         [Serializable]
         private class UncDirectory : EvidenceBase, IIdentityPermissionFactory {
             private string uncDir;
diff --git a/mcs/class/referencesource/System.Xml/System/Xml/XmlSecureResolverAsync.cs b/mcs/class/referencesource/System.Xml/System/Xml/XmlSecureResolverAsync.cs
index 4e8b9fe9683..17b3a199ca5 100644
--- a/mcs/class/referencesource/System.Xml/System/Xml/XmlSecureResolverAsync.cs
+++ b/mcs/class/referencesource/System.Xml/System/Xml/XmlSecureResolverAsync.cs
@@ -7,7 +7,7 @@ namespace System.Xml {
     [PermissionSetAttribute(SecurityAction.InheritanceDemand, Name = "FullTrust")]
     public partial class XmlSecureResolver : XmlResolver {
         public override Task<object> GetEntityAsync(Uri absoluteUri, string role, Type ofObjectToReturn) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             permissionSet.PermitOnly();
 #endif
             return resolver.GetEntityAsync(absoluteUri, role, ofObjectToReturn);
diff --git a/mcs/class/referencesource/System.Xml/System/Xml/Xslt/XslTransform.cs b/mcs/class/referencesource/System.Xml/System/Xml/Xslt/XslTransform.cs
index 5a3acdfce2c..d81a2745e94 100644
--- a/mcs/class/referencesource/System.Xml/System/Xml/Xslt/XslTransform.cs
+++ b/mcs/class/referencesource/System.Xml/System/Xml/Xslt/XslTransform.cs
@@ -116,7 +116,7 @@ namespace System.Xml.Xsl {
             if (stylesheet == null) {
                 throw new ArgumentNullException("stylesheet");
             }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             if (evidence == null) {
                 evidence = new Evidence();
             }
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/DebugReflectPropertyDescriptor.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/DebugReflectPropertyDescriptor.cs
index bc1fc0b40de..e1e0420b28c 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/DebugReflectPropertyDescriptor.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/DebugReflectPropertyDescriptor.cs
@@ -380,7 +380,7 @@ namespace System.ComponentModel {
                     else {
                         args = new Type[] {receiverType};
                     }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                     IntSecurity.FullReflection.Assert();
 #endif
                     try {
@@ -456,7 +456,7 @@ namespace System.ComponentModel {
                     else {
                         args = new Type[] {receiverType};
                     }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                     IntSecurity.FullReflection.Assert();
 #endif
                     try {
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/DebugTypeDescriptor.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/DebugTypeDescriptor.cs
index f752570b56b..ad04d77a513 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/DebugTypeDescriptor.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/DebugTypeDescriptor.cs
@@ -1163,7 +1163,7 @@ namespace System.ComponentModel {
             ///      a single object to be re-used for more than one type. 
             /// </devdoc> 
             private object CreateInstance(Type type) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 if ((!(type.IsPublic || type.IsNestedPublic)) && (type.Assembly == typeof(DebugTypeDescriptor).Assembly)) {
                     IntSecurity.FullReflection.Demand();
                 }
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/IntSecurity.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/IntSecurity.cs
index 6a5fd3a672d..ac39527d8eb 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/IntSecurity.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/IntSecurity.cs
@@ -11,15 +11,13 @@ namespace System.ComponentModel {
 
     [HostProtection(SharedState = true)]
     internal static class IntSecurity {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         public static readonly CodeAccessPermission UnmanagedCode = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
         public static readonly CodeAccessPermission FullReflection = new ReflectionPermission(PermissionState.Unrestricted);
 #endif
 
         public static string UnsafeGetFullPath(string fileName) {
-#if DISABLE_CAS_USE
-			return System.IO.Path.GetFullPath(fileName);
-#else
+#if FEATURE_MONO_CAS
             string full = fileName;
 
             FileIOPermission fiop = new FileIOPermission(PermissionState.None);
@@ -32,6 +30,8 @@ namespace System.ComponentModel {
                 CodeAccessPermission.RevertAssert();
             }
             return full;
+#else
+            return System.IO.Path.GetFullPath(fileName);
 #endif
         }
     }
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/ReflectPropertyDescriptor.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/ReflectPropertyDescriptor.cs
index c79517fc577..401c21e4d66 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/ReflectPropertyDescriptor.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/ReflectPropertyDescriptor.cs
@@ -417,12 +417,12 @@ namespace System.ComponentModel {
                     else {
                         args = new Type[] {receiverType};
                     }
-#if !DISABLE_CAS_USE                    
+#if FEATURE_MONO_CAS
                     IntSecurity.FullReflection.Assert();
                     try {
 #endif
                         resetMethod = FindMethod(componentClass, "Reset" + Name, args, typeof(void), /* publicOnly= */ false);
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                     }
                     finally {
                         CodeAccessPermission.RevertAssert();
@@ -524,13 +524,13 @@ namespace System.ComponentModel {
                         args = new Type[] {receiverType};
                     }
                     
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                     IntSecurity.FullReflection.Assert();
                     try {
 #endif
                         shouldSerializeMethod = FindMethod(componentClass, "ShouldSerialize" + Name,
                                                          args, typeof(Boolean), /* publicOnly= */ false);
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                     }
                     finally {
                         CodeAccessPermission.RevertAssert();
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/ReflectTypeDescriptionProvider.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/ReflectTypeDescriptionProvider.cs
index 3eb2cd79aa4..4061a644a7b 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/ReflectTypeDescriptionProvider.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/ReflectTypeDescriptionProvider.cs
@@ -1635,12 +1635,12 @@ namespace System.ComponentModel {
                         Type converterType = GetTypeFromName(instanceAttr.ConverterTypeName);
                         if (converterType != null && typeof(TypeConverter).IsAssignableFrom(converterType)) 
                         {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                             try {
                                 IntSecurity.FullReflection.Assert();
 #endif
                                 return (TypeConverter)ReflectTypeDescriptionProvider.CreateInstance(converterType, _type);
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                             } finally {
                                 CodeAccessPermission.RevertAssert();
                             }
@@ -1665,12 +1665,12 @@ namespace System.ComponentModel {
                         Type converterType = GetTypeFromName(typeAttr.ConverterTypeName);
                         if (converterType != null && typeof(TypeConverter).IsAssignableFrom(converterType)) 
                         {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                             try {
                                 IntSecurity.FullReflection.Assert();
 #endif
                                 _converter = (TypeConverter)ReflectTypeDescriptionProvider.CreateInstance(converterType, _type);
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                             } finally {
                                 CodeAccessPermission.RevertAssert();
                             }
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/TypeDescriptor.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/TypeDescriptor.cs
index c1e1c43b231..cf77c9972b2 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/TypeDescriptor.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/TypeDescriptor.cs
@@ -365,7 +365,7 @@ namespace System.ComponentModel
             {
                 throw new ArgumentNullException("type");
             }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             PermissionSet typeDescriptorPermission = new PermissionSet(PermissionState.None);
             typeDescriptorPermission.AddPermission(new TypeDescriptorPermission(TypeDescriptorPermissionFlags.RestrictedRegistrationAccess));
 
@@ -401,7 +401,7 @@ namespace System.ComponentModel
             {
                 throw new ArgumentNullException("instance");
             }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             Type type = instance.GetType();
 
             PermissionSet typeDescriptorPermission = new PermissionSet(PermissionState.None);
@@ -475,12 +475,12 @@ namespace System.ComponentModel
                     // sense that they provide a public API while not necessarily being public themselves. As such,
                     // we need to allow instantiation of internal TypeDescriptionProviders. See the thread attached
                     // to VSWhidbey #500522 for a more detailed discussion.
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                     IntSecurity.FullReflection.Assert();
                     try {
 #endif
                         prov = (TypeDescriptionProvider)Activator.CreateInstance(providerType);
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                     }
                     finally {
                         CodeAccessPermission.RevertAssert();
@@ -3244,7 +3244,7 @@ namespace System.ComponentModel
             {
                 throw new ArgumentNullException("type");
             }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             PermissionSet typeDescriptorPermission = new PermissionSet(PermissionState.None);
             typeDescriptorPermission.AddPermission(new TypeDescriptorPermission(TypeDescriptorPermissionFlags.RestrictedRegistrationAccess));
 
@@ -3279,7 +3279,7 @@ namespace System.ComponentModel
             {
                 throw new ArgumentNullException("instance");
             }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             Type type = instance.GetType();
 
             PermissionSet typeDescriptorPermission = new PermissionSet(PermissionState.None);
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/Win32Exception.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/Win32Exception.cs
index b69dd65ff8d..aa7a3d002a7 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/Win32Exception.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/Win32Exception.cs
@@ -75,7 +75,7 @@ namespace System.ComponentModel {
         }
 
         protected Win32Exception(SerializationInfo info, StreamingContext context) : base (info, context) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             IntSecurity.UnmanagedCode.Demand();
 #endif
             nativeErrorCode = info.GetInt32("NativeErrorCode");
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/design/DesigntimeLicenseContext.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/design/DesigntimeLicenseContext.cs
index 6938ce280f6..aff4d8f9fd1 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/design/DesigntimeLicenseContext.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/design/DesigntimeLicenseContext.cs
@@ -93,7 +93,7 @@ namespace System.ComponentModel.Design {
                     Debug.WriteLineIf(RuntimeLicenseContextSwitch.TraceVerbose,"rawfile: " + rawFile);
                     string codeBase;
                     
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                     // FileIOPermission is required for ApplicationBase in URL-hosted domains
                     FileIOPermission perm = new FileIOPermission(PermissionState.Unrestricted);
                     perm.Assert();
@@ -133,7 +133,7 @@ namespace System.ComponentModel.Design {
                             // file://fullpath/foo.exe
                             //
                             string fileName;
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                             FileIOPermission perm = new FileIOPermission(PermissionState.Unrestricted);
                             perm.Assert();
                             try
@@ -166,15 +166,19 @@ namespace System.ComponentModel.Design {
                     else if(!resourceAssembly.IsDynamic) { // EscapedCodeBase won't be supported by emitted assemblies anyway
                         Debug.WriteLineIf(RuntimeLicenseContextSwitch.TraceVerbose,"resourceAssembly is not null");
                         string fileName;
+#if FEATURE_MONO_CAS
                         FileIOPermission perm = new FileIOPermission(PermissionState.Unrestricted);
                         perm.Assert();
+#endif
                         try
                         {
                             fileName = GetLocalPath(resourceAssembly.EscapedCodeBase);
                         }
                         finally
                         {
+#if FEATURE_MONO_CAS
                             CodeAccessPermission.RevertAssert();
+#endif
                         }
                         fileName = Path.GetFileName(fileName); // we don't want to use FileInfo here... it requests FileIOPermission that we
                         // might now have... see VSWhidbey 527758
@@ -254,7 +258,7 @@ namespace System.ComponentModel.Design {
 
         static Stream OpenRead(Uri resourceUri) {
             Stream result = null;
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             PermissionSet perms = new PermissionSet(PermissionState.Unrestricted);
 
             perms.Assert();
@@ -267,7 +271,7 @@ namespace System.ComponentModel.Design {
             catch (Exception e) {
                 Debug.Fail(e.ToString());
             }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             finally {
                 CodeAccessPermission.RevertAssert();
             }
diff --git a/mcs/class/referencesource/System/compmod/system/diagnostics/Trace.cs b/mcs/class/referencesource/System/compmod/system/diagnostics/Trace.cs
index 2f9df3f4564..879c5040a6e 100644
--- a/mcs/class/referencesource/System/compmod/system/diagnostics/Trace.cs
+++ b/mcs/class/referencesource/System/compmod/system/diagnostics/Trace.cs
@@ -30,7 +30,7 @@ namespace System.Diagnostics {
         public static TraceListenerCollection Listeners {
             [HostProtection(SharedState=true)]
             get {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 // Do a full damand
                 new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();
 #endif
@@ -113,7 +113,7 @@ namespace System.Diagnostics {
         /// </devdoc>
         [System.Diagnostics.Conditional("TRACE")]
         public static void Close() {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             // Do a full damand
             new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();
  #endif
diff --git a/mcs/class/referencesource/System/compmod/system/diagnostics/TraceEventCache.cs b/mcs/class/referencesource/System/compmod/system/diagnostics/TraceEventCache.cs
index eee1e05c125..dfa24dcd135 100644
--- a/mcs/class/referencesource/System/compmod/system/diagnostics/TraceEventCache.cs
+++ b/mcs/class/referencesource/System/compmod/system/diagnostics/TraceEventCache.cs
@@ -30,7 +30,7 @@ namespace System.Diagnostics {
             get {
                 if (stackTrace == null)
                     stackTrace = Environment.StackTrace;
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 else
                     new EnvironmentPermission(PermissionState.Unrestricted).Demand();
 #endif
@@ -77,7 +77,7 @@ namespace System.Diagnostics {
         [ResourceExposure(ResourceScope.None)]
         [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         private static void InitProcessInfo() {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             // Demand unmanaged code permission
             new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();
 #endif
diff --git a/mcs/class/referencesource/System/compmod/system/diagnostics/TraceInternal.cs b/mcs/class/referencesource/System/compmod/system/diagnostics/TraceInternal.cs
index 42bbb8a75c0..c400a3e411c 100644
--- a/mcs/class/referencesource/System/compmod/system/diagnostics/TraceInternal.cs
+++ b/mcs/class/referencesource/System/compmod/system/diagnostics/TraceInternal.cs
@@ -62,7 +62,7 @@ namespace System.Diagnostics {
         internal static string AppName {
             get {
                 if (appName == null) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                     new EnvironmentPermission(EnvironmentPermissionAccess.Read, "Path").Assert();
 #endif
                     appName = Path.GetFileName(Environment.GetCommandLineArgs()[0]);
diff --git a/mcs/class/referencesource/System/misc/SecurityUtils.cs b/mcs/class/referencesource/System/misc/SecurityUtils.cs
index d4d39cae5dd..5b622d1768e 100644
--- a/mcs/class/referencesource/System/misc/SecurityUtils.cs
+++ b/mcs/class/referencesource/System/misc/SecurityUtils.cs
@@ -60,7 +60,7 @@ namespace System.Windows.Forms
         }
 
         private static void DemandReflectionAccess(Type type) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             try {
                 MemberAccessPermission.Demand();
             }
@@ -72,7 +72,7 @@ namespace System.Windows.Forms
 
         [SecuritySafeCritical]
         private static void DemandGrantSet(Assembly assembly) {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             PermissionSet targetGrantSet = assembly.PermissionSet;
             targetGrantSet.AddPermission(RestrictedMemberAccessPermission);
             targetGrantSet.Demand();
diff --git a/mcs/class/referencesource/System/net/System/Net/AuthenticationManager.cs b/mcs/class/referencesource/System/net/System/Net/AuthenticationManager.cs
index 53f2e02e598..4413414603e 100644
--- a/mcs/class/referencesource/System/net/System/Net/AuthenticationManager.cs
+++ b/mcs/class/referencesource/System/net/System/Net/AuthenticationManager.cs
@@ -139,7 +139,9 @@ namespace System.Net {
 
             set 
             {
+#if FEATURE_MONO_CAS
                 ExceptionHelper.ControlPolicyPermission.Demand();
+#endif
                 Instance.CredentialPolicy = value;
             }
         }
@@ -203,7 +205,9 @@ namespace System.Net {
         /// </devdoc>
         public static void Register(IAuthenticationModule authenticationModule) 
         {
+#if FEATURE_MONO_CAS
             ExceptionHelper.UnmanagedPermission.Demand();
+#endif
             Instance.Register(authenticationModule);
         }
 
@@ -212,7 +216,9 @@ namespace System.Net {
         /// </devdoc>
         public static void Unregister(IAuthenticationModule authenticationModule) 
         {
+#if FEATURE_MONO_CAS
             ExceptionHelper.UnmanagedPermission.Demand();
+#endif
             Instance.Unregister(authenticationModule);
         }
 
@@ -221,7 +227,9 @@ namespace System.Net {
         /// </devdoc>
         public static void Unregister(string authenticationScheme) 
         {
+#if FEATURE_MONO_CAS
             ExceptionHelper.UnmanagedPermission.Demand();
+#endif
             Instance.Unregister(authenticationScheme);
         }
 
diff --git a/mcs/class/referencesource/System/net/System/Net/AuthenticationSchemeSelector.cs b/mcs/class/referencesource/System/net/System/Net/AuthenticationSchemeSelector.cs
index fec7f5cde35..d111e81a484 100644
--- a/mcs/class/referencesource/System/net/System/Net/AuthenticationSchemeSelector.cs
+++ b/mcs/class/referencesource/System/net/System/Net/AuthenticationSchemeSelector.cs
@@ -5,8 +5,8 @@
 //------------------------------------------------------------------------------
 
 namespace System.Net {
-
+#if SECURITY_DEP
     public delegate AuthenticationSchemes AuthenticationSchemeSelector(HttpListenerRequest httpRequest);
-
+#endif
 }
 
diff --git a/mcs/class/referencesource/System/net/System/Net/Authorization.cs b/mcs/class/referencesource/System/net/System/Net/Authorization.cs
index f9f6b94161e..328546a1e4e 100644
--- a/mcs/class/referencesource/System/net/System/Net/Authorization.cs
+++ b/mcs/class/referencesource/System/net/System/Net/Authorization.cs
@@ -104,6 +104,11 @@ namespace System.Net {
             }
         }
 
+#if MONO
+        // Temporary bridge to old implementation
+        internal string ModuleAuthenticationType;
+#endif
+
     } // class Authorization
 
 
diff --git a/mcs/class/referencesource/System/net/System/Net/Cache/RequestCacheManager.cs b/mcs/class/referencesource/System/net/System/Net/Cache/RequestCacheManager.cs
index d1927650d7f..198f982db9c 100644
--- a/mcs/class/referencesource/System/net/System/Net/Cache/RequestCacheManager.cs
+++ b/mcs/class/referencesource/System/net/System/Net/Cache/RequestCacheManager.cs
@@ -101,11 +101,15 @@ using System.Configuration;
             {
                 if (s_CacheConfigSettings == null)
                 {
+#if MONO
+                    var settings = new RequestCachingSectionInternal();
+#else
                     RequestCachingSectionInternal settings = RequestCachingSectionInternal.GetSection();
 
                     s_DefaultGlobalBinding = new RequestCacheBinding (settings.DefaultCache, settings.DefaultHttpValidator, settings.DefaultCachePolicy);
                     s_DefaultHttpBinding = new RequestCacheBinding (settings.DefaultCache, settings.DefaultHttpValidator, settings.DefaultHttpCachePolicy);
                     s_DefaultFtpBinding = new RequestCacheBinding (settings.DefaultCache, settings.DefaultFtpValidator, settings.DefaultFtpCachePolicy);
+#endif
 
                     s_CacheConfigSettings = settings;
                 }
@@ -113,6 +117,22 @@ using System.Configuration;
         }
     }
 
+#if MONO
+    class RequestCacheValidator
+    {
+        public object CreateValidator ()
+        {
+            throw new NotImplementedException ();
+        }
+    }
+
+    class RequestCachingSectionInternal
+    {
+        // TODO: Implement
+        public readonly bool DisableAllCaching = true;
+    }
+#endif
+
     //
     //
     internal class RequestCacheBinding  {
diff --git a/mcs/class/referencesource/System/net/System/Net/Configuration/DefaultProxySection.cs b/mcs/class/referencesource/System/net/System/Net/Configuration/DefaultProxySection.cs
index 13b735ef54e..cee3b6b2eb8 100644
--- a/mcs/class/referencesource/System/net/System/Net/Configuration/DefaultProxySection.cs
+++ b/mcs/class/referencesource/System/net/System/Net/Configuration/DefaultProxySection.cs
@@ -17,7 +17,7 @@ namespace System.Net.Configuration
     using System.Security.Principal;
     using System.ComponentModel;
 
-
+#if !MONO
     public sealed class DefaultProxySection : ConfigurationSection
     {
         public DefaultProxySection()
@@ -134,9 +134,10 @@ namespace System.Net.Configuration
             base.Reset(defaultElement);
         }
     }
-
+#endif
     internal sealed class DefaultProxySectionInternal
     {
+#if !MONO
         [SecurityPermission(SecurityAction.Assert, Flags=SecurityPermissionFlag.ControlPrincipal)]
         internal DefaultProxySectionInternal(DefaultProxySection section)
         {
@@ -274,6 +275,50 @@ namespace System.Net.Configuration
                 this.webProxy.Credentials = SystemNetworkCredential.defaultCredential;
             }
         }
+#else
+
+        static IWebProxy GetDefaultProxy_UsingOldMonoCode()
+        {
+#if CONFIGURATION_DEP
+            DefaultProxySection sec = ConfigurationManager.GetSection ("system.net/defaultProxy") as DefaultProxySection;
+            WebProxy p;
+            
+            if (sec == null)
+                return GetSystemWebProxy ();
+            
+            ProxyElement pe = sec.Proxy;
+            
+            if ((pe.UseSystemDefault != ProxyElement.UseSystemDefaultValues.False) && (pe.ProxyAddress == null)) {
+                IWebProxy proxy = GetSystemWebProxy ();
+                
+                if (!(proxy is WebProxy))
+                    return proxy;
+                
+                p = (WebProxy) proxy;
+            } else
+                p = new WebProxy ();
+            
+            if (pe.ProxyAddress != null)
+                p.Address = pe.ProxyAddress;
+            
+            if (pe.BypassOnLocal != ProxyElement.BypassOnLocalValues.Unspecified)
+                p.BypassProxyOnLocal = (pe.BypassOnLocal == ProxyElement.BypassOnLocalValues.True);
+                
+            foreach(BypassElement elem in sec.BypassList)
+                p.BypassArrayList.Add(elem.Address);
+            
+            return p;
+#else
+            return GetSystemWebProxy ();
+#endif
+        }
+
+        static IWebProxy GetSystemWebProxy()
+        {
+            return System.Net.WebProxy.CreateDefaultProxy ();
+        }
+
+#endif
 
         internal static object ClassSyncObject
         {
@@ -292,6 +337,11 @@ namespace System.Net.Configuration
         {
             lock (DefaultProxySectionInternal.ClassSyncObject)
             {
+#if MONO
+                var res = new DefaultProxySectionInternal();
+                res.webProxy = GetDefaultProxy_UsingOldMonoCode ();
+                return res;
+#else
                 DefaultProxySection section = PrivilegedConfigurationManager.GetSection(ConfigurationStrings.DefaultProxySectionPath) as DefaultProxySection;
                 if (section == null)
                     return null;
@@ -306,6 +356,7 @@ namespace System.Net.Configuration
 
                     throw new ConfigurationErrorsException(SR.GetString(SR.net_config_proxy), exception);
                 }
+#endif
             }
         }
 
diff --git a/mcs/class/referencesource/System/net/System/Net/CredentialCache.cs b/mcs/class/referencesource/System/net/System/Net/CredentialCache.cs
index 0df18d001be..9f8eda80a01 100644
--- a/mcs/class/referencesource/System/net/System/Net/CredentialCache.cs
+++ b/mcs/class/referencesource/System/net/System/Net/CredentialCache.cs
@@ -302,7 +302,9 @@ namespace System.Net {
             get {
                 //This check will not allow to use local user credentials at will.
                 //Hence the username will not be exposed to the network
+#if FEATURE_MONO_CAS
                 new EnvironmentPermission(EnvironmentPermissionAccess.Read, "USERNAME").Demand();
+#endif
                 return SystemNetworkCredential.defaultCredential;
             }
         }
@@ -311,7 +313,9 @@ namespace System.Net {
             get {
                 //This check will not allow to use local user credentials at will.
                 //Hence the username will not be exposed to the network
+#if FEATURE_MONO_CAS
                 new EnvironmentPermission(EnvironmentPermissionAccess.Read, "USERNAME").Demand();
+#endif
                 return SystemNetworkCredential.defaultCredential;
             }
         }
diff --git a/mcs/class/referencesource/System/net/System/Net/IPAddress.cs b/mcs/class/referencesource/System/net/System/Net/IPAddress.cs
index e6b2f8e0371..e3273c4c9c9 100644
--- a/mcs/class/referencesource/System/net/System/Net/IPAddress.cs
+++ b/mcs/class/referencesource/System/net/System/Net/IPAddress.cs
@@ -171,7 +171,7 @@ namespace System.Net {
             //
             if (ipString.IndexOf(':') != -1 ) {
 
-#if !FEATURE_PAL
+#if !FEATURE_PAL || MONO
                 //
                 // If the address string contains the colon character
                 // then it can only be an IPv6 address. Use a separate
@@ -184,6 +184,7 @@ namespace System.Net {
                 //
                 SocketException e = null;
                 long   scope = 0;
+#if !MONO
                 if(Socket.OSSupportsIPv6)
                 {
                     byte[] bytes = new byte[IPv6AddressBytes];
@@ -221,6 +222,7 @@ namespace System.Net {
                     e = new SocketException();
                 }
                 else
+#endif
                 {
                     unsafe
                     {
@@ -251,7 +253,14 @@ namespace System.Net {
                                 scopeId = scopeId.Substring(1);
                                 if (UInt32.TryParse(scopeId, NumberStyles.None, null, out result))
                                     return new IPAddress(numbers, result);
-
+#if MONO
+                                //
+                                // HACK: .NET does not support scopes with literals at all (API is long based)
+                                // For backward Mono compatibility parsing IPv6 addresses like
+                                // fe80::bae8:56ff:fe47:af7e%en0 will loose en0 information
+                                //
+                                return new IPAddress(numbers, 0);
+#endif
                             }
                         }
                     }
@@ -271,12 +280,13 @@ namespace System.Net {
             else
             // The new IPv4 parser is better than the native one, it can parse 0xFFFFFFFF. (It's faster too).
             {
+#if !MONO
                 // App-Compat: The .NET 4.0 parser used Winsock.  When we removed this initialization in 4.5 it 
                 // uncovered bugs in IIS's management APIs where they failed to initialize Winsock themselves.
                 // DDCC says we need to keep this for an in place release, but to remove it in the next SxS release.
                 Socket.InitializeSockets();
                 ///////////////////////////
-
+#endif
                 int end = ipString.Length;
                 long result;
                 unsafe
@@ -473,8 +483,14 @@ namespace System.Net {
 
                     m_ToString = addressString.ToString();
 #else // !FEATURE_PAL
+
+#if MONO
+                    var v6 = new IPv6AddressFormatter (m_Numbers, ScopeId);
+                    m_ToString = v6.ToString ();
+#else
                     // IPv6 addresses not supported for FEATURE_PAL
                     throw new SocketException(SocketError.OperationNotSupported);
+#endif
 #endif // !FEATURE_PAL
                 }
                 else {
diff --git a/mcs/class/referencesource/System/net/System/Net/Internal.cs b/mcs/class/referencesource/System/net/System/Net/Internal.cs
index 19948efa34e..d04932e503f 100644
--- a/mcs/class/referencesource/System/net/System/Net/Internal.cs
+++ b/mcs/class/referencesource/System/net/System/Net/Internal.cs
@@ -24,6 +24,7 @@ namespace System.Net {
     using System.Net.NetworkInformation;
     using System.Runtime.Serialization;
     using Microsoft.Win32;
+    using System.Collections.Generic;
 
     internal static class IntPtrHelper {
         /*
@@ -142,7 +143,9 @@ namespace System.Net {
 
         private static void DemandCallback(object state)
         {
+#if FEATURE_MONO_CAS
             ((CodeAccessPermission) state).Demand();
+#endif
         }
 
         // This is for checking if a hostname probably refers to this machine without going to DNS.
@@ -172,7 +175,6 @@ namespace System.Net {
         private static volatile IPAddress[] _LocalAddresses;
         private static object _LocalAddressesLock;
 
-#if MONO_NOT_IMPLEMENTED
 #if !FEATURE_PAL
 
         private static volatile NetworkAddressChangePolled s_AddressChange;
@@ -285,6 +287,19 @@ namespace System.Net {
         }
 
 #else // !FEATURE_PAL
+
+        internal static bool IsAddressLocal(IPAddress ipAddress) {
+            IPAddress[] localAddresses = NclUtilities.LocalAddresses;
+            for (int i = 0; i < localAddresses.Length; i++)
+            {
+                if (ipAddress.Equals(localAddresses[i], false))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         private const int HostNameBufferLength = 256;
         internal static string _LocalDomainName;
 
@@ -293,6 +308,9 @@ namespace System.Net {
         //
         private static IPHostEntry GetLocalHost()
         {
+#if MONO
+            return Dns.GetHostByName (Dns.GetHostName ());
+#else
             //
             // IPv6 Changes: If IPv6 is enabled, we can't simply use the
             //               old IPv4 gethostbyname(null). Instead we need
@@ -335,6 +353,7 @@ namespace System.Net {
 
                 return Dns.NativeToHostEntry(nativePointer);
             }
+#endif
 
         } // GetLocalHost
 
@@ -400,7 +419,6 @@ namespace System.Net {
             }
         }
 #endif // !FEATURE_PAL
-#endif
 
         private static object LocalAddressesLock
         {
@@ -948,7 +966,7 @@ namespace System.Net {
 
     internal static class ExceptionHelper
     {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         internal static readonly KeyContainerPermission KeyContainerPermissionOpen = new KeyContainerPermission(KeyContainerPermissionFlags.Open);
         internal static readonly WebPermission WebPermissionUnrestricted = new WebPermission(NetworkAccess.Connect);
         internal static readonly SecurityPermission UnmanagedPermission = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
@@ -981,7 +999,6 @@ namespace System.Net {
             }
         }
 
-#if MONO_FEATURE_WEB_STACK
         internal static WebException IsolatedException {
             get {
                 return new WebException(NetRes.GetWebStatusString("net_requestaborted", WebExceptionStatus.KeepAliveFailure),WebExceptionStatus.KeepAliveFailure, WebExceptionInternalStatus.Isolated, null);
@@ -1005,7 +1022,6 @@ namespace System.Net {
                 return new WebException(NetRes.GetWebStatusString("net_requestaborted", WebExceptionStatus.RequestProhibitedByCachePolicy), WebExceptionStatus.RequestProhibitedByCachePolicy);
             }
         }
-#endif
     }
 
     internal enum WindowsInstallationType
@@ -1893,7 +1909,6 @@ typedef struct _SCHANNEL_CRED
         WriteWait = 2,
     }
 
-#if MONO_FEATURE_WEB_STACK
     //
     // HttpVerb - used to define various per Verb Properties
     //
@@ -1964,7 +1979,6 @@ typedef struct _SCHANNEL_CRED
         }
     }
 
-
     //
     // HttpProtocolUtils - A collection of utility functions for HTTP usage.
     //
@@ -1998,7 +2012,6 @@ typedef struct _SCHANNEL_CRED
             return D.ToUniversalTime().ToString("R", dateFormat);
         }
     }
-#endif
 
 #if !FEATURE_PAL
     // Proxy class for linking between ICertificatePolicy <--> ICertificateDecider
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs
index 393e21431cf..5a67f249f90 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs
@@ -5,6 +5,7 @@ using System.Net;
 using System.Threading.Tasks;
 using System.Security.Permissions;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
 
 namespace System.Net.NetworkInformation
 {
@@ -13,13 +14,41 @@ namespace System.Net.NetworkInformation
     {
         public static IPGlobalProperties GetIPGlobalProperties()
         {
+#if MONODROID
+            return new AndroidIPGlobalProperties ();
+#elif MONOTOUCH || XAMMAC || MOBILE_STATIC
+            return new UnixIPGlobalProperties ();
+#elif MONO
+            switch (Environment.OSVersion.Platform) {
+            case PlatformID.Unix:
+                MibIPGlobalProperties impl = null;
+                if (Directory.Exists (MibIPGlobalProperties.ProcDir)) {
+                    impl = new MibIPGlobalProperties (MibIPGlobalProperties.ProcDir);
+                    if (File.Exists (impl.StatisticsFile))
+                        return impl;
+                }
+                if (Directory.Exists (MibIPGlobalProperties.CompatProcDir)) {
+                    impl = new MibIPGlobalProperties (MibIPGlobalProperties.CompatProcDir);
+                    if (File.Exists (impl.StatisticsFile))
+                        return impl;
+                }
+                return new UnixIPGlobalProperties ();
+            default:
+                return new Win32IPGlobalProperties ();
+            }
+#else          
             (new NetworkInformationPermission(NetworkInformationAccess.Read)).Demand();
             return new SystemIPGlobalProperties();
+#endif
         }
 
         internal static IPGlobalProperties InternalGetIPGlobalProperties()
         {
+#if MONO
+            return GetIPGlobalProperties();
+#else
             return new SystemIPGlobalProperties();
+#endif
         }
 
         /// Gets the Active Udp Listeners on this machine
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/NetworkAddressChange.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/NetworkAddressChange.cs
index 716afeffce1..73db4550389 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/NetworkAddressChange.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/NetworkAddressChange.cs
@@ -26,7 +26,7 @@ namespace System.Net.NetworkInformation {
             }
         }
     }
-
+#if !MONO
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1053:StaticHolderTypesShouldNotHaveConstructors")]
     public class NetworkChange{
     #region designer support for System.Windows.dll
@@ -332,7 +332,7 @@ namespace System.Net.NetworkInformation {
             } //ends ignoreaddresschanges
         }
     }
-
+#endif
     public delegate void NetworkAddressChangedEventHandler(object sender, EventArgs e);
     public delegate void NetworkAvailabilityChangedEventHandler(object sender, NetworkAvailabilityEventArgs e);
 }
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/NetworkInterface.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/NetworkInterface.cs
index 5f594fdd2cf..828f60745a6 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/NetworkInterface.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/NetworkInterface.cs
@@ -8,7 +8,9 @@ namespace System.Net.NetworkInformation
     {
         /// Returns objects that describe the network interfaces on the local computer.
         public static NetworkInterface[] GetAllNetworkInterfaces(){
+#if FEATURE_MONO_CAS
             (new NetworkInformationPermission(NetworkInformationAccess.Read)).Demand();
+#endif
             return SystemNetworkInterface.GetNetworkInterfaces();
         }
 
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/PingOptions.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/PingOptions.cs
index a0152e92111..76f2803c39f 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/PingOptions.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/PingOptions.cs
@@ -9,12 +9,12 @@ namespace System.Net.NetworkInformation
         const int DontFragmentFlag = 2;
         int ttl = 128;
         bool dontFragment;
-
+#if !MONO
         internal PingOptions (IPOptions options) {
             this.ttl = options.ttl;
             this.dontFragment = ((options.flags & DontFragmentFlag) > 0 ? true : false);
         }
-
+#endif
         public PingOptions (int ttl, bool dontFragment) {
             if (ttl <= 0) {
                 throw new ArgumentOutOfRangeException("ttl");
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/PingReply.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/PingReply.cs
index 873f40c8564..d3b010fedb7 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/PingReply.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/PingReply.cs
@@ -37,7 +37,16 @@ namespace System.Net.NetworkInformation
                 buffer = new byte[0];
         }
 
-
+#if MONO
+        internal PingReply (IPAddress address, byte [] buffer, PingOptions options, long roundtripTime, IPStatus status)
+        {
+            this.address = address;
+            this.buffer = buffer;
+            this.options = options;
+            this.rtt = roundtripTime;
+            this.ipStatus = status;
+        }
+#else
         // the main constructor for the icmpsendecho apis
         internal PingReply (IcmpEchoReply reply) {
             address = new IPAddress (reply.address);
@@ -72,7 +81,7 @@ namespace System.Net.NetworkInformation
                 buffer = new byte[0];
 
         }
-
+#endif
 
  
         //translates the relevant icmpsendecho codes to a ipstatus code
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemGatewayIPAddressInformation.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemGatewayIPAddressInformation.cs
index 1c02c328d15..1402c02247d 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemGatewayIPAddressInformation.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemGatewayIPAddressInformation.cs
@@ -9,7 +9,7 @@ namespace System.Net.NetworkInformation
     {
         IPAddress address;
 
-        private SystemGatewayIPAddressInformation(IPAddress address){
+        internal SystemGatewayIPAddressInformation(IPAddress address){
             this.address = address;
         }
 
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemIPAddressInformation.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemIPAddressInformation.cs
index 5e51f779558..feea9b74586 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemIPAddressInformation.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemIPAddressInformation.cs
@@ -24,11 +24,20 @@ namespace System.Net.NetworkInformation {
         internal bool transient = false;
         internal bool dnsEligible = true;
 
+#if MONO
+        public SystemIPAddressInformation(IPAddress address, bool isDnsEligible, bool isTransient)
+        {
+            this.address = address;
+            this.dnsEligible = isDnsEligible;
+            this.transient = isTransient;
+        }
+#else
         internal SystemIPAddressInformation(IPAddress address, AdapterAddressFlags flags) {
             this.address = address;
             transient = (flags & AdapterAddressFlags.Transient) > 0;
             dnsEligible = (flags & AdapterAddressFlags.DnsEligible) > 0;
         }
+#endif
 
         public override IPAddress Address{get {return address;}}
 
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemIPGlobalProperties.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemIPGlobalProperties.cs
index 194627463c0..fa774cf4f34 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemIPGlobalProperties.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemIPGlobalProperties.cs
@@ -9,6 +9,7 @@ namespace System.Net.NetworkInformation {
     using System.Threading;
     using System.Collections.Generic;
 
+#if !MONO
     internal class SystemIPGlobalProperties:IPGlobalProperties {
         private FixedInfo fixedInfo;
         private bool fixedInfoInitialized = false;
@@ -456,7 +457,7 @@ namespace System.Net.NetworkInformation {
 
     }   //ends networkinformation class
 
-   
+#endif   
 
     internal struct FixedInfo{
         internal FIXED_INFO info;
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemTcpConnection.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemTcpConnection.cs
index 1ff5a5598e0..ade419befaa 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemTcpConnection.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemTcpConnection.cs
@@ -20,7 +20,14 @@ namespace System.Net.NetworkInformation {
         IPEndPoint localEndPoint;
         IPEndPoint remoteEndPoint;
         TcpState state;
-
+#if MONO
+        public SystemTcpConnectionInformation (IPEndPoint local, IPEndPoint remote, TcpState state)
+        {
+            localEndPoint = local;
+            remoteEndPoint = remote;
+            this.state = state;
+        }
+#else
         internal SystemTcpConnectionInformation(MibTcpRow row) {
             state = row.state;
 
@@ -47,7 +54,7 @@ namespace System.Net.NetworkInformation {
             localEndPoint = new IPEndPoint(new IPAddress(row.localAddr, row.localScopeId), (int)localPort);
             remoteEndPoint = new IPEndPoint(new IPAddress(row.remoteAddr, row.remoteScopeId), (int)remotePort);
         }
-
+#endif
 
         public override TcpState State{get {return state;}}
         public override IPEndPoint LocalEndPoint{get {return localEndPoint;}}
diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemUnicastIPAddressInformation.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemUnicastIPAddressInformation.cs
index 430bd12676a..66e1e660a1e 100644
--- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemUnicastIPAddressInformation.cs
+++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/SystemUnicastIPAddressInformation.cs
@@ -24,6 +24,7 @@ namespace System.Net.NetworkInformation {
         private uint preferredLifetime;
         private byte prefixLength;
 
+#if !MONO
         internal SystemUnicastIPAddressInformation(IpAdapterUnicastAddress adapterAddress) {
             IPAddress ipAddress = adapterAddress.address.MarshalIPAddress();
             this.innerInfo = new SystemIPAddressInformation(ipAddress, adapterAddress.flags);
@@ -41,6 +42,7 @@ namespace System.Net.NetworkInformation {
                 ipv4Mask = PrefixLengthToSubnetMask(prefixLength, ipAddress.AddressFamily);
             }
         }
+#endif
 
        /// <include file='doc\NetworkInterface.uex' path='docs/doc[@for="IPAddressInformation.Address"]/*' />
         public override IPAddress Address{get {return innerInfo.Address;}}
@@ -128,7 +130,7 @@ namespace System.Net.NetworkInformation {
                 return dhcpLeaseLifetime;
                 }
             }
-        
+#if !MONO
         // Helper method that marshals the addressinformation into the classes
         internal static UnicastIPAddressInformationCollection MarshalUnicastIpAddressInformationCollection(IntPtr ptr) {
             UnicastIPAddressInformationCollection addressList = new UnicastIPAddressInformationCollection();
@@ -167,5 +169,6 @@ namespace System.Net.NetworkInformation {
 
             return new IPAddress(addressBytes);
         }
+#endif
     }
 }
diff --git a/mcs/class/referencesource/System/net/System/Net/ServicePoint.cs b/mcs/class/referencesource/System/net/System/Net/ServicePoint.cs
index 7f71c4ba8a9..2995de9113d 100644
--- a/mcs/class/referencesource/System/net/System/Net/ServicePoint.cs
+++ b/mcs/class/referencesource/System/net/System/Net/ServicePoint.cs
@@ -93,7 +93,9 @@ namespace System.Net {
                 return m_BindIPEndPointDelegate;
             }
             set {
+#if FEATURE_MONO_CAS
                 ExceptionHelper.InfrastructurePermission.Demand();
+#endif
                 m_BindIPEndPointDelegate = value;
             }
         }
@@ -458,11 +460,13 @@ namespace System.Net {
                     throw new NotSupportedException(SR.GetString(SR.net_servicePointAddressNotSupportedInHostMode));
                 }
 
+#if FEATURE_MONO_CAS
                 // Don't let low-trust apps discover the proxy information.
                 if (m_ProxyServicePoint)
                 {
                     ExceptionHelper.WebPermissionUnrestricted.Demand();
                 }
+#endif
 
                 return m_Address;
             }
diff --git a/mcs/class/referencesource/System/net/System/Net/ServicePointManager.cs b/mcs/class/referencesource/System/net/System/Net/ServicePointManager.cs
index ded74015f33..48bb45802f0 100644
--- a/mcs/class/referencesource/System/net/System/Net/ServicePointManager.cs
+++ b/mcs/class/referencesource/System/net/System/Net/ServicePointManager.cs
@@ -22,7 +22,7 @@ namespace System.Net {
     using Microsoft.Win32;
     
     // This turned to be a legacy type name that is simply forwarded to System.Security.Authentication.SslProtocols defined values.
-#if !MONO && !FEATURE_PAL
+#if !FEATURE_PAL || MONO
     [Flags]
     public enum SecurityProtocolType
     {
@@ -31,7 +31,8 @@ namespace System.Net {
         Tls11         = System.Security.Authentication.SslProtocols.Tls11,
         Tls12         = System.Security.Authentication.SslProtocols.Tls12,
     }
-
+#endif
+#if !MONO && !FEATURE_PAL
     internal class CertPolicyValidationCallback
     {
         readonly ICertificatePolicy  m_CertificatePolicy;
diff --git a/mcs/class/referencesource/System/net/System/Net/WebHeaderCollection.cs b/mcs/class/referencesource/System/net/System/Net/WebHeaderCollection.cs
index 49bc92e0936..42743232cf7 100644
--- a/mcs/class/referencesource/System/net/System/Net/WebHeaderCollection.cs
+++ b/mcs/class/referencesource/System/net/System/Net/WebHeaderCollection.cs
@@ -246,7 +246,16 @@ namespace System.Net {
         // this is the object that created the header collection.
         private WebHeaderCollectionType m_Type;
 
-#if !FEATURE_PAL
+#if MONO
+        internal bool AllowMultiValues (string name)
+        {
+            var hinfo = HInfo[name];
+            // Is common header which supports multi value or it's unknown header
+            return hinfo.AllowMultiValues || hinfo.HeaderName == "";
+        }
+#endif
+
+#if !FEATURE_PAL || MONO
         private bool AllowHttpRequestHeader {
             get {
                 if (m_Type==WebHeaderCollectionType.Unknown) {
diff --git a/mcs/class/referencesource/System/net/System/Net/WebRequest.cs b/mcs/class/referencesource/System/net/System/Net/WebRequest.cs
index 1135be0891c..a9be75be0a6 100644
--- a/mcs/class/referencesource/System/net/System/Net/WebRequest.cs
+++ b/mcs/class/referencesource/System/net/System/Net/WebRequest.cs
@@ -4,6 +4,9 @@
 // </copyright>
 //------------------------------------------------------------------------------
 
+#if MONO
+#undef FEATURE_PAL
+#endif
 namespace System.Net {
     using System.Collections;
     using System.Collections.Generic;
@@ -53,6 +56,7 @@ namespace System.Net {
         private  AuthenticationLevel m_AuthenticationLevel;
         private  TokenImpersonationLevel m_ImpersonationLevel;
 #endif
+
         private RequestCachePolicy      m_CachePolicy;
         private RequestCacheProtocol    m_CacheProtocol;
         private RequestCacheBinding     m_CacheBinding;
@@ -361,7 +365,9 @@ namespace System.Net {
                 throw new ArgumentNullException("creator");
             }
 
+#if FEATURE_MONO_CAS
             ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
 
             // Lock this object, then walk down PrefixList looking for a place to
             // to insert this prefix.
@@ -523,7 +529,11 @@ namespace System.Net {
                     lock (InternalSyncObject) {
                         if (s_PrefixList == null) {
                             GlobalLog.Print("WebRequest::Initialize(): calling ConfigurationManager.GetSection()");
+#if MONO
+                            s_PrefixList = PopulatePrefixList ();
+#else
                             s_PrefixList = WebRequestModulesSectionInternal.GetSection().WebRequestModules;
+#endif
                         }
                     }
                 }
@@ -535,6 +545,30 @@ namespace System.Net {
             }
         }
 
+#if MONO
+        static ArrayList PopulatePrefixList ()
+        {
+            var res = new ArrayList();
+
+#if MOBILE || !CONFIGURATION_DEP
+            IWebRequestCreate http = new HttpRequestCreator ();
+            res.Add(new WebRequestPrefixElement("http", http));
+            res.Add(new WebRequestPrefixElement("https", http));
+            res.Add(new WebRequestPrefixElement("file", new FileWebRequestCreator ()));
+            res.Add(new WebRequestPrefixElement("ftp", new FtpRequestCreator ()));
+#else
+            object cfg = ConfigurationManager.GetSection ("system.net/webRequestModules");
+            WebRequestModulesSection s = cfg as WebRequestModulesSection;
+            if (s != null) {
+                foreach (WebRequestModuleElement el in s.WebRequestModules)
+                    res.Add (new WebRequestPrefixElement(el.Prefix, el.Type));
+            }
+#endif
+            return res;
+        }
+#endif
+
+
         // constructors
 
         /// <devdoc>
@@ -588,8 +622,10 @@ namespace System.Net {
                 return RequestCacheManager.GetBinding(string.Empty).Policy;
             }
             set {
+#if FEATURE_MONO_CAS
                 // This is a replacement of RequestCachePermission demand since we are not including the latest in the product.
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
 
                 RequestCacheBinding binding = RequestCacheManager.GetBinding(string.Empty);
                 RequestCacheManager.SetBinding(string.Empty, new RequestCacheBinding(binding.Cache, binding.Validator, value));
@@ -975,7 +1011,7 @@ namespace System.Net {
             }
         }
 
-
+#if !MONO
         // Methods to retrieve the context of the "reading phase" and of the "writing phase" of the request.
         // Each request type can define what goes into what phase.  Typically, the writing phase corresponds to
         // GetRequestStream() and the reading phase to GetResponse(), but if there's no request body, both phases
@@ -996,7 +1032,7 @@ namespace System.Net {
         {
             throw ExceptionHelper.MethodNotImplementedException;
         }
-
+#endif
 
         //
         //
@@ -1072,13 +1108,17 @@ namespace System.Net {
         {
             get
             {
+#if FEATURE_MONO_CAS
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
                 return InternalDefaultWebProxy;
             }
 
             set
             {
+#if FEATURE_MONO_CAS
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
                 InternalDefaultWebProxy = value;
             }
         }
@@ -1088,13 +1128,20 @@ namespace System.Net {
         //
         public static IWebProxy GetSystemWebProxy()
         {
+#if FEATURE_MONO_CAS
             ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
             return InternalGetSystemWebProxy();
         }
 
         internal static IWebProxy InternalGetSystemWebProxy()
         {
+#if MONO
+            // FIXME: Need to break mobile internal API
+            return WebProxy.CreateDefaultProxy();
+#else
             return new WebProxyWrapperOpaque(new WebProxy(true));
+#endif
         }
 
         //
@@ -1162,7 +1209,7 @@ namespace System.Net {
             }
         }
 
-
+#if !MONO
         //
         internal void SetupCacheProtocol(Uri uri)
         {
@@ -1242,5 +1289,6 @@ namespace System.Net {
                 s_EtwFireEndGetRequestStream(this, success, synchronous);
             }
         }
+#endif
     } // class WebRequest
 } // namespace System.Net
diff --git a/mcs/class/referencesource/System/net/System/Net/_Connection.cs b/mcs/class/referencesource/System/net/System/Net/_Connection.cs
index b3e49c94092..d52fcbca150 100644
--- a/mcs/class/referencesource/System/net/System/Net/_Connection.cs
+++ b/mcs/class/referencesource/System/net/System/Net/_Connection.cs
@@ -17,12 +17,14 @@ namespace System.Net {
     using System.Net.Configuration;
     using System.Diagnostics.CodeAnalysis;
 
+#if !MONO
     internal enum ReadState {
         Start,
         StatusLine, // about to parse status line
         Headers,    // reading headers
         Data        // now read data
     }
+#endif
 
     internal enum DataParseStatus {
         NeedMoreData = 0,   // need more data
@@ -64,7 +66,7 @@ namespace System.Net {
         public WebParseErrorCode     Code;
     }
 
-
+#if !MONO
     struct TunnelStateObject {
         internal TunnelStateObject(HttpWebRequest r, Connection c){
             Connection = c;
@@ -3846,4 +3848,5 @@ done:
         }
 #endif
     }
+#endif
 }
diff --git a/mcs/class/referencesource/System/net/System/Net/_SafeNetHandles.cs b/mcs/class/referencesource/System/net/System/Net/_SafeNetHandles.cs
index 2a7463906e8..4d283be6874 100644
--- a/mcs/class/referencesource/System/net/System/Net/_SafeNetHandles.cs
+++ b/mcs/class/referencesource/System/net/System/Net/_SafeNetHandles.cs
@@ -315,6 +315,8 @@ namespace System.Net {
 #endif // !FEATURE_PAL
 
     }
+
+#if !MONO
     //
     // This class is a wrapper for Http.sys V2 request queue handle.
     //
@@ -389,7 +391,7 @@ namespace System.Net {
             return true;
         }
     }
-
+#endif
     //
     // SafeHandle to wrap handles created by IcmpCreateFile or Icmp6CreateFile
     // from either icmp.dll or iphlpapi.dll. These handles must be closed by
@@ -412,6 +414,7 @@ namespace System.Net {
         }
     }
 
+#if !MONO
     //
     // Used when working with WinHTTP APIs, like WinHttpOpen(). Holds the HINTERNET handle.
     //
@@ -447,6 +450,7 @@ namespace System.Net {
             return UnsafeNclNativeMethods.SspiHelper.SspiFreeAuthIdentity(handle) == SecurityStatus.OK;
         }
     }
+#endif
     
 #if !FEATURE_PAL
 
@@ -676,6 +680,7 @@ namespace System.Net {
         }
     }
 
+#if !MONO
     ///////////////////////////////////////////////////////////////
     //
     // A few Win32 APIs return pointers to blobs that need GlobalFree().
@@ -754,6 +759,7 @@ namespace System.Net {
             return UnsafeNclNativeMethods.SafeNetHandles.LocalFree(handle) == IntPtr.Zero;
         }
     }
+#endif
 
 #if !FEATURE_PAL
     [SuppressUnmanagedCodeSecurity]
@@ -2136,6 +2142,7 @@ namespace System.Net {
 
 #endif // !FEATURE_PAL
 
+#if !MONO
     internal class SafeNativeOverlapped : SafeHandle
     {
         internal static readonly SafeNativeOverlapped Zero = new SafeNativeOverlapped();
@@ -2740,6 +2747,7 @@ namespace System.Net {
         }
 
     }
+#endif
 
 #if !FEATURE_PAL
 
diff --git a/mcs/class/referencesource/System/net/System/Net/_SecureChannel.cs b/mcs/class/referencesource/System/net/System/Net/_SecureChannel.cs
index 86644c661ac..9f04a33e0b7 100644
--- a/mcs/class/referencesource/System/net/System/Net/_SecureChannel.cs
+++ b/mcs/class/referencesource/System/net/System/Net/_SecureChannel.cs
@@ -381,7 +381,7 @@ namespace System.Net.Security {
                 // demand the same permissions, then we should remove our
                 // demand here.
                 //
-                #if !DISABLE_CAS_USE
+                #if FEATURE_MONO_CAS
                 ExceptionHelper.KeyContainerPermissionOpen.Demand(); 
                 #endif
                 
@@ -437,7 +437,7 @@ namespace System.Net.Security {
                             // For v 1.1 compat We want to ensure the store is opened under the **process** acount.
                             //
                             try {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                                 using (WindowsIdentity.Impersonate(IntPtr.Zero))
 #endif
                                 {
@@ -583,7 +583,7 @@ namespace System.Net.Security {
         //          Note: We call a user certificate selection delegate under permission
         //          assert but the signature of the delegate is unique so it's safe
         //
-        #if !DISABLE_CAS_USE
+        #if FEATURE_MONO_CAS
         [StorePermission(SecurityAction.Assert, Unrestricted=true)]
         #endif
         private bool AcquireClientCredentials(ref byte[] thumbPrint)
@@ -826,7 +826,7 @@ namespace System.Net.Security {
         //          Note: We call a user certificate selection delegate under permission
         //          assert but the signature of the delegate is unique so it's safe
         //
-        #if !DISABLE_CAS_USE
+        #if FEATURE_MONO_CAS
         [StorePermission(SecurityAction.Assert, Unrestricted=true)]
         #endif
         private bool AcquireServerCredentials(ref byte[] thumbPrint)
@@ -906,7 +906,7 @@ namespace System.Net.Security {
                 //
                 // For v 1.1 compat We want to ensure the credential are accessed under >>process<< acount.
                 //
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 using (WindowsIdentity.Impersonate(IntPtr.Zero))
 #endif
                 {
@@ -1285,7 +1285,7 @@ namespace System.Net.Security {
         //SECURITY: The scenario is allowed in semitrust StorePermission is asserted for Chain.Build
         //          A user callback has unique signature so it is safe to call it under permisison assert.
         //
-        #if !DISABLE_CAS_USE
+        #if FEATURE_MONO_CAS
         [StorePermission(SecurityAction.Assert, Unrestricted=true)]
         #endif
         internal bool VerifyRemoteCertificate(RemoteCertValidationCallback remoteCertValidationCallback)
diff --git a/mcs/class/referencesource/System/net/System/Net/_Semaphore.cs b/mcs/class/referencesource/System/net/System/Net/_Semaphore.cs
index 4d289ac7bc9..0365206cf5f 100644
--- a/mcs/class/referencesource/System/net/System/Net/_Semaphore.cs
+++ b/mcs/class/referencesource/System/net/System/Net/_Semaphore.cs
@@ -20,8 +20,13 @@ namespace System.Net
     {
         internal Semaphore(int initialCount, int maxCount) : base() {
             lock (this) {
+#if MONO
+                int errorCode;
+                Handle = System.Threading.Semaphore.CreateSemaphore_internal(initialCount, maxCount, null, out errorCode);
+#else
                 // 
                 Handle = UnsafeNclNativeMethods.CreateSemaphore(IntPtr.Zero, initialCount, maxCount, IntPtr.Zero);
+#endif
             }
         }
 
@@ -36,14 +41,19 @@ namespace System.Net
 */
 
         internal bool ReleaseSemaphore() {
-#if DEBUG        
+#if MONO
+            int previousCount;
+            return System.Threading.Semaphore.ReleaseSemaphore_internal (Handle, 1, out previousCount);
+#else
+#if DEBUG
             int previousCount;
             bool success = UnsafeNclNativeMethods.ReleaseSemaphore(Handle, 1, out previousCount);        
             GlobalLog.Print("ReleaseSemaphore#"+ValidationHelper.HashString(this)+" success:"+success+" previousCount:"+previousCount.ToString());
             return success;
 #else            
             return UnsafeNclNativeMethods.ReleaseSemaphore(Handle, 1, IntPtr.Zero);
-#endif            
+#endif
+#endif
         }
 
         /*
diff --git a/mcs/class/referencesource/System/net/System/Net/_SpnDictionary.cs b/mcs/class/referencesource/System/net/System/Net/_SpnDictionary.cs
index 29eb3e52549..e9410023641 100644
--- a/mcs/class/referencesource/System/net/System/Net/_SpnDictionary.cs
+++ b/mcs/class/referencesource/System/net/System/Net/_SpnDictionary.cs
@@ -43,7 +43,9 @@ namespace System.Net {
         //
         public override int Count {
             get {
+#if FEATURE_MONO_CAS
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
                 return m_SyncTable.Count;
             }
         }
@@ -106,7 +108,9 @@ namespace System.Net {
         //
         public override ICollection Keys {
             get {
+#if FEATURE_MONO_CAS
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
                 return m_SyncTable.Keys;
             }
         }
@@ -114,14 +118,18 @@ namespace System.Net {
         public override object SyncRoot {
             [HostProtection(Synchronization=true)]
             get {
+#if FEATURE_MONO_CAS
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
                 return m_SyncTable;
             }
         }
         //
         public override ICollection Values {
             get {
+#if FEATURE_MONO_CAS
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
                 if (m_ValuesWrapper == null)
                 {
                     m_ValuesWrapper = new ValueCollection(this);
@@ -136,7 +144,9 @@ namespace System.Net {
         }
         //
         public override void Clear() {
+#if FEATURE_MONO_CAS
             ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
             m_SyncTable.Clear();
         }
         //
@@ -146,7 +156,9 @@ namespace System.Net {
         }
         //
         public override bool ContainsValue(string value) {
+#if FEATURE_MONO_CAS
             ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
             foreach (SpnToken spnToken in m_SyncTable.Values)
             {
                 if (spnToken.Spn == value)
@@ -157,7 +169,9 @@ namespace System.Net {
 
         // We have to unwrap the SpnKey and just expose the Spn
         public override void CopyTo(Array array, int index) {
+#if FEATURE_MONO_CAS
             ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
             CheckCopyToArguments(array, index, Count);
 
             int offset = 0;
@@ -169,7 +183,9 @@ namespace System.Net {
         }
         //
         public override IEnumerator GetEnumerator() {
+#if FEATURE_MONO_CAS
             ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
 
             foreach (string key in m_SyncTable.Keys)
             {
@@ -195,7 +211,9 @@ namespace System.Net {
             try {
                 Uri uri = new Uri(key);
                 key = uri.GetParts(UriComponents.Scheme | UriComponents.Host | UriComponents.Port | UriComponents.Path, UriFormat.SafeUnescaped);
+#if FEATURE_MONO_CAS
                 new WebPermission(NetworkAccess.Connect, new Uri(key)).Demand();
+#endif
             }
             catch(UriFormatException e) {
                 throw new ArgumentException(SR.GetString(SR.net_mustbeuri, "key"), "key", e);
diff --git a/mcs/class/referencesource/System/net/System/Net/_TimerThread.cs b/mcs/class/referencesource/System/net/System/Net/_TimerThread.cs
index 059e88d5bcd..c75a7136694 100644
--- a/mcs/class/referencesource/System/net/System/Net/_TimerThread.cs
+++ b/mcs/class/referencesource/System/net/System/Net/_TimerThread.cs
@@ -182,7 +182,9 @@ namespace System.Net {
 
         static TimerThread() {
             s_ThreadEvents = new WaitHandle[] { s_ThreadShutdownEvent, s_ThreadReadyEvent };
+#if MONO_FEATURE_MULTIPLE_APPDOMAINS
             AppDomain.CurrentDomain.DomainUnload += new EventHandler(OnDomainUnload);
+#endif
         }
 
         /// <summary>
diff --git a/mcs/class/referencesource/System/net/System/Net/filewebrequest.cs b/mcs/class/referencesource/System/net/System/Net/filewebrequest.cs
index 4ae8d5c7c05..0db05f3620e 100644
--- a/mcs/class/referencesource/System/net/System/Net/filewebrequest.cs
+++ b/mcs/class/referencesource/System/net/System/Net/filewebrequest.cs
@@ -246,9 +246,11 @@ namespace System.Net {
                 if(Logging.On)Logging.Exception(Logging.Web, this, "BeginGetRequestStream", exception);
                 throw;
             } finally {
+#if !MONO
                 if (FrameworkEventSource.Log.IsEnabled()) {
                     LogBeginGetRequestStream(success, synchronous: false);
                 }
+#endif
                 GlobalLog.Leave("FileWebRequest::BeginGetRequestSteam");
             }
 
@@ -280,9 +282,11 @@ namespace System.Net {
                 if(Logging.On)Logging.Exception(Logging.Web, this, "BeginGetResponse", exception);
                 throw;
             } finally {
+#if !MONO
                 if (FrameworkEventSource.Log.IsEnabled()) {
                     LogBeginGetResponse(success, synchronous: false);
                 }
+#endif
                 GlobalLog.Leave("FileWebRequest::BeginGetResponse");
             }
 
@@ -319,9 +323,11 @@ namespace System.Net {
                 throw;
             } finally {
                 GlobalLog.Leave("FileWebRequest::EndGetRequestStream");
+#if !MONO
                 if (FrameworkEventSource.Log.IsEnabled()) {
                     LogEndGetRequestStream(success, synchronous: false);
                 }
+#endif
             }
 
             return stream;
@@ -355,10 +361,12 @@ namespace System.Net {
             } finally {
                 GlobalLog.Leave("FileWebRequest::EndGetResponse");
 
+#if !MONO
                 // there is no statusCode in FileWebRequest object, defaulting it to zero.
                 if (FrameworkEventSource.Log.IsEnabled()) {
                     LogEndGetResponse(success, synchronous: false, statusCode: 0);
                 }
+#endif
             }
 
             return response;
diff --git a/mcs/class/referencesource/System/net/System/Net/webclient.cs b/mcs/class/referencesource/System/net/System/Net/webclient.cs
index 62ca59ada63..80acb75ad34 100644
--- a/mcs/class/referencesource/System/net/System/Net/webclient.cs
+++ b/mcs/class/referencesource/System/net/System/Net/webclient.cs
@@ -238,7 +238,7 @@ namespace System.Net {
         /// </devdoc>
         public IWebProxy Proxy {
             get {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
 #endif
                 if (!m_ProxySet) {
@@ -248,7 +248,7 @@ namespace System.Net {
                 }
             }
             set {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
 #endif
                 m_Proxy = value;
diff --git a/mcs/class/referencesource/System/net/System/Net/webproxy.cs b/mcs/class/referencesource/System/net/System/Net/webproxy.cs
index ca05e1355e5..fe5858875fa 100644
--- a/mcs/class/referencesource/System/net/System/Net/webproxy.cs
+++ b/mcs/class/referencesource/System/net/System/Net/webproxy.cs
@@ -414,7 +414,9 @@ namespace System.Net {
         /// </devdoc>
         [Obsolete("This method has been deprecated. Please use the proxy selected for you by default. http://go.microsoft.com/fwlink/?linkid=14202")]
         public static WebProxy GetDefaultProxy() {
+#if FEATURE_MONO_CAS
             ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
             return new WebProxy(true);
         }
 
@@ -435,7 +437,9 @@ namespace System.Net {
             if (useRegistry) {
                 // just make the proxy advanced, don't populate with any settings
                 // note - this will happen in the context of the user performing the deserialization (their proxy settings get read)
+#if FEATURE_MONO_CAS
                 ExceptionHelper.WebPermissionUnrestricted.Demand();
+#endif
                 UnsafeUpdateFromRegistry();
                 return;
             }
@@ -497,6 +501,28 @@ namespace System.Net {
             }
         }
 
+#if MONO
+        public static IWebProxy CreateDefaultProxy ()
+        {
+#if MONOTOUCH
+            return Mono.Net.CFNetwork.GetDefaultProxy ();
+#elif MONODROID
+            // Return the system web proxy.  This only works for ICS+.
+            var data = AndroidPlatform.GetDefaultProxy ();
+            if (data != null)
+                return data;
+#else
+            if (Platform.IsMacOS) {
+                var data = Mono.Net.CFNetwork.GetDefaultProxy ();
+                if (data != null)
+                    return data;
+            }
+#endif
+
+            return new WebProxy (true);
+        }
+#endif
+
         // This constructor is used internally to make WebProxies that read their state from the registry.
         // 
         internal WebProxy(bool enableAutoproxy)
@@ -515,7 +541,7 @@ namespace System.Net {
         internal void UnsafeUpdateFromRegistry() {
             GlobalLog.Assert(!_UseRegistry, "WebProxy#{0}::UnsafeUpdateFromRegistry()|_UseRegistry ScriptEngine#{1}", ValidationHelper.HashString(this), ValidationHelper.HashString(m_ScriptEngine));
             _UseRegistry = true;
-#if !FEATURE_PAL
+#if !FEATURE_PAL || !MOBILE
             ScriptEngine = new AutoWebProxyScriptEngine(this, true);
             WebProxyData webProxyData = ScriptEngine.GetWebProxyData();
 
diff --git a/mcs/class/referencesource/System/net/System/URI.cs b/mcs/class/referencesource/System/net/System/URI.cs
index 4e565d3242c..8a69ca2fae8 100644
--- a/mcs/class/referencesource/System/net/System/URI.cs
+++ b/mcs/class/referencesource/System/net/System/URI.cs
@@ -3,7 +3,9 @@
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
 //------------------------------------------------------------------------------
-
+#if MONO
+#undef PLATFORM_UNIX
+#endif
 namespace System {
     using System.Runtime.InteropServices;
     using System.Text;
@@ -123,6 +125,10 @@ namespace System {
             QueryIriCanonical =         0x20000000000,
             FragmentIriCanonical =      0x40000000000,
             IriCanonical =              0x78000000000,
+
+#if MONO
+            CompressedSlashes = 0x100000000000
+#endif
         }
 
         private Flags       m_Flags;
@@ -234,16 +240,18 @@ namespace System {
                    ((s_IdnScope == UriIdnScope.All) || ((s_IdnScope == UriIdnScope.AllExceptIntranet)
                                                                             && StaticNotAny(flags, Flags.IntranetUri))));
         }
-
+#if !MONO
         //
         // check if the scheme + host are in intranet or not
         // Used to determine of we apply idn or not
         //
         private static volatile IInternetSecurityManager s_ManagerRef = null;
         private static object s_IntranetLock = new object();
+#endif
 
         private bool IsIntranet(string schemeHost)
         {
+#if !MONO
             bool error = false;
             int zone = -1;
             int E_FAIL = unchecked((int)0x80004005);
@@ -309,6 +317,7 @@ namespace System {
                 }
                 return true;
             }
+#endif
             return false;
         }
 
@@ -461,8 +470,14 @@ namespace System {
 
         private void CreateUri(Uri baseUri, string relativeUri, bool dontEscape)
         {
+            const UriKind kind =
+#if MONO
+                DotNetRelativeOrAbsolute;
+#else
+                RelativeOrAbsolute;
+#endif
             // Parse relativeUri and populate Uri internal data.
-            CreateThis(relativeUri, dontEscape, UriKind.RelativeOrAbsolute);
+            CreateThis(relativeUri, dontEscape, kind);
 
             UriFormatException e;
             if (baseUri.Syntax.IsSimple)
@@ -953,12 +968,30 @@ namespace System {
 
         // Value from config Uri section
         // The use of this IDN mechanic is discouraged on Win8+ due to native platform improvements.
-        private static volatile UriIdnScope s_IdnScope = IdnElement.EnabledDefaultValue;
+        private static volatile UriIdnScope s_IdnScope = 
+#if !CONFIGURATION_DEP
+            UriIdnScope.None;
+#else
+            IdnElement.EnabledDefaultValue;
+#endif
 
         // Value from config Uri section
         // On by default in .NET 4.5+ and cannot be disabled by config.
         private static volatile bool s_IriParsing = 
+#if MONO
+            !(Environment.GetEnvironmentVariable ("MONO_URI_IRIPARSING") == "false");
+#else
             (UriParser.ShouldUseLegacyV2Quirks ? IriParsingElement.EnabledDefaultValue : true);
+#endif
+
+#if MONO
+        // HACK for paths such as "/foo" to be absolute regardless of platform
+        static bool useDotNetRelativeOrAbsolute = Environment.GetEnvironmentVariable ("MONO_URI_DOTNETRELATIVEORABSOLUTE") == "true";
+
+        const UriKind DotNetRelativeOrAbsolute = (UriKind) 300;
+
+        internal static readonly bool IsWindowsFileSystem = System.IO.Path.DirectorySeparatorChar == '\\';
+#endif
 
         private static object s_initLock;
 
@@ -983,7 +1016,7 @@ namespace System {
             if (!s_ConfigInitialized) {
                 lock(InitializeLock) {
                     if (!s_ConfigInitialized && !s_ConfigInitializing) {
-
+#if !MONO
                         // setting s_ConfigInitializing to true makes sure, that in web scenarios,
                         // where Uri instances may be created while parsing the web.config files, will not
                         // call into this code block again. We'll enter the following code only once per
@@ -1003,14 +1036,14 @@ namespace System {
                             SetEscapedDotSlashSettings(section, Uri.UriSchemeWs);
                             SetEscapedDotSlashSettings(section, Uri.UriSchemeWss);
                         }
-
+#endif
                         s_ConfigInitialized = true;
                         s_ConfigInitializing = false;
                     }
                 }
             }
         }
-
+#if !MONO
         // Legacy - This no longer has any affect in .NET 4.5 (non-quirks). See UriParser.HttpSyntaxFlags.
         private static void SetEscapedDotSlashSettings(UriSectionInternal uriSection, string scheme)
         {
@@ -1032,12 +1065,19 @@ namespace System {
                 }
             }
         }
-
+#endif
         private string GetLocalPath(){
             EnsureParseRemaining();
 
+#if MONO
+            //
+            // I think this is wrong but it keeps LocalPath fully backward compatible
+            //
+            if (IsUncOrDosPath && (IsWindowsFileSystem || !IsUncPath))
+#else
             //Other cases will get a Unix-style path
             if (IsUncOrDosPath)
+#endif
             {
                 EnsureHostString(false);
                 int start;
@@ -2116,8 +2156,19 @@ namespace System {
                         {
                             // see VsWhidbey#226745 V1.0 did not support file:///, fixing it with minimal behavior change impact
                             // Only FILE scheme may have UNC Path flag set
+#if MONO
+                            if (!IsWindowsFileSystem) {
+                                if (i - idx > 3) {
+                                    m_Flags |= Flags.CompressedSlashes;
+                                    idx = i;
+                                }
+                            } else {
+#endif
                             m_Flags |= Flags.UncPath;
                             idx = i;
+#if MONO
+                            }
+#endif
                         }
                     }
                 }
@@ -2128,8 +2179,8 @@ namespace System {
 #if !PLATFORM_UNIX
                 if ((m_Flags & (Flags.UncPath|Flags.DosPath)) != 0) {
                 }
-#else
-                if ((m_Flags & Flags.ImplicitFile) != 0) {
+// #else
+                else if (!IsWindowsFileSystem && (m_Flags & (Flags.ImplicitFile|Flags.CompressedSlashes)) != 0) {
                     // Already parsed up to the path
                 }
 #endif // !PLATFORM_UNIX
@@ -2140,9 +2191,9 @@ namespace System {
                     if (m_Syntax.InFact(UriSyntaxFlags.MustHaveAuthority)) {
                         // (V1.0 compatiblity) This will allow http:\\ http:\/ http:/\
 #if !PLATFORM_UNIX
-                        if ((first == '/' || first == '\\') && (second == '/' || second == '\\'))
-#else
-                        if (first == '/' && second == '/')
+                        if ((IsWindowsFileSystem && (first == '/' || first == '\\') && (second == '/' || second == '\\')) ||
+// #else
+                        (!IsWindowsFileSystem && (first == '/' && second == '/')))
 #endif // !PLATFORM_UNIX
                         {
                             m_Flags |= Flags.AuthorityFound;
@@ -2300,7 +2351,7 @@ namespace System {
 
                     idx+=2;
 #if !PLATFORM_UNIX
-                    if ((cF & (Flags.UncPath|Flags.DosPath)) != 0) {
+                    if ((cF & (Flags.UncPath|Flags.DosPath|Flags.CompressedSlashes)) != 0) {
                         // Skip slashes if it was allowed during ctor time
                         // NB: Today this is only allowed if a Unc or DosPath was found after the scheme
                         while( idx < (ushort)(cF & Flags.IndexMask) && (m_String[idx] == '/' || m_String[idx] == '\\')) {
@@ -3632,7 +3683,7 @@ namespace System {
                 return 0;
             }
 #if !PLATFORM_UNIX
-            else if ((c=uriString[idx]) == '/' || c == '\\') {
+            else if (((c=uriString[idx]) == '/' && IsWindowsFileSystem) || c == '\\') {
                 //UNC share ?
                 if ((c=uriString[idx+1]) == '\\' || c == '/') {
                     flags |= (Flags.UncPath|Flags.ImplicitFile|Flags.AuthorityFound);
@@ -3647,7 +3698,6 @@ namespace System {
                 err = ParsingError.BadFormat;
                 return 0;
             }
-#else
             else if (uriString[idx] == '/') {
                 // On UNIX an implicit file has the form /<path> or scheme:///<path>
                 if (idx == 0 || uriString[idx-1] != ':' ) {
@@ -3901,8 +3951,14 @@ namespace System {
             {
                 if (syntax.InFact(UriSyntaxFlags.AllowEmptyHost))
                 {
+#if !PLATFORM_UNIX
                     flags &= ~Flags.UncPath;    //UNC cannot have an empty hostname
-                    if (StaticInFact(flags, Flags.ImplicitFile))
+#endif
+                    if (StaticInFact(flags, Flags.ImplicitFile)
+#if MONO
+                     && (pString[idx] != '/' || IsWindowsFileSystem)
+#endif
+                     )
                         err = ParsingError.BadHostName;
                     else
                         flags |= Flags.BasicHostType;
@@ -3912,6 +3968,14 @@ namespace System {
 
                 if (hasUnicode && iriParsing && hostNotUnicodeNormalized){
                     flags |= Flags.HostUnicodeNormalized;// no host
+
+#if MONO
+                    // I am not certain this is the best fix but for Unix implicit paths with
+                    // unicode characters the host must be valid (null or non-empty) as
+                    // CreateUriInfo assumes. This should happen only for paths like /foo/path-with-unicode
+                    if (newHost.Length == 0 && (flags & Flags.BasicHostType) != 0)
+                        newHost = null;
+#endif
                 }
 
                  return idx;
@@ -5117,6 +5181,7 @@ namespace System {
            else {
                if (basePart.IsImplicitFile) {
 #if !PLATFORM_UNIX
+                if (IsWindowsFileSystem)
                    if (basePart.IsDosPath) {
                        // The FILE DOS path comes as /c:/path, we have to exclude first 3 chars from compression
                        path = Compress(path, 3, ref length, basePart.Syntax);
@@ -5125,7 +5190,8 @@ namespace System {
                    else {
                        left =  @"\\" + basePart.GetParts(UriComponents.Host, UriFormat.Unescaped);
                    }
-#else
+//#else
+                else
                    left =  basePart.GetParts(UriComponents.Host, UriFormat.Unescaped);
 #endif // !PLATFORM_UNIX
 
diff --git a/mcs/class/referencesource/System/net/System/UriExt.cs b/mcs/class/referencesource/System/net/System/UriExt.cs
index 8d03b121435..9f55631246f 100644
--- a/mcs/class/referencesource/System/net/System/UriExt.cs
+++ b/mcs/class/referencesource/System/net/System/UriExt.cs
@@ -17,6 +17,9 @@ Author:
 Revision History:
 
 --*/
+#if MONO
+#undef PLATFORM_UNIX
+#endif
 
 namespace System {
     using System.Globalization;
@@ -33,6 +36,9 @@ namespace System {
             // if (!Enum.IsDefined(typeof(UriKind), uriKind)) -- We currently believe that Enum.IsDefined() is too slow 
             // to be used here.
             if ((int)uriKind < (int)UriKind.RelativeOrAbsolute || (int)uriKind > (int)UriKind.Relative) {
+#if MONO
+                if (uriKind != DotNetRelativeOrAbsolute)
+#endif
                 throw new ArgumentException(SR.GetString(SR.net_uri_InvalidUriKind, uriKind));
             }
 
@@ -55,6 +61,12 @@ namespace System {
             {
                 if (IsImplicitFile)
                 {
+#if MONO
+                    if (uriKind == UriKind.RelativeOrAbsolute && m_String.Length > 0 && m_String[0] == '/' && !useDotNetRelativeOrAbsolute) {
+                        // For original Mono behaviour where / is considered to be absolute path
+                    }
+                    else
+#endif
                     // V1 compat VsWhidbey#252282
                     // A relative Uri wins over implicit UNC path unless the UNC path is of the form "\\something" and 
                     // uriKind != Absolute
@@ -312,7 +324,13 @@ namespace System {
         public static bool TryCreate(Uri baseUri, string relativeUri, out Uri result)
         {
             Uri relativeLink;
-            if (TryCreate(relativeUri, UriKind.RelativeOrAbsolute, out relativeLink))
+            const UriKind kind =
+#if MONO
+                DotNetRelativeOrAbsolute;
+#else
+                RelativeOrAbsolute;
+#endif
+            if (TryCreate(relativeUri, kind, out relativeLink))
             {
                 if (!relativeLink.IsAbsoluteUri)
                     return TryCreate(baseUri, relativeLink, out result);
@@ -658,6 +676,9 @@ namespace System {
             // if (!Enum.IsDefined(typeof(UriKind), uriKind)) -- We currently believe that Enum.IsDefined() is too slow 
             // to be used here.
             if ((int)uriKind < (int)UriKind.RelativeOrAbsolute || (int)uriKind > (int)UriKind.Relative){
+#if MONO
+                if (uriKind != DotNetRelativeOrAbsolute)
+#endif               
                 throw new ArgumentException(SR.GetString(SR.net_uri_InvalidUriKind, uriKind));
             }
 
@@ -715,8 +736,15 @@ namespace System {
 
             if ((object)relativeUri != null)
             {
-                if (relativeUri.IsAbsoluteUri)
+                if (relativeUri.IsAbsoluteUri) {
+#if MONO
+                // Hack for Mono specific handling of /paths which are absolute on unix but
+                // we want to allow concatination of such paths to match .net
+                if (!(!IsWindowsFileSystem && relativeUri.OriginalString [0] == '/' && relativeUri.IsImplicitFile))
+#endif
+
                     return relativeUri;
+                }
 
                 relativeStr = relativeUri.OriginalString;
                 userEscaped = relativeUri.UserEscaped;
diff --git a/mcs/class/referencesource/System/net/System/UriScheme.cs b/mcs/class/referencesource/System/net/System/UriScheme.cs
index bf2483d2f12..009eef57702 100644
--- a/mcs/class/referencesource/System/net/System/UriScheme.cs
+++ b/mcs/class/referencesource/System/net/System/UriScheme.cs
@@ -166,8 +166,9 @@ namespace System {
         //
         public static void Register(UriParser uriParser, string schemeName, int defaultPort)
         {
+#if FEATURE_MONO_CAS
             ExceptionHelper.InfrastructurePermission.Demand();
-
+#endif
             if (uriParser == null)
                 throw new ArgumentNullException("uriParser");
 
diff --git a/mcs/class/referencesource/System/net/System/_UncName.cs b/mcs/class/referencesource/System/net/System/_UncName.cs
index 602c9075776..39d0c2c0f6c 100644
--- a/mcs/class/referencesource/System/net/System/_UncName.cs
+++ b/mcs/class/referencesource/System/net/System/_UncName.cs
@@ -1,4 +1,4 @@
-#if !PLATFORM_UNIX
+#if !PLATFORM_UNIX || MONO
 //------------------------------------------------------------------------------
 // <copyright file="_UncName.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
@@ -54,6 +54,14 @@ namespace System {
 
             if (start==end)
                 return false;
+
+#if MONO
+            if (!Uri.IsWindowsFileSystem) {
+                if (!(end - start > 2 && name[start] == '\\' && name[start + 1] == '\\')) {
+                    return false;
+                }
+            }
+#endif
             //
             // First segment could consist of only '_' or '-' but it cannot be all digits or empty
             //
diff --git a/mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs b/mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs
index 8256cb7a417..1a2adb1cfdb 100644
--- a/mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs
+++ b/mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs
@@ -405,7 +405,7 @@ namespace System.Text.RegularExpressions {
         * This method is internal virtual so the jit does not inline it.
         */
         [
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             HostProtection(MayLeakOnAbort=true),
 #endif
             MethodImplAttribute(MethodImplOptions.NoInlining)
@@ -1195,7 +1195,7 @@ namespace System.Text.RegularExpressions {
 #if !(SILVERLIGHT || FULL_AOT_RUNTIME)
         /// <devdoc>
         /// </devdoc>
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         [HostProtection(MayLeakOnAbort=true)]
 #endif
         [ResourceExposure(ResourceScope.Machine)] // The AssemblyName is interesting.
@@ -1208,7 +1208,7 @@ namespace System.Text.RegularExpressions {
 
         /// <devdoc>
         /// </devdoc>
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         [HostProtection(MayLeakOnAbort=true)]
 #endif
         [ResourceExposure(ResourceScope.Machine)] // The AssemblyName is interesting.
@@ -1218,7 +1218,7 @@ namespace System.Text.RegularExpressions {
             CompileToAssemblyInternal(regexinfos, assemblyname, attributes, null);
         }
 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         [HostProtection(MayLeakOnAbort=true)]
 #endif
         [ResourceExposure(ResourceScope.Machine)]
diff --git a/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexCompiler.cs b/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexCompiler.cs
index 69fcc04a1ea..6f191129671 100644
--- a/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexCompiler.cs
+++ b/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexCompiler.cs
@@ -131,7 +131,7 @@ namespace System.Text.RegularExpressions {
             // <SECREVIEW> Regex only generates string manipulation, so this is ok.
             // </SECREVIEW>      
 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             new ReflectionPermission(PermissionState.Unrestricted).Assert();
 #endif
             try {
@@ -172,7 +172,9 @@ namespace System.Text.RegularExpressions {
 #endif
             }
             finally {
+#if FEATURE_MONO_CAS 
                 CodeAccessPermission.RevertAssert();
+#endif
             }
         }
 
@@ -195,14 +197,16 @@ namespace System.Text.RegularExpressions {
 
             // <SECREVIEW> Regex only generates string manipulation, so this is ok.
             // </SECREVIEW>         
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             new ReflectionPermission(PermissionState.Unrestricted).Assert();
 #endif
             try {
                 factory = c.FactoryInstanceFromCode(code, options);
             }
             finally {
+#if FEATURE_MONO_CAS
                 CodeAccessPermission.RevertAssert();
+#endif
             }
             return factory;
         }
@@ -235,7 +239,7 @@ namespace System.Text.RegularExpressions {
         
                 Type factory;
         
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 new ReflectionPermission(PermissionState.Unrestricted).Assert();
 #endif
                 try {
@@ -243,7 +247,9 @@ namespace System.Text.RegularExpressions {
                     c.GenerateRegexType(pattern, options, fullname, regexes[i].IsPublic, code, tree, factory, mTimeout);
                 }
                 finally {
+#if FEATURE_MONO_CAS
                     CodeAccessPermission.RevertAssert();
+#endif
                 }
             }
         
@@ -3043,7 +3049,7 @@ namespace System.Text.RegularExpressions {
             // SECREVIEW : Regex only generates string manipulation, so this is
             //           : ok.
             //
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             new ReflectionPermission(PermissionState.Unrestricted).Assert();
 #endif
             try {
@@ -3055,7 +3061,7 @@ namespace System.Text.RegularExpressions {
                 CustomAttributeBuilder transparencyAttribute = new CustomAttributeBuilder(transparencyCtor, new object[0]);
                 assemblyAttributes.Add(transparencyAttribute);
 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 ConstructorInfo securityRulesCtor = typeof(SecurityRulesAttribute).GetConstructor(new Type[] { typeof(SecurityRuleSet) });
                 CustomAttributeBuilder securityRulesAttribute =
                     new CustomAttributeBuilder(securityRulesCtor, new object[] { SecurityRuleSet.Level2 });
@@ -3081,7 +3087,9 @@ namespace System.Text.RegularExpressions {
                 }
             }
             finally {
+#if FEATURE_MONO_CAS
                 CodeAccessPermission.RevertAssert();
+#endif
             }
         }
 
diff --git a/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexGroup.cs b/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexGroup.cs
index 97f33d95853..037486b36d8 100644
--- a/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexGroup.cs
+++ b/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexGroup.cs
@@ -77,7 +77,7 @@ namespace System.Text.RegularExpressions {
         ///       multiple threads.</para>
         /// </devdoc>
 #if !SILVERLIGHT
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         [HostProtection(Synchronization=true)]
 #endif
         static public Group Synchronized(Group inner) {
diff --git a/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexMatch.cs b/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexMatch.cs
index 6c0ff3850a4..f6c8d5cce12 100644
--- a/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexMatch.cs
+++ b/mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexMatch.cs
@@ -201,7 +201,7 @@ namespace System.Text.RegularExpressions {
         /// </devdoc>
 
 #if !SILVERLIGHT
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         [HostProtection(Synchronization=true)]
 #endif
         static public Match Synchronized(Match inner) {
diff --git a/mcs/class/referencesource/System/regex/system/text/regularexpressions/compiledregexrunnerfactory.cs b/mcs/class/referencesource/System/regex/system/text/regularexpressions/compiledregexrunnerfactory.cs
index 640758a4461..46131cf7ab9 100644
--- a/mcs/class/referencesource/System/regex/system/text/regularexpressions/compiledregexrunnerfactory.cs
+++ b/mcs/class/referencesource/System/regex/system/text/regularexpressions/compiledregexrunnerfactory.cs
@@ -28,7 +28,7 @@ namespace System.Text.RegularExpressions {
         protected internal override RegexRunner CreateInstance() {
             CompiledRegexRunner runner = new CompiledRegexRunner();
 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             new ReflectionPermission(PermissionState.Unrestricted).Assert();
 #endif
             runner.SetDelegates((NoParamDelegate)       goMethod.CreateDelegate(typeof(NoParamDelegate)),
diff --git a/mcs/class/referencesource/System/security/system/security/cryptography/x509/x509utils.cs b/mcs/class/referencesource/System/security/system/security/cryptography/x509/x509utils.cs
index 92fecf7812a..c5a093a1765 100644
--- a/mcs/class/referencesource/System/security/system/security/cryptography/x509/x509utils.cs
+++ b/mcs/class/referencesource/System/security/system/security/cryptography/x509/x509utils.cs
@@ -23,7 +23,7 @@ namespace System.Security.Cryptography.X509Certificates {
 
     internal class X509Utils {
         private X509Utils () {}
-
+#if !MONO
         internal static bool IsCertRdnCharString (uint dwValueType) {
             return ((dwValueType & CAPI.CERT_RDN_TYPE_MASK) >= CAPI.CERT_RDN_NUMERIC_STRING);
         }
@@ -349,16 +349,26 @@ namespace System.Security.Cryptography.X509Certificates {
             CAPI.CRYPT_OID_INFO pOIDInfo = CAPI.CryptFindOIDInfo(CAPI.CRYPT_OID_INFO_OID_KEY, pszOid, 0);
             return pOIDInfo.Algid;
         }
-
+#endif
 #if FEATURE_CORESYSTEM
         [SecuritySafeCritical]
 #endif
-        internal static string FindOidInfo(uint keyType, string keyValue, OidGroup oidGroup) {
+        internal static string FindOidInfo(uint keyType, string keyValue, System.Security.Cryptography.OidGroup oidGroup) {
             if (keyValue == null)
                 throw new ArgumentNullException("keyValue");
             if (keyValue.Length == 0)
                 return null;
 
+#if MONO
+            switch(keyType) {
+                case CAPI.CRYPT_OID_INFO_OID_KEY:
+                    return CAPI.CryptFindOIDInfoNameFromKey(keyValue, oidGroup);
+                case CAPI.CRYPT_OID_INFO_NAME_KEY:
+                    return CAPI.CryptFindOIDInfoKeyFromName(keyValue, oidGroup);
+                default:
+                    throw new NotImplementedException(keyType.ToString());
+            }
+#else
             SafeLocalAllocHandle pvKey = SafeLocalAllocHandle.InvalidHandle;
 
             try {
@@ -389,21 +399,22 @@ namespace System.Security.Cryptography.X509Certificates {
             finally {
                 pvKey.Dispose();
             }
+#endif
         }
 
         // Try to find OID info within a specific group, and if that doesn't work fall back to all
         // groups for compatibility with previous frameworks
-        internal static string FindOidInfoWithFallback(uint key, string value, OidGroup group) {
+        internal static string FindOidInfoWithFallback(uint key, string value, System.Security.Cryptography.OidGroup group) {
             string info = FindOidInfo(key, value, group);
 
             // If we couldn't find it in the requested group, then try again in all groups
-            if (info == null && group != OidGroup.All) {
-                info = FindOidInfo(key, value, OidGroup.All);
+            if (info == null && group != System.Security.Cryptography.OidGroup.All) {
+                info = FindOidInfo(key, value, System.Security.Cryptography.OidGroup.All);
             }
 
             return info;
         }
-
+#if !MONO
         //
         // verify the passed keyValue is valid as per X.208
         //
@@ -568,5 +579,6 @@ error:
             else 
                 return SR.GetString(SR.Unknown_Error);
         }
+#endif
     }
 }
diff --git a/mcs/class/referencesource/System/sys/system/IO/ports/InternalResources.cs b/mcs/class/referencesource/System/sys/system/IO/ports/InternalResources.cs
index 4d181e8c220..973773d2946 100644
--- a/mcs/class/referencesource/System/sys/system/IO/ports/InternalResources.cs
+++ b/mcs/class/referencesource/System/sys/system/IO/ports/InternalResources.cs
@@ -34,6 +34,7 @@ namespace System.IO.Ports
 #endif
         internal static String GetMessage(int errorCode) 
         {
+#if !MONO
             StringBuilder sb = new StringBuilder(512);
             int result = SafeNativeMethods.FormatMessage(NativeMethods.FORMAT_MESSAGE_IGNORE_INSERTS |
                 NativeMethods.FORMAT_MESSAGE_FROM_SYSTEM | NativeMethods.FORMAT_MESSAGE_ARGUMENT_ARRAY,
@@ -47,6 +48,7 @@ namespace System.IO.Ports
                 return s;
             }
             else 
+#endif
             {
                 return SR.GetString(SR.IO_UnknownError, errorCode);
             }
diff --git a/mcs/class/referencesource/System/sys/system/collections/concurrent/ConcurrentBag.cs b/mcs/class/referencesource/System/sys/system/collections/concurrent/ConcurrentBag.cs
index bc6669c501f..1f0d34927af 100644
--- a/mcs/class/referencesource/System/sys/system/collections/concurrent/ConcurrentBag.cs
+++ b/mcs/class/referencesource/System/sys/system/collections/concurrent/ConcurrentBag.cs
@@ -52,7 +52,7 @@ namespace System.Collections.Concurrent
     [ComVisible(false)]
     [DebuggerTypeProxy(typeof(SystemThreadingCollection_IProducerConsumerCollectionDebugView<>))]
     [DebuggerDisplay("Count = {Count}")]
-#if !(FEATURE_NETCORE || DISABLE_CAS_USE)
+#if !FEATURE_NETCORE
     [HostProtection(Synchronization = true, ExternalThreading = true)]
 #endif
     public class ConcurrentBag<T> : IProducerConsumerCollection<T>, IReadOnlyCollection<T>
diff --git a/mcs/class/referencesource/System/sys/system/threading/semaphore.cs b/mcs/class/referencesource/System/sys/system/threading/semaphore.cs
index 9a77cc0a64c..360a55fa534 100644
--- a/mcs/class/referencesource/System/sys/system/threading/semaphore.cs
+++ b/mcs/class/referencesource/System/sys/system/threading/semaphore.cs
@@ -1,3 +1,6 @@
+#if MONO
+#undef FEATURE_PAL
+#endif
 // ==++==
 // 
 //   Copyright (c) Microsoft Corporation.  All rights reserved.
@@ -21,6 +24,7 @@ namespace System.Threading
 #endif
     using System.Runtime.Versioning;
     using System.Runtime.ConstrainedExecution;
+    using System.Runtime.CompilerServices;
 
 
     [HostProtection(Synchronization=true, ExternalThreading=true)]
@@ -66,11 +70,19 @@ namespace System.Threading
             {
                 throw new ArgumentException(SR.GetString(SR.Argument_WaitHandleNameTooLong));
             }
+
+#if MONO
+            int errorCode;
+            var myHandle = new SafeWaitHandle (CreateSemaphore_internal (initialCount, maximumCount, name, out errorCode), true);
+#else
             SafeWaitHandle   myHandle = SafeNativeMethods.CreateSemaphore(null, initialCount, maximumCount, name);
+#endif
             
             if (myHandle.IsInvalid)
             {
+#if !MONO
                 int errorCode = Marshal.GetLastWin32Error(); 
+#endif
 
                 if(null != name && 0 != name.Length && NativeMethods.ERROR_INVALID_HANDLE == errorCode)
                     throw new WaitHandleCannotBeOpenedException(SR.GetString(SR.WaitHandleCannotBeOpenedException_InvalidHandle,name));
@@ -119,6 +131,11 @@ namespace System.Threading
                 throw new ArgumentException(SR.GetString(SR.Argument_WaitHandleNameTooLong));
             }
             SafeWaitHandle   myHandle;
+
+#if MONO
+            int errorCode;
+            myHandle = new SafeWaitHandle (CreateSemaphore_internal (initialCount, maximumCount, name, out errorCode), true);
+#else
 #if !FEATURE_PAL && !FEATURE_NETCORE
             // For ACL's, get the security descriptor from the SemaphoreSecurity.
             if (semaphoreSecurity != null) {
@@ -137,7 +154,9 @@ namespace System.Threading
 #if !FEATURE_PAL && !FEATURE_NETCORE
             }
 #endif
+
             int errorCode = Marshal.GetLastWin32Error();
+#endif
             if (myHandle.IsInvalid)
             {
                 if(null != name && 0 != name.Length && NativeMethods.ERROR_INVALID_HANDLE == errorCode)
@@ -259,7 +278,14 @@ namespace System.Threading
             }
 
             result = null;
+#if MOBILE
+            throw new NotSupportedException ();
+#else
 
+#if MONO
+            int errorCode;
+            var myHandle = new SafeWaitHandle (OpenSemaphore_internal (name, rights, out errorCode), true);
+#else
             //Pass false to OpenSemaphore to prevent inheritedHandles
 #if FEATURE_PAL || FEATURE_NETCORE
             const int SYNCHRONIZE            = 0x00100000;
@@ -269,10 +295,13 @@ namespace System.Threading
 #else
             SafeWaitHandle myHandle = SafeNativeMethods.OpenSemaphore((int) rights, false, name);
 #endif
+#endif
             
             if (myHandle.IsInvalid)
             {
+#if !MONO
                 int errorCode = Marshal.GetLastWin32Error();
+#endif
 
                 if (NativeMethods.ERROR_FILE_NOT_FOUND == errorCode || NativeMethods.ERROR_INVALID_NAME == errorCode)
                     return OpenExistingResult.NameNotFound;
@@ -285,6 +314,7 @@ namespace System.Threading
             }
             result = new Semaphore(myHandle);
             return OpenExistingResult.Success;
+#endif
         }
 
 
@@ -318,7 +348,11 @@ namespace System.Threading
             //   the semaphore's count to exceed the maximum count set when Semaphore was created
             //Non-Zero return 
 
+#if MONO
+            if (!ReleaseSemaphore_internal(Handle, releaseCount, out previousCount))
+#else
             if (!SafeNativeMethods.ReleaseSemaphore(SafeWaitHandle, releaseCount, out previousCount))
+#endif
             {
                 throw new SemaphoreFullException();
             }
@@ -342,6 +376,19 @@ namespace System.Threading
             semaphoreSecurity.Persist(SafeWaitHandle);
         }
 #endif
+
+#if MONO
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        internal static extern IntPtr CreateSemaphore_internal (
+            int initialCount, int maximumCount, string name, out int errorCode);
+
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        internal static extern bool ReleaseSemaphore_internal (
+            IntPtr handle, int releaseCount, out int previousCount);
+
+        [MethodImplAttribute (MethodImplOptions.InternalCall)]
+        private static extern IntPtr OpenSemaphore_internal (string name, SemaphoreRights rights, out int errorCode);
+#endif
     }
 }
 
diff --git a/mcs/class/referencesource/mscorlib/system/exception.cs b/mcs/class/referencesource/mscorlib/system/exception.cs
index 6f5e71e5eef..8bab3650892 100644
--- a/mcs/class/referencesource/mscorlib/system/exception.cs
+++ b/mcs/class/referencesource/mscorlib/system/exception.cs
@@ -429,7 +429,7 @@ namespace System {
 
 #if MONO
                         if (method != null) { // source can be null
-                            _source = method.DeclaringType.Assembly.UnprotectedGetName ().Name;
+                            _source = method.DeclaringType.Assembly.GetName ().Name;
                         }
 #else
                         Module module = method.Module;
@@ -989,6 +989,7 @@ namespace System {
         [System.Security.SecurityCritical]  // auto-generated
         internal virtual String InternalToString()
         {
+#if FEATURE_MONO_CAS
             try 
             {
 #pragma warning disable 618
@@ -1001,6 +1002,7 @@ namespace System {
                 //under normal conditions there should be no exceptions
                 //however if something wrong happens we still can call the usual ToString
             }
+#endif
 
             // Get the current stack trace string.  On CoreCLR we don't bother
             // to try and include file/line-number information because all AppDomains
diff --git a/mcs/class/referencesource/mscorlib/system/io/__error.cs b/mcs/class/referencesource/mscorlib/system/io/__error.cs
index aa7a29985e9..e318533937a 100644
--- a/mcs/class/referencesource/mscorlib/system/io/__error.cs
+++ b/mcs/class/referencesource/mscorlib/system/io/__error.cs
@@ -96,9 +96,7 @@ namespace System.IO {
             if (!isFullyQualified && !isInvalidPath)
                 return path;
 
-#if DISABLE_CAS_USE
-            bool safeToReturn = !isInvalidPath;
-#else
+#if FEATURE_MONO_CAS
             bool safeToReturn = false;
             try {
                 if (!isInvalidPath) {
@@ -119,7 +117,9 @@ namespace System.IO {
                 // from Security.Util.StringExpressionSet.CanonicalizePath when ':' is found in the path
                 // beyond string index position 1.  
             }
-#endif // DISABLE_CAS_USE
+#else
+            bool safeToReturn = !isInvalidPath;
+#endif // FEATURE_MONO_CAS
             if (!safeToReturn) {
                 if (Path.IsDirectorySeparator(path[path.Length - 1]))
                     path = Environment.GetResourceString("IO.IO_NoPermissionToDirectoryName");
diff --git a/mcs/class/referencesource/mscorlib/system/io/fileinfo.cs b/mcs/class/referencesource/mscorlib/system/io/fileinfo.cs
index 7b1b1c15e25..f3da2cbd414 100644
--- a/mcs/class/referencesource/mscorlib/system/io/fileinfo.cs
+++ b/mcs/class/referencesource/mscorlib/system/io/fileinfo.cs
@@ -130,7 +130,7 @@ namespace System.IO {
         [System.Security.SecurityCritical]  // auto-generated
         private FileInfo(SerializationInfo info, StreamingContext context) : base(info, context)
         {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
 #if !FEATURE_CORECLR
             new FileIOPermission(FileIOPermissionAccess.Read, new String[] { FullPath }, false, false).Demand();
 #endif
@@ -187,7 +187,7 @@ namespace System.IO {
                 String directoryName = Path.GetDirectoryName(FullPath);
                 if (directoryName != null)
                 {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
 #if FEATURE_CORECLR
                     FileSecurityState state = new FileSecurityState(FileSecurityStateAccess.Read, DisplayPath, FullPath);
                     state.EnsureState();
@@ -338,7 +338,7 @@ namespace System.IO {
         [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         public override void Delete()
         {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
 #if FEATURE_CORECLR
             FileSecurityState state = new FileSecurityState(FileSecurityStateAccess.Write, DisplayPath, FullPath);
             state.EnsureState();
diff --git a/mcs/class/referencesource/mscorlib/system/io/filesysteminfo.cs b/mcs/class/referencesource/mscorlib/system/io/filesysteminfo.cs
index 23abfb231d4..c551e66159a 100644
--- a/mcs/class/referencesource/mscorlib/system/io/filesysteminfo.cs
+++ b/mcs/class/referencesource/mscorlib/system/io/filesysteminfo.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections;
 using System.Security;
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
 using System.Security.Permissions;
 #endif
 using Microsoft.Win32;
@@ -30,7 +30,7 @@ using System.Diagnostics.Contracts;
 
 namespace System.IO {
     [Serializable]
-#if !FEATURE_CORECLR && !DISABLE_CAS_USE
+#if !FEATURE_CORECLR && FEATURE_MONO_CAS
     [FileIOPermissionAttribute(SecurityAction.InheritanceDemand,Unrestricted=true)]
 #endif
     [ComVisible(true)]
@@ -102,7 +102,7 @@ namespace System.IO {
                     demandDir = Directory.GetDemandDir(FullPath, true);
                 else
                     demandDir = FullPath;
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
 #if FEATURE_CORECLR
                 FileSecurityState sourceState = new FileSecurityState(FileSecurityStateAccess.PathDiscovery, String.Empty, demandDir);
                 sourceState.EnsureState();
@@ -124,7 +124,7 @@ namespace System.IO {
                     demandDir = Directory.GetDemandDir(FullPath, true);
                 else
                     demandDir = FullPath;
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
 #if !FEATURE_CORECLR
                 new FileIOPermission(FileIOPermissionAccess.PathDiscovery, demandDir).Demand();
 #endif
@@ -351,7 +351,7 @@ namespace System.IO {
             [System.Security.SecuritySafeCritical]
             #endif
             set {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
 #if !FEATURE_CORECLR
                 new FileIOPermission(FileIOPermissionAccess.Write, FullPath).Demand();
 #endif
@@ -384,7 +384,7 @@ namespace System.IO {
         [ComVisible(false)]
         public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
         {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
 #if !FEATURE_CORECLR
             new FileIOPermission(FileIOPermissionAccess.PathDiscovery, FullPath).Demand();
 #endif
diff --git a/mcs/class/referencesource/mscorlib/system/io/unmanagedmemorystream.cs b/mcs/class/referencesource/mscorlib/system/io/unmanagedmemorystream.cs
index 2960876b829..786e7af959a 100644
--- a/mcs/class/referencesource/mscorlib/system/io/unmanagedmemorystream.cs
+++ b/mcs/class/referencesource/mscorlib/system/io/unmanagedmemorystream.cs
@@ -163,7 +163,7 @@ namespace System.IO {
             if (_isOpen) {
                 throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_CalledTwice"));
             }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             if (!skipSecurityCheck) {
 #pragma warning disable 618
                 new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();
@@ -244,7 +244,7 @@ namespace System.IO {
             if (_isOpen)
                 throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_CalledTwice"));
 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             if (!skipSecurityCheck)
 #pragma warning disable 618
                 new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();
diff --git a/mcs/class/referencesource/mscorlib/system/resources/filebasedresourcegroveler.cs b/mcs/class/referencesource/mscorlib/system/resources/filebasedresourcegroveler.cs
index c2931dc9e6c..350cb47cb47 100644
--- a/mcs/class/referencesource/mscorlib/system/resources/filebasedresourcegroveler.cs
+++ b/mcs/class/referencesource/mscorlib/system/resources/filebasedresourcegroveler.cs
@@ -51,7 +51,7 @@ namespace System.Resources {
             // Don't use Assembly manifest, but grovel on disk for a file.
             try
             {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 new System.Security.Permissions.FileIOPermission(System.Security.Permissions.PermissionState.Unrestricted).Assert();
 #endif
 
@@ -79,7 +79,7 @@ namespace System.Resources {
             }
             finally
             {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 System.Security.CodeAccessPermission.RevertAssert();
 #endif
             }
diff --git a/mcs/class/referencesource/mscorlib/system/resources/resourcewriter.cs b/mcs/class/referencesource/mscorlib/system/resources/resourcewriter.cs
index bd3177842e7..e63dd0d3c57 100644
--- a/mcs/class/referencesource/mscorlib/system/resources/resourcewriter.cs
+++ b/mcs/class/referencesource/mscorlib/system/resources/resourcewriter.cs
@@ -350,13 +350,13 @@ namespace System.Resources {
             // write to the temp directory (enforced via a Windows ACL).  Fall back to a MemoryStream.
             Stream dataSection = null;  // Either a FileStream or a MemoryStream
             String tempFile = null;
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             PermissionSet permSet = new PermissionSet(PermissionState.None);
             permSet.AddPermission(new EnvironmentPermission(PermissionState.Unrestricted));
             permSet.AddPermission(new FileIOPermission(PermissionState.Unrestricted));
 #endif
             try {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 permSet.Assert();
 #endif
                 tempFile = Path.GetTempFileName();
@@ -375,7 +375,7 @@ namespace System.Resources {
                 dataSection = new MemoryStream();
             }
             finally {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 PermissionSet.RevertAssert();
 #endif
             }
diff --git a/mcs/class/referencesource/mscorlib/system/rttype.cs b/mcs/class/referencesource/mscorlib/system/rttype.cs
index f518646e30c..b1b8e3e48f4 100644
--- a/mcs/class/referencesource/mscorlib/system/rttype.cs
+++ b/mcs/class/referencesource/mscorlib/system/rttype.cs
@@ -5028,10 +5028,12 @@ namespace System
             return obj == (object)this;
         }
 
+#if !MONO
         public override int GetHashCode() 
         {
             return RuntimeHelpers.GetHashCode(this);
         }
+#endif
 
 #if !FEATURE_CORECLR
         public static bool operator ==(RuntimeType left, RuntimeType right)
@@ -5326,7 +5328,7 @@ namespace System
                             throw new MissingMethodException(Environment.GetResourceString("MissingConstructor_Name", FullName));
                         }
 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                         // If we're creating a delegate, we're about to call a
                         // constructor taking an integer to represent a target
                         // method. Since this is very difficult (and expensive)
@@ -5357,7 +5359,7 @@ namespace System
                             new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();
 #endif // FEATURE_CORECLR
                         }
-#endif // !DISABLE_CAS_USE
+#endif // FEATURE_MONO_CAS
                         if (invokeMethod.GetParametersNoCopy().Length == 0)
                         {
                             if (args.Length != 0)
@@ -5369,12 +5371,31 @@ namespace System
                                     Environment.GetResourceString("NotSupported_CallToVarArg")));
                             }
 
+#if MONO && FEATURE_REMOTING
+                            if (activationAttributes != null && activationAttributes.Length != 0) {
+                                server = ActivationCreateInstance (invokeMethod, bindingAttr, binder, args, culture, activationAttributes);
+                            } else {
+#endif
                             // fast path??
                             server = Activator.CreateInstance(this, true);
+
+#if MONO && FEATURE_REMOTING
+                            }
+#endif
                         }
                         else
                         {
+#if MONO && FEATURE_REMOTING
+
+                            if (activationAttributes != null && activationAttributes.Length != 0) {
+                                server = ActivationCreateInstance (invokeMethod, bindingAttr, binder, args, culture, activationAttributes);
+                            } else {
+#endif
                             server = ((ConstructorInfo)invokeMethod).Invoke(bindingAttr, binder, args, culture);
+#if MONO && FEATURE_REMOTING
+                            }
+#endif
+
                             if (state != null)
                                 binder.ReorderArgumentArray(ref args, state);
                         }
@@ -5400,7 +5421,25 @@ namespace System
             //Console.WriteLine(server);
             return server;                                
         }
-#if !MONO
+
+#if MONO
+#if FEATURE_REMOTING
+        //
+        // .NET seems to do this deep in method invocation which looks odd as it
+        // needs extra push/pop as PushActivationAttributes/PopActivationAttributes.
+        // We let them do nothing and have all logic here without complicated checks
+        // inside fast path invoke.
+        //
+        object ActivationCreateInstance (MethodBase invokeMethod, BindingFlags bindingAttr, Binder binder, Object[] args, CultureInfo culture, Object[] activationAttributes)
+        {
+            var server = ActivationServices.CreateProxyFromAttributes (this, activationAttributes);
+            if (server != null)
+                invokeMethod.Invoke (server, bindingAttr, binder, args, culture);
+
+            return server;
+        }
+#endif
+#else
         // the cache entry
         class ActivatorCacheEntry
         {
diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/arraywithoffset.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/arraywithoffset.cs
index d6e858960ba..73778f3f4b1 100644
--- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/arraywithoffset.cs
+++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/arraywithoffset.cs
@@ -65,10 +65,22 @@ namespace System.Runtime.InteropServices {
             return !(a == b);
         }
 
+#if MONO
+        int CalculateCount()
+        {
+            Array a = m_array as Array;
+            if (a == null)
+                throw new ArgumentException ();
+
+            var total = a.Rank * a.Length;
+            return total - m_offset;
+        }
+#else
         [System.Security.SecurityCritical]  // auto-generated
         [ResourceExposure(ResourceScope.None)]
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         private extern int CalculateCount();
+#endif
     
         private Object m_array;
         private int    m_offset;
diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/criticalhandle.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/criticalhandle.cs
index 308fa38c840..2c6793f0d15 100644
--- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/criticalhandle.cs
+++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/criticalhandle.cs
@@ -206,10 +206,16 @@ public abstract class CriticalHandle : CriticalFinalizerObject, IDisposable
         GC.SuppressFinalize(this);
     }
 
+#if MONO
+    static void FireCustomerDebugProbe()
+    {
+    }
+#else
     [ResourceExposure(ResourceScope.None)]
     [MethodImplAttribute(MethodImplOptions.InternalCall)]
     [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
     private extern void FireCustomerDebugProbe();
+#endif
 
     [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
     protected void SetHandle(IntPtr handle) {
diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/dispatchwrapper.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/dispatchwrapper.cs
index 3f9b3d38879..50740031b61 100644
--- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/dispatchwrapper.cs
+++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/dispatchwrapper.cs
@@ -12,7 +12,7 @@
 **
 **
 =============================================================================*/
-
+#if !FULL_AOT_RUNTIME
 namespace System.Runtime.InteropServices {
    
     using System;
@@ -51,3 +51,4 @@ namespace System.Runtime.InteropServices {
         private Object m_WrappedObject;
     }
 }
+#endif
+\ No newline at end of file
diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/errorwrapper.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/errorwrapper.cs
index 694412fd471..0cf3823868c 100644
--- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/errorwrapper.cs
+++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/errorwrapper.cs
@@ -12,7 +12,7 @@
 **
 **
 =============================================================================*/
-
+#if !FULL_AOT_RUNTIME
 namespace System.Runtime.InteropServices {
    
     using System;
@@ -54,3 +54,4 @@ namespace System.Runtime.InteropServices {
         private int m_ErrorCode;
     }
 }
+#endif
+\ No newline at end of file
diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/runtimeenvironment.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/runtimeenvironment.cs
index 0740184423b..b74e4d606b5 100644
--- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/runtimeenvironment.cs
+++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/runtimeenvironment.cs
@@ -110,7 +110,7 @@ namespace System.Runtime.InteropServices {
                 return null;
 #endif
             String dir = GetRuntimeDirectoryImpl();
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
             new FileIOPermission(FileIOPermissionAccess.PathDiscovery, dir).Demand();
 #endif
             return dir;
@@ -143,7 +143,7 @@ namespace System.Runtime.InteropServices {
                 String path = sb.ToString();
 #endif
                 
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 // Do security check
                 new FileIOPermission(FileIOPermissionAccess.PathDiscovery, path).Demand();
 #endif
diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/safehandle.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/safehandle.cs
index 6536f3c77d2..c7610dc3687 100644
--- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/safehandle.cs
+++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/safehandle.cs
@@ -276,7 +276,7 @@ public abstract partial class SafeHandle : CriticalFinalizerObject, IDisposable
     [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
     [MethodImplAttribute(MethodImplOptions.InternalCall)]
     public extern void SetHandleAsInvalid();
-
+#endif
     // Implement this abstract method in your derived class to specify how to
     // free the handle. Be careful not write any code that's subject to faults
     // in this method (the runtime will prepare the infrastructure for you so
@@ -287,7 +287,7 @@ public abstract partial class SafeHandle : CriticalFinalizerObject, IDisposable
     // MDA is enabled.
     [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
     protected abstract bool ReleaseHandle();
-
+#if !MONO
     // Add a reason why this handle should not be relinquished (i.e. have
     // ReleaseHandle called on it). This method has dangerous in the name since
     // it must always be used carefully (e.g. called within a CER) to avoid
diff --git a/mcs/class/referencesource/mscorlib/system/runtime/serialization/formatters/binary/binaryobjectreader.cs b/mcs/class/referencesource/mscorlib/system/runtime/serialization/formatters/binary/binaryobjectreader.cs
index 87782cd343c..fd5131e8e06 100644
--- a/mcs/class/referencesource/mscorlib/system/runtime/serialization/formatters/binary/binaryobjectreader.cs
+++ b/mcs/class/referencesource/mscorlib/system/runtime/serialization/formatters/binary/binaryobjectreader.cs
@@ -71,7 +71,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
         private BinaryMethodReturn binaryMethodReturn;
         private bool bIsCrossAppDomain;
 #endif        
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
         private static FileIOPermission sfileIOPermission = new FileIOPermission(PermissionState.Unrestricted);
 #endif        
         private SerStack ValueFixupStack
@@ -1362,7 +1362,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
                 if (bSimpleAssembly)
                 {
                     try {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                           sfileIOPermission.Assert();
 #endif
                           try {
@@ -1373,7 +1373,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
 #endif // FEATURE_FUSION
                           }
                           finally {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                               CodeAccessPermission.RevertAssert();
 #endif
                           }
@@ -1390,14 +1390,14 @@ namespace System.Runtime.Serialization.Formatters.Binary {
                 else {
                     try
                     {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                           sfileIOPermission.Assert();
 #endif
                           try {
                               assm = Assembly.Load(assemblyName);
                           }
                           finally {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                               CodeAccessPermission.RevertAssert();
 #endif
                           }
@@ -1512,7 +1512,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
             if ( !FormatterServices.UnsafeTypeForwardersIsEnabled() && sourceAssembly != destAssembly )
             {
                 // we have a type forward to attribute !
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                 // we can try to see if the dest assembly has less permissionSet
                 if (!destAssembly.PermissionSet.IsSubsetOf(sourceAssembly.PermissionSet))
 #endif
@@ -1530,7 +1530,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
                             typeFowardedFromAssembly = Assembly.Load(typeInfo.AssemblyString);
                         }
                         catch { }
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                         if (typeFowardedFromAssembly != sourceAssembly)
                         {
                             // throw security exception
@@ -1540,7 +1540,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
                     }
                     else
                     {
-#if !DISABLE_CAS_USE
+#if FEATURE_MONO_CAS
                         // throw security exception
                         throw new SecurityException() { Demanded = sourceAssembly.PermissionSet };
 #endif
diff --git a/mcs/class/referencesource/mscorlib/system/threading/monitor.cs b/mcs/class/referencesource/mscorlib/system/threading/monitor.cs
index 9232230801d..2bb82ed520e 100644
--- a/mcs/class/referencesource/mscorlib/system/threading/monitor.cs
+++ b/mcs/class/referencesource/mscorlib/system/threading/monitor.cs
@@ -31,7 +31,7 @@ namespace System.Threading {
 
     [HostProtection(Synchronization=true, ExternalThreading=true)]
     [System.Runtime.InteropServices.ComVisible(true)]
-    public static class Monitor 
+    public static partial class Monitor
     {
         /*=========================================================================
         ** Obtain the monitor lock of obj. Will block if another thread holds the lock
@@ -66,11 +66,12 @@ namespace System.Threading {
             throw new ArgumentException(Environment.GetResourceString("Argument_MustBeFalse"), "lockTaken");
         }
 
+#if !MONO
         [System.Security.SecuritySafeCritical]
         [ResourceExposure(ResourceScope.None)]
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         private static extern void ReliableEnter(Object obj, ref bool lockTaken);
-
+#endif
 
 
         /*=========================================================================
@@ -160,10 +161,12 @@ namespace System.Threading {
             ReliableEnterTimeout(obj, MillisecondsTimeoutFromTimeSpan(timeout), ref lockTaken);
         }
 
+#if !MONO
         [System.Security.SecuritySafeCritical]
         [ResourceExposure(ResourceScope.None)]
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         private static extern void ReliableEnterTimeout(Object obj, int timeout, ref bool lockTaken);
+#endif
 
         [System.Security.SecuritySafeCritical]
         public static bool IsEntered(object obj)
@@ -174,10 +177,12 @@ namespace System.Threading {
             return IsEnteredNative(obj);
         }
 
+#if !MONO
         [System.Security.SecurityCritical]
         [ResourceExposure(ResourceScope.None)]
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         private static extern bool IsEnteredNative(Object obj);
+#endif
 
         /*========================================================================
     ** Waits for notification from the object (via a Pulse/PulseAll). 
@@ -190,10 +195,12 @@ namespace System.Threading {
     **
         ** Exceptions: ArgumentNullException if object is null.
     ========================================================================*/
+#if !MONO
         [System.Security.SecurityCritical]  // auto-generated
         [ResourceExposure(ResourceScope.None)]
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         private static extern bool ObjWait(bool exitContext, int millisecondsTimeout, Object obj);
+#endif
 
         [System.Security.SecuritySafeCritical]  // auto-generated
         public static bool Wait(Object obj, int millisecondsTimeout, bool exitContext)
@@ -228,10 +235,12 @@ namespace System.Threading {
         * Exceptions: SynchronizationLockException if this method is not called inside
         * a synchronized block of code.
         ========================================================================*/
+#if !MONO
         [System.Security.SecurityCritical]  // auto-generated
         [ResourceExposure(ResourceScope.None)]
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         private static extern void ObjPulse(Object obj);
+#endif
 
         [System.Security.SecuritySafeCritical]  // auto-generated
         public static void Pulse(Object obj)
@@ -247,10 +256,12 @@ namespace System.Threading {
         /*========================================================================
         ** Sends a notification to all waiting objects. 
         ========================================================================*/
+#if !MONO
         [System.Security.SecurityCritical]  // auto-generated
         [ResourceExposure(ResourceScope.None)]
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         private static extern void ObjPulseAll(Object obj);
+#endif
 
         [System.Security.SecuritySafeCritical]  // auto-generated
         public static void PulseAll(Object obj)
author	Kelly Washington <kelly@lindenlab.com>	2016-07-08 19:20:07 +0300
committer	Kelly Washington <kelly@lindenlab.com>	2016-07-08 19:20:07 +0300
commit	9bf8d670fb9e8c223df4f4c11f4c935610b33320 (patch)
tree	535d9e7c2e8a462ab10e56be13778882ae182395 /mcs/class
parent	436c2cf1b39f50a17efe7a1e1cc1ae75286fa641 (diff)
parent	f16741a60aabbf2bc856a8b616fd3369b74107f7 (diff)