[msvc] Update csproj files (#5995)

9 files changed, 449 insertions, 247 deletions

diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation-net_4_x.csproj b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation-net_4_x.csproj
index 194c785659b..9255df08bc5 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation-net_4_x.csproj
+++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation-net_4_x.csproj
@@ -56,7 +56,7 @@
   <ItemGroup>

     <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.InteropServices.RuntimeInformation\src\System\Runtime\InteropServices\RuntimeInformation\Architecture.cs" />

     <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.InteropServices.RuntimeInformation\src\System\Runtime\InteropServices\RuntimeInformation\OSPlatform.cs" />

-    <Compile Include="Assembly\AssemblyInfo.cs" />

+    <Compile Include="AssemblyInfo.cs" />

     <Compile Include="corefx\SR.cs" />

     <Compile Include="System.Runtime.InteropServices\RuntimeInformation.cs" />
  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

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 63cbdbcfbb0..c0e7206ad9b 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
@@ -54,8 +54,14 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

     <Compile Include="..\..\..\external\cecil\ProjectInfo.cs" />

-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\*.cs" />

-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\*.cs" />
  </ItemGroup>

+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\AssemblyInfo.cs" />

+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbReader.cs" />

+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbWriter.cs" />

+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />

+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />

+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />

+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />

+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\SymbolWriterImpl.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">

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 9d892bda308..46099bcf597 100644
--- a/mcs/class/Mono.Cecil/Mono.Cecil-net_4_x.csproj
+++ b/mcs/class/Mono.Cecil/Mono.Cecil-net_4_x.csproj
@@ -53,9 +53,45 @@
   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\*.cs" />

-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\*.cs" />

-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\*.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Code.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeReader.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeWriter.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Document.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ExceptionHandler.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ILProcessor.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Instruction.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\MethodBody.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCode.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCodes.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\PortablePdb.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\SequencePoint.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Symbols.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableDefinition.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableReference.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\BlobHeap.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Buffers.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\CodedIndex.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\ElementType.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\GuidHeap.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Heap.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\MetadataToken.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\PdbHeap.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Row.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\StringHeap.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TableHeap.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TokenType.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\UserStringHeap.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Utilities.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamReader.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamWriter.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBuffer.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBufferEqualityComparer.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\DataDirectory.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Image.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageReader.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageWriter.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Section.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\TextMap.cs" />

     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ArrayType.cs" />

     <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyDefinition.cs" />

     <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyFlags.cs" />

@@ -140,9 +176,13 @@
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeSystem.cs" />

     <Compile Include="..\..\..\external\cecil\Mono.Cecil\VariantType.cs" />

     <Compile Include="..\..\..\external\cecil\Mono.Cecil\WindowsRuntimeProjections.cs" />

-    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\*.cs" />

-    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\*.cs" />

-    <Compile Include="..\..\..\external\cecil\Mono\*.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\Collection.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\ReadOnlyCollection.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoConvert.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoService.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono\Disposable.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono\Empty.cs" />

+    <Compile Include="..\..\..\external\cecil\Mono\Type.cs" />

     <Compile Include="..\..\..\external\cecil\ProjectInfo.cs" />

     <Compile Include="Consts.cs" />
  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

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 1e149ad2300..0d3ca818c39 100644
--- a/mcs/class/System.Core/System.Core-net_4_x.csproj
+++ b/mcs/class/System.Core/System.Core-net_4_x.csproj
@@ -63,7 +63,28 @@
     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\HashSet.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\HashSetEqualityComparer.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\ICollectionDebugView.cs" />

-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\*.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\BinaryOperationBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\BindingRestrictions.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\CallInfo.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\ConvertBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\CreateInstanceBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\DeleteIndexBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\DeleteMemberBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\DynamicMetaObject.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\DynamicMetaObjectBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\DynamicObject.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\ExpandoClass.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\ExpandoObject.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\GetIndexBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\GetMemberBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\IDynamicMetaObjectProvider.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\IInvokeOnGetBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\InvokeBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\InvokeMemberBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\SetIndexBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\SetMemberBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\UnaryOperationBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\UpdateDelegates.Generated.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\CacheDict.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\CachedReflectionInfo.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\CollectionExtensions.cs" />

@@ -76,7 +97,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\ListParameterProvider.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\TypeExtensions.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\TypeUtils.cs" />

-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\*.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\BinaryExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\BlockExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\CatchBlock.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Common\ArrayBuilderExtensions.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Common\CachedReflectionInfo.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Common\ConstantCheck.cs" />

@@ -109,6 +132,51 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Temps.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\TypeInfoExtensions.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\VariableBinder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ConditionalExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ConstantExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\DebugInfoExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\DebugViewWriter.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\DefaultExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\DynamicExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\DynamicExpressionVisitor.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ElementInit.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Error.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Expression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Expression.DebuggerProxy.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ExpressionStringBuilder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ExpressionType.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ExpressionVisitor.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\GotoExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\IArgumentProvider.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\IDynamicExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\IndexExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\InvocationExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\IParameterProvider.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\LabelExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\LabelTarget.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\LambdaExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ListInitExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\LoopExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\MemberAssignment.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\MemberBinding.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\MemberExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\MemberInitExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\MemberListBinding.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\MemberMemberBinding.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\MethodCallExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\NewArrayExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\NewExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ParameterExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\RuntimeVariablesExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\StackGuard.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Strings.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\SwitchCase.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\SwitchExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\SymbolDocumentInfo.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\TryExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\TypeBinaryExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\UnaryExpression.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Utils.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\IQueryable.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\CallSite.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\CallSiteBinder.cs" />

@@ -269,7 +337,52 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Queryable\src\System\Linq\Queryable.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Queryable\src\System\Linq\Strings.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Linq.Queryable\src\System\Linq\TypeHelper.cs" />

-    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\*.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Aggregate.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\AnyAll.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\AppendPrepend.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Average.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Buffer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Cast.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Concat.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Contains.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Count.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\DebugView.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\DefaultIfEmpty.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Distinct.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\ElementAt.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Enumerable.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Errors.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Except.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\First.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Grouping.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\GroupJoin.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Intersect.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Iterator.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Join.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Last.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Lookup.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Max.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Min.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\OrderBy.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\OrderedEnumerable.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Partition.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Range.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Repeat.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Reverse.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Select.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\SelectMany.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\SequenceEqual.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Set.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Single.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\SingleLinkedNode.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Skip.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Sum.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Take.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\ToCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Union.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Utilities.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Where.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Zip.cs" />

     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />

     <Compile Include="..\..\build\common\SR.cs" />

     <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />

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 cc0e368b325..4a21e89df24 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
@@ -33,7 +33,7 @@
     <DebugType>full</DebugType>

     <NoWarn>1699,436</NoWarn>

     <Optimize>false</Optimize>

-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

@@ -41,7 +41,7 @@
     <DebugType>pdbonly</DebugType>

     <NoWarn>1699,436</NoWarn>

     <Optimize>true</Optimize>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

@@ -53,20 +53,19 @@
   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\DataRowComparer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\DataRowExtensions.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\DataSetUtil.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\DataTableExtensions.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\EnumerableRowCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\EnumerableRowCollectionExtensions.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\OrderedEnumerableRowCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\SortExpressionBuilder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\TypedTableBase.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\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>

+    <Compile Include="corefx\SR.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">

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 7d211cad142..52f28f5833c 100644
--- a/mcs/class/System.Data/System.Data-net_4_x.csproj
+++ b/mcs/class/System.Data/System.Data-net_4_x.csproj
@@ -8,7 +8,7 @@
     <SchemaVersion>2.0</SchemaVersion>

     <ProjectGuid>{EC439BB8-FFED-4A32-A05D-2FA3A70CAD64}</ProjectGuid>

     <OutputType>Library</OutputType>

-    <NoWarn>1699,219,414,649</NoWarn>

+    <NoWarn>1699,219,414,649,619</NoWarn>

     <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>

     <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>

     <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>

@@ -31,7 +31,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

-    <NoWarn>1699,219,414,649</NoWarn>

+    <NoWarn>1699,219,414,649,619</NoWarn>

     <Optimize>false</Optimize>

     <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

@@ -39,7 +39,7 @@
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <DebugType>pdbonly</DebugType>

-    <NoWarn>1699,219,414,649</NoWarn>

+    <NoWarn>1699,219,414,649,619</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

@@ -53,10 +53,37 @@
   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\AdapterUtil.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\BasicFieldNameLookup.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\DbConnectionOptions.Common.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\DbConnectionPoolKey.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\FieldNameLookup.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\MultipartIdentifier.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\NameValuePair.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\SQLResource.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsPal.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\DebugSafeHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\InternalException.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Logging\DebugThreadTracking.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Logging\NetEventSource.Common.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\NegotiationInfoClass.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SecurityBuffer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SecurityBufferType.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\SecurityStatusPal.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\NotImplemented.cs" />

+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Threading\Tasks\TaskToApm.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\AcceptRejectRule.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\AggregateType.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\BaseCollection.cs" />

@@ -65,6 +92,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\CommandBehavior.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\CommandType.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\AdapterSwitches.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\AdapterUtil.Common.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\BigIntegerStorage.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\BooleanStorage.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\ByteStorage.cs" />

@@ -83,7 +111,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbCommand.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBCommandBuilder.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbConnection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbConnectionOptions.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbConnectionStringBuilder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbConnectionStringBuilderDescriptor.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbDataAdapter.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbDataReader.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbDataReaderExtensions.cs" />

@@ -103,7 +133,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbTransaction.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DecimalStorage.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DoubleStorage.cs" />

-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\FieldNameLookup.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\Groupbybehavior.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\IDbColumnSchemaGenerator.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\identifiercase.cs" />

@@ -296,139 +325,204 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlDataDocument.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlDataImplementation.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XPathNodePointer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\DBConnectionString.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\ExternDll.Linux.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\NameValuePermission.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\SafeNativeMethods.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\UnsafeNativeMethods.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\ProviderBase\DbBuffer.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\HResults.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Properties\SecurityTransparent.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\DbDataRecord.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\Odbc32.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommand.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommandBuilder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionFactory.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHelper.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionPoolProviderInfo.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionString.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionStringbuilder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataAdapter.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataReader.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironment.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironmentHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcError.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcErrorCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcException.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcFactory.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcInfoMessageEvent.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataCollectionNames.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataColumnNames.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataFactory.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameter.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollectionHelper.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterHelper.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcReferenceCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcRowUpdatingEvent.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcStatementHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcTransaction.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcType.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcUtils.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Common.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\ExtendedClrTypeCode.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\ITypedGetters.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\ITypedGettersV3.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\ITypedSetters.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\ITypedSettersV3.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\MemoryRecordBuffer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\MetadataUtilsSmi.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiEventSink.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiEventSink_Default.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiGettersStream.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiMetaData.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiMetaDataProperty.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiRecordBuffer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiSettersStream.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiTypedGetterSetter.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiXetterAccessMap.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SmiXetterTypeCode.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SqlDataRecord.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\SqlRecordBuffer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\ValueUtilsSmi.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Common\ActivityCorrelator.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Common\AdapterUtil.SqlClient.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Common\DbConnectionOptions.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Common\DbConnectionStringCommon.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\OperationAbortedException.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionClosed.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionFactory.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionInternal.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPool.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolGroup.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolOptions.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolProviderInfo.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbMetaDataFactory.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbReferenceCollection.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\TimeoutTimer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlMetaData.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlNotificationRequest.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\ApplicationIntent.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\OnChangedEventHandler.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\ParameterPeekAheadValue.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\RowsCopiedEventArgs.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\RowsCopiedEventHandler.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNICommon.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIError.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNILoadHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIMarsConnection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIMarsHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIMarsQueuedPacket.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNINpHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIPacket.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIProxy.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNITcpHandle.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SslOverTdsStream.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SspiClientContextStatus.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SSRP.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SortOrder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBuffer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopyColumnMapping.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopyOptions.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCachedBuffer.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlClientDiagnosticListenerExtensions.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlClientFactory.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlClientMetaDataCollectionNames.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandSet.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionFactory.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionHelper.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionPoolKey.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionPoolProviderInfo.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionString.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionStringBuilder.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDataAdapter.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDataReader.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDbColumn.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDelegatedTransaction.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDependency.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDependencyListener.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDependencyUtils.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlEnums.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlError.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlErrorCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlException.cs" />

     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlInfoMessageEvent.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlInfoMessageEventHandler.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlInternalConnection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlInternalConnectionTds.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\sqlinternaltransaction.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\sqlmetadatafactory.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlNotificationEventArgs.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlNotificationInfo.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlNotificationSource.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlNotificationType.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameter.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlReferenceCollection.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlRowUpdatedEvent.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlRowUpdatedEventHandler.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlRowUpdatingEvent.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlRowUpdatingEventHandler.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlSequentialStream.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlSequentialTextReader.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlStatistics.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlStream.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlUtil.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsEnums.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParameterSetter.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserHelperClasses.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserSessionPool.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserStateObject.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserStateObjectFactory.Managed.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserStateObjectManaged.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserStaticMethods.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsRecordBufferSetter.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsValueSetter.cs" />

+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlTypes\SqlTypeWorkarounds.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\PrivilegedConfigurationManager.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\Common\AdapterUtil.cs" />

-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionOptions.cs" />

-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBConnectionString.cs" />

-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionStringCommon.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\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\GreenMethods.cs" />

     <Compile Include="..\referencesource\System.Data\System\Data\Common\HandlerBase.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\SafeNativeMethods.cs" />

-    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SqlXmlStorage.cs" />

-    <Compile Include="..\referencesource\System.Data\System\Data\Common\System.Data_BID.cs" />

-    <Compile Include="..\referencesource\System.Data\System\Data\Common\UnsafeNativeMethods.cs" />

     <Compile Include="..\referencesource\System.Data\System\Data\DataSet.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\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\DbConnectionPoolIdentity.cs" />

-    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolOptions.cs" />

-    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataFactory.cs" />

-    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\WrappedIUnknown.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" />

@@ -436,87 +530,36 @@
     <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\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\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\SQLTypes\SqlTypesSchemaImporter.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

-    <Compile Include="corefx\DataView.cs" />

-    <Compile Include="corefx\DBCommandBuilder.cs" />

     <Compile Include="corefx\DbConnection.cs" />

-    <Compile Include="corefx\FieldNameLookup.cs" />

-    <Compile Include="corefx\Index.cs" />

+    <Compile Include="corefx\DbConnectionOptions.cs" />

+    <Compile Include="corefx\DiagnosticListener.cs" />

+    <Compile Include="corefx\Odbc\AdapterUtil.cs" />

+    <Compile Include="corefx\Odbc\DbConnectionStringCommon.cs" />

+    <Compile Include="corefx\Odbc\OdbcFactory.cs" />

+    <Compile Include="corefx\Odbc\Res.cs" />

+    <Compile Include="corefx\OleDbStubs.cs" />

+    <Compile Include="corefx\SqlClientFactory.cs" />

+    <Compile Include="corefx\SqlCommand.cs" />

+    <Compile Include="corefx\SqlConnection.cs" />

+    <Compile Include="corefx\SqlConnectionStringBuilder.cs" />

+    <Compile Include="corefx\SqlDependencyUtils.cs" />

+    <Compile Include="corefx\SqlException.cs" />

+    <Compile Include="corefx\SqlMetaData.cs" />

+    <Compile Include="corefx\SqlParameter.cs" />

+    <Compile Include="corefx\SqlParameterCollection.cs" />

     <Compile Include="corefx\SR.cs" />

-    <Compile Include="Microsoft.SqlServer.Server\SqlDataRecord.cs" />

-    <Compile Include="Microsoft.SqlServer.Server\SqlMetaData.cs" />

-    <Compile Include="ReferenceSources\NativeOledbWrapper.cs" />

-    <Compile Include="ReferenceSources\PoolBlockingPeriod.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" />

-    <Compile Include="ReferenceSources\ThisAssembly.cs" />

-    <Compile Include="ReferenceSources\Win32NativeMethods.cs" />

-    <Compile Include="System.Data.Common\DbConnectionStringBuilderHelper.cs" />

-    <Compile Include="System.Data.Common\DbTypes.cs" />

-    <Compile Include="System.Data.Common\ExceptionHelper.cs" />

-    <Compile Include="System.Data.SqlClient\NetworkLibraryConverter.cs" />

-    <Compile Include="System.Data.SqlClient\OnChangeEventHandler.cs" />

-    <Compile Include="System.Data.SqlClient\SortOrder.cs" />

-    <Compile Include="System.Data.SqlClient\SqlAsyncResult.cs" />

-    <Compile Include="System.Data.SqlClient\SqlAsyncState.cs" />

-    <Compile Include="System.Data.SqlClient\SqlBulkCopy.cs" />

-    <Compile Include="System.Data.SqlClient\SqlBulkCopyColumnMapping.cs" />

-    <Compile Include="System.Data.SqlClient\SqlBulkCopyColumnMappingCollection.cs" />

-    <Compile Include="System.Data.SqlClient\SqlBulkCopyOptions.cs" />

-    <Compile Include="System.Data.SqlClient\SqlClientFactory.cs" />

-    <Compile Include="System.Data.SqlClient\SqlClientMetaDataCollectionNames.cs" />

-    <Compile Include="System.Data.SqlClient\SqlCommand.cs" />

-    <Compile Include="System.Data.SqlClient\SqlCommandBuilder.cs" />

-    <Compile Include="System.Data.SqlClient\SqlConnection.cs" />

+    <Compile Include="corefx\TdsEnums.cs" />

+    <Compile Include="corefx\ThisAssembly.cs" />

     <Compile Include="System.Data.SqlClient\SqlCredential.cs" />

-    <Compile Include="System.Data.SqlClient\SqlDataAdapter.cs" />

-    <Compile Include="System.Data.SqlClient\SqlDataReader.cs" />

-    <Compile Include="System.Data.SqlClient\SqlDataSourceConverter.cs" />

-    <Compile Include="System.Data.SqlClient\SQLDebugging.cs" />

-    <Compile Include="System.Data.SqlClient\SqlDecimalExtensions.cs" />

-    <Compile Include="System.Data.SqlClient\SqlDependency.cs" />

-    <Compile Include="System.Data.SqlClient\SqlException.cs" />

-    <Compile Include="System.Data.SqlClient\SqlInfoMessageEventHandler.cs" />

-    <Compile Include="System.Data.SqlClient\SqlInitialCatalogConverter.cs" />

-    <Compile Include="System.Data.SqlClient\SqlNotificationEventArgs.cs" />

-    <Compile Include="System.Data.SqlClient\SqlNotificationInfo.cs" />

-    <Compile Include="System.Data.SqlClient\SqlNotificationSource.cs" />

-    <Compile Include="System.Data.SqlClient\SqlNotificationType.cs" />

-    <Compile Include="System.Data.SqlClient\SqlParameter.cs" />

-    <Compile Include="System.Data.SqlClient\SqlParameterCollection.cs" />

-    <Compile Include="System.Data.SqlClient\SqlParameterConverter.cs" />

-    <Compile Include="System.Data.SqlClient\SqlRowsCopiedEventArgs.cs" />

-    <Compile Include="System.Data.SqlClient\SqlRowsCopiedEventHandler.cs" />

-    <Compile Include="System.Data.SqlClient\SqlRowUpdatedEventArgs.cs" />

-    <Compile Include="System.Data.SqlClient\SqlRowUpdatedEventHandler.cs" />

-    <Compile Include="System.Data.SqlClient\SqlRowUpdatingEventArgs.cs" />

-    <Compile Include="System.Data.SqlClient\SqlRowUpdatingEventHandler.cs" />

-    <Compile Include="System.Data.SqlClient\SqlTransaction.cs" />

-    <Compile Include="System.Data.SqlClient\SqlXmlTextReader.cs" />

-    <Compile Include="gen_OdbcConnection.cs" />

-    <Compile Include="gen_OdbcParameter.cs" />

-    <Compile Include="gen_OdbcParameterCollection.cs" />

-    <Compile Include="gen_OleDbConnection.cs" />

-    <Compile Include="gen_OleDbParameter.cs" />

-    <Compile Include="gen_OleDbParameterCollection.cs" />
  </ItemGroup>

+    <Compile Include="System.Data.SqlClient\SQLDebugging.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">

@@ -559,25 +602,26 @@
       <Project>{BD2FFDDC-BD89-4041-82F5-A696C941C7BE}</Project>

       <Name>System.Numerics-net_4_x</Name>

     </ProjectReference>

+    <ProjectReference Include="../System.Transactions/System.Transactions-net_4_x.csproj">

+      <Project>{3821C69F-220D-4231-992C-0FE05311A005}</Project>

+      <Name>System.Transactions-net_4_x</Name>

+    </ProjectReference>

     <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_x.csproj">

       <Project>{61E3D008-E273-4E12-860A-8ADA031098C2}</Project>

       <Name>System.EnterpriseServices-net_4_x</Name>

     </ProjectReference>

-    <ProjectReference Include="../Mono.Data.Tds/Mono.Data.Tds-net_4_x.csproj">

-      <Project>{39F59AE4-1381-4275-B14E-16D786F40B93}</Project>

-      <Name>Mono.Data.Tds-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.Transactions/System.Transactions-net_4_x.csproj">

-      <Project>{3821C69F-220D-4231-992C-0FE05311A005}</Project>

-      <Name>System.Transactions-net_4_x</Name>

-    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

+  <ItemGroup>

+    <EmbeddedResource Include="../../../external/corefx/src/System.Data.SqlClient/src/Resources/System.Data.SqlClient.SqlMetaData.xml">

+      <LogicalName>System.Data.SqlClient.SqlMetaData.xml</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

 </Project>

 
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 d508f9f53f2..dce363b00d9 100644
--- a/mcs/class/System.Web/System.Web-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-net_4_x.csproj
@@ -210,6 +210,7 @@
     <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\GenericAuthenticationEventHandler.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" />

@@ -229,7 +230,10 @@
     <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\DataSourceControlBuilder.cs" />

     <Compile Include="..\referencesource\System.Web\UI\DataSourceOperation.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\EmptyControlCollection.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\EventEntry.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" />

@@ -253,9 +257,11 @@
     <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\ImageClickEventArgs.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\IndexedString.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" />

@@ -274,6 +280,8 @@
     <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\PagesConfiguration.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\Pair.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" />

@@ -395,6 +403,7 @@
     <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\Logintextlayout.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" />

@@ -411,6 +420,7 @@
     <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\ObjectDataSourceObjectEventHandler.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" />

@@ -426,7 +436,9 @@
     <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\Scrollbars.cs" />

     <Compile Include="..\referencesource\System.Web\UI\WebControls\SendMailErrorEventHandler.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ServerValidateEventArgs.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" />

@@ -443,6 +455,8 @@
     <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\TableFooterRow.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TableHeaderRow.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" />

@@ -451,6 +465,7 @@
     <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\TreeNodeType.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" />

@@ -461,6 +476,8 @@
     <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\WebControls\WizardStep.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\WebControls\WizardStepType.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" />

@@ -860,7 +877,6 @@
     <Compile Include="System.Web.Security\AspNetDBSchemaChecker.cs" />

     <Compile Include="System.Web.Security\CookieProtection.cs" />

     <Compile Include="System.Web.Security\DefaultAuthenticationEventArgs.cs" />

-    <Compile Include="System.Web.Security\DefaultAuthenticationEventHandler.cs" />

     <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />

     <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />

     <Compile Include="System.Web.Security\FormsAuthentication.cs" />

@@ -1099,7 +1115,6 @@
     <Compile Include="System.Web.UI.WebControls\Login.cs" />

     <Compile Include="System.Web.UI.WebControls\LoginName.cs" />

     <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />

-    <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />

     <Compile Include="System.Web.UI.WebControls\LoginView.cs" />

     <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />

     <Compile Include="System.Web.UI.WebControls\Menu.cs" />

@@ -1116,7 +1131,6 @@
     <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />

     <Compile Include="System.Web.UI.WebControls\NamedCssStyleCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />

-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />

     <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />

     <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />

     <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />

@@ -1143,10 +1157,8 @@
     <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />

     <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\RouteParameter.cs" />

-    <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />

     <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />

-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />

     <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />

     <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />

     <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />

@@ -1167,9 +1179,7 @@
     <Compile Include="System.Web.UI.WebControls\TableCell.cs" />

     <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />

-    <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />

     <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />

-    <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />

     <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />

     <Compile Include="System.Web.UI.WebControls\TableRow.cs" />

     <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />

@@ -1187,7 +1197,6 @@
     <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />

     <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />

-    <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />

     <Compile Include="System.Web.UI.WebControls\TreeView.cs" />

     <Compile Include="System.Web.UI.WebControls\Unit.cs" />

     <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />

@@ -1202,11 +1211,9 @@
     <Compile Include="System.Web.UI.WebControls\WizardLayoutNavigationContainer.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardNavigationEventArgs.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardNavigationEventHandler.cs" />

-    <Compile Include="System.Web.UI.WebControls\WizardStep.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardStepBase.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardStepCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardStepControlBuilder.cs" />

-    <Compile Include="System.Web.UI.WebControls\WizardStepType.cs" />

     <Compile Include="System.Web.UI.WebControls\Xml.cs" />

     <Compile Include="System.Web.UI.WebControls\XmlBuilder.cs" />

     <Compile Include="System.Web.UI.WebControls\XmlDataSource.cs" />

@@ -1231,7 +1238,6 @@
     <Compile Include="System.Web.UI\CodeConstructType.cs" />

     <Compile Include="System.Web.UI\CodeRenderBuilder.cs" />

     <Compile Include="System.Web.UI\CollectionBuilder.cs" />

-    <Compile Include="System.Web.UI\CompilationMode.cs" />

     <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />

     <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />

     <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />

@@ -1250,7 +1256,6 @@
     <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />

     <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />

     <Compile Include="System.Web.UI\DataSourceControl.cs" />

-    <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />

     <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />

     <Compile Include="System.Web.UI\DataSourceView.cs" />

     <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />

@@ -1258,8 +1263,6 @@
     <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />

     <Compile Include="System.Web.UI\DesignTimeParseData.cs" />

     <Compile Include="System.Web.UI\DesignTimeTemplateParser.cs" />

-    <Compile Include="System.Web.UI\EmptyControlCollection.cs" />

-    <Compile Include="System.Web.UI\EventEntry.cs" />

     <Compile Include="System.Web.UI\ExpressionBinding.cs" />

     <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />

     <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />

@@ -1273,8 +1276,6 @@
     <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />

     <Compile Include="System.Web.UI\HtmlTextWriter.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\ListSourceHelper.cs" />

@@ -1303,7 +1304,6 @@
     <Compile Include="System.Web.UI\PageThemeBuilder.cs" />

     <Compile Include="System.Web.UI\PageThemeFileParser.cs" />

     <Compile Include="System.Web.UI\PageThemeParser.cs" />

-    <Compile Include="System.Web.UI\Pair.cs" />

     <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />

     <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />

     <Compile Include="System.Web.UI\PartialCachingControl.cs" />

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 2ca3e7a337b..62300b2a636 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
@@ -210,6 +210,7 @@
     <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\GenericAuthenticationEventHandler.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" />

@@ -229,7 +230,10 @@
     <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\DataSourceControlBuilder.cs" />

     <Compile Include="..\referencesource\System.Web\UI\DataSourceOperation.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\EmptyControlCollection.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\EventEntry.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" />

@@ -253,9 +257,11 @@
     <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\ImageClickEventArgs.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\IndexedString.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" />

@@ -274,6 +280,8 @@
     <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\PagesConfiguration.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\Pair.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" />

@@ -395,6 +403,7 @@
     <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\Logintextlayout.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" />

@@ -411,6 +420,7 @@
     <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\ObjectDataSourceObjectEventHandler.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" />

@@ -426,7 +436,9 @@
     <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\Scrollbars.cs" />

     <Compile Include="..\referencesource\System.Web\UI\WebControls\SendMailErrorEventHandler.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ServerValidateEventArgs.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" />

@@ -443,6 +455,8 @@
     <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\TableFooterRow.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\WebControls\TableHeaderRow.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" />

@@ -451,6 +465,7 @@
     <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\TreeNodeType.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" />

@@ -461,6 +476,8 @@
     <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\WebControls\WizardStep.cs" />

+    <Compile Include="..\referencesource\System.Web\UI\WebControls\WizardStepType.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" />

@@ -860,7 +877,6 @@
     <Compile Include="System.Web.Security\AspNetDBSchemaChecker.cs" />

     <Compile Include="System.Web.Security\CookieProtection.cs" />

     <Compile Include="System.Web.Security\DefaultAuthenticationEventArgs.cs" />

-    <Compile Include="System.Web.Security\DefaultAuthenticationEventHandler.cs" />

     <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />

     <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />

     <Compile Include="System.Web.Security\FormsAuthentication.cs" />

@@ -1099,7 +1115,6 @@
     <Compile Include="System.Web.UI.WebControls\Login.cs" />

     <Compile Include="System.Web.UI.WebControls\LoginName.cs" />

     <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />

-    <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />

     <Compile Include="System.Web.UI.WebControls\LoginView.cs" />

     <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />

     <Compile Include="System.Web.UI.WebControls\Menu.cs" />

@@ -1116,7 +1131,6 @@
     <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />

     <Compile Include="System.Web.UI.WebControls\NamedCssStyleCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />

-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />

     <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />

     <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />

     <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />

@@ -1143,10 +1157,8 @@
     <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />

     <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\RouteParameter.cs" />

-    <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />

     <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />

-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />

     <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />

     <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />

     <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />

@@ -1167,9 +1179,7 @@
     <Compile Include="System.Web.UI.WebControls\TableCell.cs" />

     <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />

-    <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />

     <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />

-    <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />

     <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />

     <Compile Include="System.Web.UI.WebControls\TableRow.cs" />

     <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />

@@ -1187,7 +1197,6 @@
     <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />

     <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />

-    <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />

     <Compile Include="System.Web.UI.WebControls\TreeView.cs" />

     <Compile Include="System.Web.UI.WebControls\Unit.cs" />

     <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />

@@ -1202,11 +1211,9 @@
     <Compile Include="System.Web.UI.WebControls\WizardLayoutNavigationContainer.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardNavigationEventArgs.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardNavigationEventHandler.cs" />

-    <Compile Include="System.Web.UI.WebControls\WizardStep.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardStepBase.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardStepCollection.cs" />

     <Compile Include="System.Web.UI.WebControls\WizardStepControlBuilder.cs" />

-    <Compile Include="System.Web.UI.WebControls\WizardStepType.cs" />

     <Compile Include="System.Web.UI.WebControls\Xml.cs" />

     <Compile Include="System.Web.UI.WebControls\XmlBuilder.cs" />

     <Compile Include="System.Web.UI.WebControls\XmlDataSource.cs" />

@@ -1231,7 +1238,6 @@
     <Compile Include="System.Web.UI\CodeConstructType.cs" />

     <Compile Include="System.Web.UI\CodeRenderBuilder.cs" />

     <Compile Include="System.Web.UI\CollectionBuilder.cs" />

-    <Compile Include="System.Web.UI\CompilationMode.cs" />

     <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />

     <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />

     <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />

@@ -1250,7 +1256,6 @@
     <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />

     <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />

     <Compile Include="System.Web.UI\DataSourceControl.cs" />

-    <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />

     <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />

     <Compile Include="System.Web.UI\DataSourceView.cs" />

     <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />

@@ -1258,8 +1263,6 @@
     <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />

     <Compile Include="System.Web.UI\DesignTimeParseData.cs" />

     <Compile Include="System.Web.UI\DesignTimeTemplateParser.cs" />

-    <Compile Include="System.Web.UI\EmptyControlCollection.cs" />

-    <Compile Include="System.Web.UI\EventEntry.cs" />

     <Compile Include="System.Web.UI\ExpressionBinding.cs" />

     <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />

     <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />

@@ -1273,8 +1276,6 @@
     <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />

     <Compile Include="System.Web.UI\HtmlTextWriter.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\ListSourceHelper.cs" />

@@ -1303,7 +1304,6 @@
     <Compile Include="System.Web.UI\PageThemeBuilder.cs" />

     <Compile Include="System.Web.UI\PageThemeFileParser.cs" />

     <Compile Include="System.Web.UI\PageThemeParser.cs" />

-    <Compile Include="System.Web.UI\Pair.cs" />

     <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />

     <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />

     <Compile Include="System.Web.UI\PartialCachingControl.cs" />

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 c1d2d5c565e..48e2bcc9db4 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
@@ -1058,6 +1058,9 @@
     <EmbeddedResource Include="resources/keyboards.resources.prebuilt">

       <LogicalName>keyboards.resources</LogicalName>

     </EmbeddedResource>

+    <EmbeddedResource Include="resources/System.Windows.Forms.resources.prebuilt">

+      <LogicalName>System.Windows.Forms.resources</LogicalName>

+    </EmbeddedResource>

     <EmbeddedResource Include="resources/16_computer.png">

       <LogicalName>16_computer.png</LogicalName>

     </EmbeddedResource>

@@ -1203,8 +1206,5 @@
       <LogicalName>errorProvider.ico</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

-  <ItemGroup>

-    <EmbeddedResource Include="resources/System.Windows.Forms.resx"/>

-  </ItemGroup>

 </Project>

-

+