Merge pull request #4306 from BrzVlad/fix-roslyn-ppc

[ppc] Save all the registers in the context

diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AssemblyMirror.cs b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AssemblyMirror.cs
index 9b0af4c77d2d6aa0f09a12aaa2d7dacfa2ef586c..a83daab43cbfee31f48ab8f5654f196a791b03ca 100644 (file)
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AssemblyMirror.cs
+++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AssemblyMirror.cs
@@ -14,6 +14,7 @@ namespace Mono.Debugger.Soft
                ModuleMirror main_module;
                AssemblyName aname;
                AssemblyDefinition meta;
+               AppDomainMirror domain;
                Dictionary<string, long> typeCacheIgnoreCase = new Dictionary<string, long> (StringComparer.InvariantCultureIgnoreCase);
                Dictionary<string, long> typeCache = new Dictionary<string, long> ();
 
@@ -50,6 +51,17 @@ namespace Mono.Debugger.Soft
                        }
                }
 
+               // Since Protocol version 2.45
+               public AppDomainMirror Domain {
+                       get {
+                               if (domain == null) {
+                                       vm.CheckProtocolVersion (2, 45);
+                                       domain = vm.GetDomain (vm.conn.Assembly_GetIdDomain (id));
+                               }
+                               return domain;
+                       }
+               }
+
                public virtual AssemblyName GetName () {
                        if (aname == null) {
                                string name = vm.conn.Assembly_GetName (id);

diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
index 3a1af2dc08861aba4cce94d7e7fafc0146460749..e09132e27985b8c67eb2f725f4bdb5f120c1b7b9 100644 (file)
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
+++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
@@ -420,7 +420,7 @@ namespace Mono.Debugger.Soft
                 * with newer runtimes, and vice versa.
                 */
                internal const int MAJOR_VERSION = 2;
-               internal const int MINOR_VERSION = 44;
+               internal const int MINOR_VERSION = 45;
 
                enum WPSuspendPolicy {
                        NONE = 0,
@@ -532,7 +532,8 @@ namespace Mono.Debugger.Soft
                        GET_MANIFEST_MODULE = 3,
                        GET_OBJECT = 4,
                        GET_TYPE = 5,
-                       GET_NAME = 6
+                       GET_NAME = 6,
+                       GET_DOMAIN = 7
                }
 
                enum CmdModule {
@@ -2114,6 +2115,10 @@ namespace Mono.Debugger.Soft
                        return SendReceive (CommandSet.ASSEMBLY, (int)CmdAssembly.GET_NAME, new PacketWriter ().WriteId (id)).ReadString ();
                }
 
+               internal long Assembly_GetIdDomain (long id) {
+                       return SendReceive (CommandSet.ASSEMBLY, (int)CmdAssembly.GET_DOMAIN, new PacketWriter ().WriteId (id)).ReadId ();
+               }
+
                /*
                 * TYPE
                 */

diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs
index ce74b4fd5fb3f5852c1c1aa2679e72c8af45b364..61b3e31088102e4ffffb6bdae168636c1356d2de 100644 (file)
--- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs
+++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs
@@ -3490,6 +3490,7 @@ public class DebuggerTests
                // d_method is from another domain
                MethodMirror d_method = (e as BreakpointEvent).Method;
                Assert.IsTrue (m != d_method);
+               Assert.AreEqual (domain, d_method.DeclaringType.Assembly.Domain);
 
                var frames = e.Thread.GetFrames ();
                Assert.AreEqual ("invoke_in_domain", frames [0].Method.Name);

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 90369ff7047599aac5d2b2c98e1e3229e4c79178..fac304161e6addedd37c2bc419987e84fdc324dd 100644 (file)
--- a/mcs/class/System.Core/System.Core-net_4_x.csproj
+++ b/mcs/class/System.Core/System.Core-net_4_x.csproj
@@ -51,8 +51,10 @@
   <ItemGroup>\r
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ArrayBuilder.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\EnumerableHelpers.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\EnumerableHelpers.Linq.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\LargeArrayBuilder.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ReferenceEqualityComparer.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\SparseArrayBuilder.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Dynamic\Utils\CacheDict.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Dynamic\Utils\ContractUtils.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Dynamic\Utils\ContractUtils.RequiresArrayRange.cs" />\r
@@ -85,7 +87,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.Storage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\DelegateHelpers.Generated.cs" />\r
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\DelegateHelpers.netstandard1.7.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\DelegateHelpers.netstandard.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\HoistedLocals.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\ILGen.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedQueue.cs" />\r

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 0179fbb2613131e06d1038b8ce3ca9cfbea63d5f..b257d924a0a0e65f60022a80bd5b2d90718f5f1e 100644 (file)
--- a/mcs/class/System.Data/System.Data-net_4_x.csproj
+++ b/mcs/class/System.Data/System.Data-net_4_x.csproj
@@ -29,7 +29,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699,219,414,649</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -37,7 +37,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699,219,414,649</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -49,21 +49,61 @@
   </PropertyGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\AcceptRejectRule.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\AggregateType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\BaseCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\CatalogLocation.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ColumnTypeConverter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\CommandBehavior.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\CommandType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\AdapterSwitches.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\BigIntegerStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\BooleanStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\ByteStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\CharStorage.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataAdapter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataColumnMapping.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataColumnMappingCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataCommonEventSource.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataRecordInternal.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataStorage.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataTableMapping.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataTableMappingCollection.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DateTimeOffsetStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DateTimeStorage.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbColumn.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbCommand.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBCommandBuilder.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbConnection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbDataAdapter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbDataRecord.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbDataSourceEnumerator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbEnumerator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbException.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbMetaDataCollectionNames.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbMetaDataColumnNames.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbParameter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbParameterCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbProviderSpecificTypePropertyAttribute.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBSchemaRow.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBSchemaTable.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbTransaction.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DecimalStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DoubleStorage.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\Groupbybehavior.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\IDbColumnSchemaGenerator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\identifiercase.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\Int16Storage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\Int32Storage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\Int64Storage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\ObjectStorage.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\RowUpdatedEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\RowUpdatingEventArgs.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SByteStorage.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SchemaTableColumn.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SchemaTableOptionalColumn.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SingleStorage.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLConvert.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLBinaryStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQlBooleanStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLBytesStorage.cs" />\r
@@ -81,10 +121,118 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLStringStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SqlUDTStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\StringStorage.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SupportedJoinOperators.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\TimeSpanStorage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\UInt16Storage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\UInt32Storage.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\UInt64Storage.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConflictOptions.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConnectionState.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Constraint.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConstraintCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConstraintConverter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConstraintEnumerator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataColumn.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataColumnChangeEvent.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataColumnChangeEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataColumnCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataColumnPropertyDescriptor.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataError.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataException.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataKey.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRelation.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRelationCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRelationPropertyDescriptor.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRow.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRowAction.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRowChangeEvent.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRowChangeEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRowCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRowCreatedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRowState.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRowVersion.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataRowView.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataSerializationFormat.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataSet.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataSetDateTime.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataSysAttribute.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTable.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTableClearEvent.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTableClearEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTableCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTableNewRowEvent.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTableNewRowEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTablePropertyDescriptor.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTableReader.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTableReaderListener.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataTableTypeConverter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataView.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataViewListener.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataViewManager.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataViewManagerListItemTypeDescriptor.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataViewRowState.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataViewSetting.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataViewSettingCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DBConcurrencyException.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DbType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DefaultValueTypeConverter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\FillErrorEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\FillErrorEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\AggregateNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\BinaryNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\ConstNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\DataExpression.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\ExpressionNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\ExpressionParser.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\FilterException.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\FunctionNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\IFilter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\LookupNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\NameNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\Operators.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\UnaryNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Filter\ZeroOpNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ForeignKeyConstraint.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IColumnMapping.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IColumnMappingCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDataAdapter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDataParameter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDataParameterCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDataReader.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDataRecord.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDbCommand.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDbConnection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDbDataAdapter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDbDataParameter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDbTransaction.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IsolationLevel.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ITableMapping.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ITableMappingCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\KeyRestrictionBehavior.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\LoadOption.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\MappingType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\MergeFailedEvent.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\MergeFailedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Merger.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\MissingMappingAction.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\MissingSchemaAction.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ParameterDirection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\PrimaryKeyTypeConverter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\PropertyCollection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ProviderBase\DataReaderContainer.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ProviderBase\SchemaMapping.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Range.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\RbTree.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\RecordManager.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\RelatedView.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\RelationshipConverter.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Rule.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SchemaSerializationMode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SchemaType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Select.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Selection.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SimpleType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SqlDbType.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\INullable.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLBinary.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLBoolean.cs" />\r
@@ -105,6 +253,35 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLString.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLUtility.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SqlXml.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\StateChangeEvent.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\StateChangeEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\StatementCompletedEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\StatementCompletedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\StatementType.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\UniqueConstraint.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\UpdateRowSource.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\updatestatus.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XDRSchema.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlContent.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlDataLoader.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XMLDiffLoader.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlKeywords.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlReadMode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\xmlsaver.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XMLSchema.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlToDatasetMap.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlWriteMode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\BaseTreeIterator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\DataDocumentXPathNavigator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\DataPointer.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\DataSetMappper.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\IXmlDataVirtualNode.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\RegionIterator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\TreeIterator.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlBoundElement.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlDataDocument.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlDataImplementation.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XPathNodePointer.cs" />\r
     <Compile Include="..\..\build\common\AssemblyRef.cs" />\r
     <Compile Include="..\..\build\common\Consts.cs" />\r
     <Compile Include="..\..\build\common\Locale.cs" />\r
@@ -115,158 +292,34 @@
     <Compile Include="..\referencesource\System.Data\Misc\ExternDll.cs" />\r
     <Compile Include="..\referencesource\System.Data\Misc\HResults.cs" />\r
     <Compile Include="..\referencesource\System.Data\Misc\PrivilegedConfigurationManager.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\AcceptRejectRule.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\AggregateType.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\BaseCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\CatalogLocation.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\CodeGen\datacache.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\CodeGen\StrongTypingException.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ColumnTypeConverter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\CommandBehavior.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\CommandType.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\ActivityCorrelator.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\AdapterSwitches.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\AdapterUtil.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataAdapter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataColumnMapping.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataColumnMappingCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataRecordInternal.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataTableMapping.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DataTableMappingCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBCommand.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBCommandBuilder.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBConnection.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionOptions.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionPoolKey.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DBConnectionString.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionStringBuilder.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbConnectionStringCommon.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbDataAdapter.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DBDataPermission.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DBDataPermissionAttribute.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbDataReader.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\dbdatarecord.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbDataSourceEnumerator.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\dbenumerator.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbException.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBParameter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbParameterCollection.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderConfigurationHandler.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactories.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactoriesConfigurationHandler.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactory.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderSpecificTypePropertyAttribute.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBSchemaRow.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DBSchemaTable.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbTransaction.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\FieldNameLookup.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\GreenMethods.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\Groupbybehavior.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\HandlerBase.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\identifiercase.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\MultipartIdentifier.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\NameValuePair.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\NameValuePermission.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\NativeMethods.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\RowUpdatedEventArgs.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\RowUpdatingEventArgs.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\SafeNativeMethods.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\SchemaTableColumn.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\SchemaTableOptionalColumn.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLConvert.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\SQLTypes\SqlXmlStorage.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\SupportedJoinOperators.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\System.Data_BID.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Common\UnsafeNativeMethods.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ConflictOptions.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ConnectionState.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Constraint.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ConstraintCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ConstraintConverter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ConstraintEnumerator.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataColumn.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataColumnChangeEvent.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataColumnChangeEventHandler.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataColumnCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataColumnPropertyDescriptor.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataError.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataException.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataKey.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRelation.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRelationCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRelationPropertyDescriptor.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRow.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRowAction.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRowChangeEvent.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRowChangeEventHandler.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRowCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRowCreatedEventHandler.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRowState.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRowVersion.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataRowView.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataSerializationFormat.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\DataSet.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataSetDateTime.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataSysAttribute.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTable.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTableClearEvent.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTableClearEventHandler.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTableCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTableNewRowEvent.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTableNewRowEventHandler.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTablePropertyDescriptor.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTableReader.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTableReaderListener.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataTableTypeConverter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataView.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataViewListener.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataViewManager.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataViewManagerListItemTypeDescriptor.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataViewRowState.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataViewSetting.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DataViewSettingCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DBConcurrencyException.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\dbtype.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\DefaultValueTypeConverter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\FillErrorEventArgs.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\FillErrorEventHandler.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\AggregateNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\BinaryNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\ConstNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\DataExpression.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\ExpressionNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\ExpressionParser.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\FilterException.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\FunctionNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\IFilter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\LookupNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\NameNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\Operators.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\UnaryNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Filter\ZeroOpNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ForeignKeyConstraint.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IColumnMapping.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IColumnMappingCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDataAdapter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDataParameter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDataParameterCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDataReader.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDataRecord.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDbCommand.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDbConnection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDbDataAdapter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDbDataParameter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IDbTransaction.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\IsolationLevel.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ITableMapping.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ITableMappingCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\LoadOption.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\MappingType.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\MergeFailedEvent.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\MergeFailedEventHandler.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Merger.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\MissingMappingAction.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\MissingSchemaAction.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Odbc\DbDataRecord.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Odbc\Odbc32.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcCommand.cs" />\r
@@ -348,10 +401,6 @@
     <Compile Include="..\referencesource\System.Data\System\Data\OleDb\RowBinding.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\OleDb\SafeHandles.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\OperationAbortedException.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ParameterDirection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\PrimaryKeyTypeConverter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\PropertyCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DataReaderContainer.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbBuffer.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionClosed.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionFactory.cs" />\r
@@ -365,26 +414,10 @@
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolIdentity.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolOptions.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolProviderInfo.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataCollectionNames.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataColumnNames.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataFactory.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\DbReferenceCollection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\SchemaMapping.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\TimeoutTimer.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\ProviderBase\WrappedIUnknown.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Range.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\RbTree.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\RecordManager.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\RecordsAffectedEventArgs.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\RecordsAffectedEventHandler.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\RelatedView.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\RelationshipConverter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Rule.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\SchemaSerializationMode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\SchemaType.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Select.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\Selection.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\SimpleType.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\IBinarySerialize.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\invalidudtexception.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlDataSourceEnumerator.cs" />\r
@@ -410,35 +443,7 @@
     <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlUtil.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\TdsEnums.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\TdsParserStaticMethods.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\SqlDbType.cs" />\r
     <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\StateChangeEvent.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\StateChangeEventHandler.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\StatementType.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\UniqueConstraint.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\UpdateRowSource.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\updatestatus.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\XDRSchema.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\XmlContent.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\XmlDataLoader.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\XMLDiffLoader.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\XmlKeywords.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\XmlReadMode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\xmlsaver.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\XMLSchema.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\XmlToDatasetMap.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\Data\XmlWriteMode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\BaseTreeIterator.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\DataDocumentXPathNavigator.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\DataPointer.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\DataSetMappper.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\IXmlDataVirtualNode.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\RegionIterator.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\TreeIterator.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\XmlBoundElement.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\XmlDataDocument.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\XmlDataImplementation.cs" />\r
-    <Compile Include="..\referencesource\System.Data\System\NewXml\XPathNodePointer.cs" />\r
     <Compile Include="Assembly\AssemblyInfo.cs" />\r
     <Compile Include="corefx\SR.cs" />\r
     <Compile Include="Microsoft.SqlServer.Server\SqlDataRecord.cs" />\r

diff --git a/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj b/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj
index ec2594918a9d9e7d3b9592d811956ff1f8c62b16..6e237582de65640ebd46ed770128330729f58170 100644 (file)
--- a/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj
+++ b/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj
@@ -49,7 +49,7 @@
   </PropertyGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
-    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\Crc32Helper.cs" />\r
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Threading\Tasks\TaskToApm.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\BlockType.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\CopyEncoder.cs" />\r
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\DeflateInput.cs" />\r
@@ -78,6 +78,7 @@
     <Compile Include="..\..\build\common\Consts.cs" />\r
     <Compile Include="..\..\build\common\SR.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
+    <Compile Include="corefx\Crc32Helper.cs" />\r
     <Compile Include="corefx\SR.cs" />\r
     <Compile Include="corefx\ZipArchiveEntry.Mono.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r

diff --git a/mcs/class/System/Mono.Btls/MonoBtlsContext.cs b/mcs/class/System/Mono.Btls/MonoBtlsContext.cs
index 339ce4e57ced28d5dc8fe88eea4da5206abda013..5bdac307dc4cadee764cf594332aa87d369d7dc1 100644 (file)
--- a/mcs/class/System/Mono.Btls/MonoBtlsContext.cs
+++ b/mcs/class/System/Mono.Btls/MonoBtlsContext.cs
@@ -156,9 +156,20 @@ namespace Mono.Btls
 
                static Exception GetException (MonoBtlsSslError status)
                {
-                       var error = MonoBtlsError.GetError ();
+                       string file;
+                       int line;
+                       var error = MonoBtlsError.GetError (out file, out line);
+                       if (error == null)
+                               return new MonoBtlsException (status);
+
                        var text = MonoBtlsError.GetErrorString (error);
-                       return new MonoBtlsException ("{0} {1}", status, text);
+
+                       string message;
+                       if (file != null)
+                               message = string.Format ("{0} {1}\n  at {2}:{3}", status, text, file, line);
+                       else
+                               message = string.Format ("{0} {1}", status, text);
+                       return new MonoBtlsException (message);
                }
 
                public override bool ProcessHandshake ()

diff --git a/mcs/class/System/Mono.Btls/MonoBtlsError.cs b/mcs/class/System/Mono.Btls/MonoBtlsError.cs
index 5e61bcf04634b91e2c80d4c93668ddd9ebae6034..8371bdd0a63c16d0f6fd86bc54946e5662bfbe24 100644 (file)
--- a/mcs/class/System/Mono.Btls/MonoBtlsError.cs
+++ b/mcs/class/System/Mono.Btls/MonoBtlsError.cs
@@ -47,6 +47,12 @@ namespace Mono.Btls
                [DllImport (MonoBtlsObject.BTLS_DYLIB)]
                extern static void mono_btls_error_clear_error ();
 
+               [DllImport (MonoBtlsObject.BTLS_DYLIB)]
+               extern static int mono_btls_error_peek_error_line (out IntPtr file, out int line);
+
+               [DllImport (MonoBtlsObject.BTLS_DYLIB)]
+               extern static int mono_btls_error_get_error_line (out IntPtr file, out int line);
+
                [DllImport (MonoBtlsObject.BTLS_DYLIB)]
                extern static void mono_btls_error_get_error_string_n (int error, IntPtr buf, int len);
 
@@ -78,6 +84,28 @@ namespace Mono.Btls
                                Marshal.FreeHGlobal (buffer);
                        }
                }
+
+               public static int PeekError (out string file, out int line)
+               {
+                       IntPtr filePtr;
+                       var error = mono_btls_error_peek_error_line (out filePtr, out line);
+                       if (filePtr != IntPtr.Zero)
+                               file = Marshal.PtrToStringAnsi (filePtr);
+                       else
+                               file = null;
+                       return error;
+               }
+
+               public static int GetError (out string file, out int line)
+               {
+                       IntPtr filePtr;
+                       var error = mono_btls_error_get_error_line (out filePtr, out line);
+                       if (filePtr != IntPtr.Zero)
+                               file = Marshal.PtrToStringAnsi (filePtr);
+                       else
+                               file = null;
+                       return error;
+               }
        }
 }
 #endif

diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs
index 8a6bf30903dc24d7120aaa236f9afcf22ca11fb7..fb438763082c0c936af2bd6794a689cda85aedc3 100644 (file)
--- a/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs
+++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs
@@ -82,17 +82,10 @@ namespace Mono.Btls
                [DllImport (BTLS_DYLIB)]
                extern static IntPtr mono_btls_x509_lookup_peek_lookup (IntPtr handle);
 
+               MonoBtlsX509Store store;
                MonoBtlsX509LookupType type;
                List<MonoBtlsX509LookupMono> monoLookups;
 
-#if FIXME
-               // Do we need this?
-               internal MonoBtlsX509Lookup (BoringX509LookupHandle handle)
-                       : base (handle)
-               {
-               }
-#endif
-
                static BoringX509LookupHandle Create_internal (MonoBtlsX509Store store, MonoBtlsX509LookupType type)
                {
                        var handle = mono_btls_x509_lookup_new (
@@ -105,6 +98,7 @@ namespace Mono.Btls
                internal MonoBtlsX509Lookup (MonoBtlsX509Store store, MonoBtlsX509LookupType type)
                        : base (Create_internal (store, type))
                {
+                       this.store = store;
                        this.type = type;
                }
 
@@ -151,6 +145,7 @@ namespace Mono.Btls
                        var ret = mono_btls_x509_lookup_add_mono (
                                Handle.DangerousGetHandle (), monoLookup.Handle.DangerousGetHandle ());
                        CheckError (ret);
+                       monoLookup.Install (this);
 
                        if (monoLookups == null)
                                monoLookups = new List<MonoBtlsX509LookupMono> ();
@@ -196,6 +191,11 @@ namespace Mono.Btls
                        }
                }
 
+               internal void AddCertificate (MonoBtlsX509 certificate)
+               {
+                       store.AddCertificate (certificate);
+               }
+
                protected override void Close ()
                {
                        try {

diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs
index cd86cde03adf804e01ced27644fbef84ff994c93..e0f842af07151554de705a262861425640b0c4f6 100644 (file)
--- a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs
+++ b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs
@@ -67,6 +67,7 @@ namespace Mono.Btls
                IntPtr instance;
                BySubjectFunc bySubjectFunc;
                IntPtr bySubjectFuncPtr;
+               MonoBtlsX509Lookup lookup;
 
                internal MonoBtlsX509LookupMono ()
                        : base (new BoringX509LookupMonoHandle (mono_btls_x509_lookup_mono_new ()))
@@ -78,6 +79,18 @@ namespace Mono.Btls
                        mono_btls_x509_lookup_mono_init (Handle.DangerousGetHandle (), instance, bySubjectFuncPtr);
                }
 
+               internal void Install (MonoBtlsX509Lookup lookup)
+               {
+                       if (this.lookup != null)
+                               throw new InvalidOperationException ();
+                       this.lookup = lookup;
+               }
+
+               protected void AddCertificate (MonoBtlsX509 certificate)
+               {
+                       lookup.AddCertificate (certificate);
+               }
+
                protected abstract MonoBtlsX509 OnGetBySubject (MonoBtlsX509Name name);
 
 #if MONOTOUCH

diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMonoCollection.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMonoCollection.cs
index 139243e2a23d398f76af96ac3cc79b26cd6fccbf..d260ee69f50e39daed39cd6c9c58312cec98aa65 100644 (file)
--- a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMonoCollection.cs
+++ b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMonoCollection.cs
@@ -72,12 +72,16 @@ namespace Mono.Btls
                        Initialize ();
 
                        var hash = name.GetHash ();
+                       MonoBtlsX509 found = null;
+
                        for (int i = 0; i < certificates.Length; i++) {
-                               if (hashes [i] == hash)
-                                       return certificates [i];
+                               if (hashes [i] != hash)
+                                       continue;
+                               found = certificates [i];
+                               AddCertificate (found);
                        }
 
-                       return null;
+                       return found;
                }
 
                protected override void Close ()

diff --git a/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs b/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs
index eb920677d011e77052c6c029014f4ef97f27a375..b9c83ae438392869f42fe267116e5190ea429c35 100644 (file)
--- a/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs
+++ b/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs
@@ -386,11 +386,13 @@ namespace Mono.Btls
 
                void Import (byte[] data)
                {
-                       // Does it look like PEM?
-                       if ((data.Length > 0) && (data [0] != 0x30))
-                               x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.PEM);
-                       else
-                               x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.DER);
+                       if (data != null) {
+                               // Does it look like PEM?
+                               if ((data.Length > 0) && (data [0] != 0x30))
+                                       x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.PEM);
+                               else
+                                       x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.DER);
+                       }
                }
 
                void ImportPkcs12 (byte[] data, string password)

diff --git a/mono/btls/btls-error.c b/mono/btls/btls-error.c
index 75252162a2a24392761f5ae7ec98ea0ce43a713a..3d81b32f341fb8cdda66cca272876624fde5d71e 100644 (file)
--- a/mono/btls/btls-error.c
+++ b/mono/btls/btls-error.c
@@ -22,6 +22,18 @@ mono_btls_error_get_error (void)
        return ERR_get_error ();
 }
 
+MONO_API int
+mono_btls_error_peek_error_line (const char **file, int *line)
+{
+       return ERR_peek_error_line (file, line);
+}
+
+MONO_API int
+mono_btls_error_get_error_line (const char **file, int *line)
+{
+       return ERR_get_error_line (file, line);
+}
+
 MONO_API void
 mono_btls_error_clear_error (void)
 {

diff --git a/mono/btls/btls-error.h b/mono/btls/btls-error.h
index 6f791c372a4eb61feadba5cd5ec29ce48bf16a26..418727e9a09048a1b087d5c604da7a54b19c5523 100644 (file)
--- a/mono/btls/btls-error.h
+++ b/mono/btls/btls-error.h
@@ -23,6 +23,12 @@ mono_btls_error_get_error (void);
 void
 mono_btls_error_clear_error (void);
 
+int
+mono_btls_error_peek_error_line (const char **file, int *line);
+
+int
+mono_btls_error_get_error_line (const char **file, int *line);
+
 void
 mono_btls_error_get_error_string_n (int error, char *buf, int len);
 

diff --git a/mono/metadata/mono-debug-debugger.h b/mono/metadata/mono-debug-debugger.h
index c7e5385f933a1589f0a1863f8bbfc394e89c1acf..740b2dbe6fba93ba138e1ef394a3bacb8401f63a 100644 (file)
--- a/mono/metadata/mono-debug-debugger.h
+++ b/mono/metadata/mono-debug-debugger.h
@@ -1,9 +1,3 @@
-/*
- * This is a private header file.
- * The API in here is undocumented and may only be used by the JIT to
- * communicate with the debugger.
- */
-
 #ifndef __MONO_DEBUG_DEBUGGER_H__
 #define __MONO_DEBUG_DEBUGGER_H__
 

diff --git a/mono/mini/cpu-x86.md b/mono/mini/cpu-x86.md
index df978e0ae9277944b8b5542ed56c481b53b0f82a..adecdd3837d0157643054c9aff01e7b8f87d86be 100644 (file)
--- a/mono/mini/cpu-x86.md
+++ b/mono/mini/cpu-x86.md
@@ -66,7 +66,7 @@ break: len:1
 call: dest:a clob:c len:17
 tailcall: len:120 clob:c
 br: len:5
-seq_point: len:24 clob:c
+seq_point: len:26 clob:c
 il_seq_point: len:0
 
 int_beq: len:6

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index 7b0b052f4503743808c91874901a3e239398ae27..f64481d661fc599ae756a683e236674d61ba2d7d 100644 (file)
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -273,7 +273,7 @@ typedef struct {
 #define HEADER_LENGTH 11
 
 #define MAJOR_VERSION 2
-#define MINOR_VERSION 44
+#define MINOR_VERSION 45
 
 typedef enum {
        CMD_SET_VM = 1,
@@ -450,7 +450,8 @@ typedef enum {
        CMD_ASSEMBLY_GET_MANIFEST_MODULE = 3,
        CMD_ASSEMBLY_GET_OBJECT = 4,
        CMD_ASSEMBLY_GET_TYPE = 5,
-       CMD_ASSEMBLY_GET_NAME = 6
+       CMD_ASSEMBLY_GET_NAME = 6,
+       CMD_ASSEMBLY_GET_DOMAIN = 7
 } CmdAssembly;
 
 typedef enum {
@@ -4019,14 +4020,41 @@ send_type_load (MonoClass *klass)
 static void
 send_types_for_domain (MonoDomain *domain, void *user_data)
 {
+       MonoDomain* old_domain;
        AgentDomainInfo *info = NULL;
 
        info = get_agent_domain_info (domain);
        g_assert (info);
+
+       old_domain = mono_domain_get ();
+
+       mono_domain_set (domain, TRUE);
        
        mono_loader_lock ();
        g_hash_table_foreach (info->loaded_classes, emit_type_load, NULL);
        mono_loader_unlock ();
+
+       mono_domain_set (old_domain, TRUE);
+}
+
+static void
+send_assemblies_for_domain (MonoDomain *domain, void *user_data)
+{
+       GSList *tmp;
+       MonoDomain* old_domain;
+
+       old_domain = mono_domain_get ();
+
+       mono_domain_set (domain, TRUE);
+
+       mono_domain_assemblies_lock (domain);
+       for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
+               MonoAssembly* ass = (MonoAssembly *)tmp->data;
+               emit_assembly_load (ass, NULL);
+       }
+       mono_domain_assemblies_unlock (domain);
+
+       mono_domain_set (old_domain, TRUE);
 }
 
 static void
@@ -7821,7 +7849,7 @@ event_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                                break;
                        case EVENT_KIND_ASSEMBLY_LOAD:
                                /* Emit load events for currently loaded assemblies */
-                               mono_assembly_foreach (emit_assembly_load, NULL);
+                               mono_domain_foreach (send_assemblies_for_domain, NULL);
                                break;
                        case EVENT_KIND_THREAD_START:
                                /* Emit start events for currently started threads */
@@ -8041,6 +8069,10 @@ assembly_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                mono_error_cleanup (&error);
                return err;
        }
+       case CMD_ASSEMBLY_GET_DOMAIN: {
+               buffer_add_domainid (buf, domain);
+               break;
+       }
        case CMD_ASSEMBLY_GET_TYPE: {
                MonoError error;
                char *s = decode_string (p, &p, end);
@@ -9901,7 +9933,8 @@ static const char* assembly_cmds_str[] = {
        "GET_MANIFEST_MODULE",
        "GET_OBJECT",
        "GET_TYPE",
-       "GET_NAME"
+       "GET_NAME",
+       "GET_DOMAIN"
 };
 
 static const char* module_cmds_str[] = {

diff --git a/mono/mini/mini-x86.c b/mono/mini/mini-x86.c
index b616059dfb6d2f836b2d702ac380d3b54ddb1c6a..b85c2242c69e8fc7fb8e2b4ddfce4cb25bdcd6ab 100644 (file)
--- a/mono/mini/mini-x86.c
+++ b/mono/mini/mini-x86.c
@@ -2646,9 +2646,10 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                /* Load ss_tramp_var */
                                /* This is equal to &ss_trampoline */
                                x86_mov_reg_membase (code, X86_ECX, var->inst_basereg, var->inst_offset, sizeof (mgreg_t));
-                               x86_alu_membase_imm (code, X86_CMP, X86_ECX, 0, 0);
+                               x86_mov_reg_membase (code, X86_ECX, X86_ECX, 0, sizeof (mgreg_t));
+                               x86_alu_reg_imm (code, X86_CMP, X86_ECX, 0);
                                br[0] = code; x86_branch8 (code, X86_CC_EQ, 0, FALSE);
-                               x86_call_membase (code, X86_ECX, 0);
+                               x86_call_reg (code, X86_ECX);
                                x86_patch (br [0], code);
                        }
 

diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 68fb25fb8531b15a60a91c0cf4904fd9995a0a90..631aad2c5a8f315aca948b6ee64a5b4c32d04983 100644 (file)
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -1476,7 +1476,7 @@
     </project>
     <project dir="class/System.Data" library="System.Data-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize -nowarn:219,414,649 -d:PLATFORM_UNIX -d:USEOFFSET -d:MONO_PARTIAL_DATA_IMPORT -unsafe -r:./../../class/lib/net_4_x/System.dll -r:./../../class/lib/net_4_x/System.Xml.dll -r:./../../class/lib/net_4_x/System.Core.dll -r:./../../class/lib/net_4_x/System.Numerics.dll -r:./../../class/lib/net_4_x/System.EnterpriseServices.dll -r:./../../class/lib/net_4_x/Mono.Data.Tds.dll -r:./../../class/lib/net_4_x/System.Configuration.dll -r:./../../class/lib/net_4_x/System.Transactions.dll</flags>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize -nowarn:219,414,649 -d:COREFX -d:PLATFORM_UNIX -d:USEOFFSET -d:MONO_PARTIAL_DATA_IMPORT -unsafe -r:./../../class/lib/net_4_x/System.dll -r:./../../class/lib/net_4_x/System.Xml.dll -r:./../../class/lib/net_4_x/System.Core.dll -r:./../../class/lib/net_4_x/System.Numerics.dll -r:./../../class/lib/net_4_x/System.EnterpriseServices.dll -r:./../../class/lib/net_4_x/Mono.Data.Tds.dll -r:./../../class/lib/net_4_x/System.Configuration.dll -r:./../../class/lib/net_4_x/System.Transactions.dll</flags>
       <output>System.Data.dll</output>
       <built_sources>gen_OdbcConnection.cs gen_OleDbConnection.cs gen_OdbcParameter.cs gen_OleDbParameter.cs gen_OdbcParameterCollection.cs gen_OleDbParameterCollection.cs</built_sources>
       <library_output>./../../class/lib/net_4_x/System.Data.dll</library_output>
@@ -1487,7 +1487,7 @@
     </project>
     <project dir="class/System.Data" library="System.Data-tests-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize -r:./../../class/lib/net_4_x/System.Data.dll -nowarn:219,414,649 -d:PLATFORM_UNIX -d:USEOFFSET -d:MONO_PARTIAL_DATA_IMPORT -unsafe -r:./../../class/lib/net_4_x/System.dll -r:./../../class/lib/net_4_x/System.Xml.dll -r:./../../class/lib/net_4_x/System.Core.dll -r:./../../class/lib/net_4_x/System.Numerics.dll -r:./../../class/lib/net_4_x/System.EnterpriseServices.dll -r:./../../class/lib/net_4_x/Mono.Data.Tds.dll -r:./../../class/lib/net_4_x/System.Configuration.dll -r:./../../class/lib/net_4_x/System.Transactions.dll -nowarn:618,169,612,219,168</flags>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize -r:./../../class/lib/net_4_x/System.Data.dll -nowarn:219,414,649 -d:COREFX -d:PLATFORM_UNIX -d:USEOFFSET -d:MONO_PARTIAL_DATA_IMPORT -unsafe -r:./../../class/lib/net_4_x/System.dll -r:./../../class/lib/net_4_x/System.Xml.dll -r:./../../class/lib/net_4_x/System.Core.dll -r:./../../class/lib/net_4_x/System.Numerics.dll -r:./../../class/lib/net_4_x/System.EnterpriseServices.dll -r:./../../class/lib/net_4_x/Mono.Data.Tds.dll -r:./../../class/lib/net_4_x/System.Configuration.dll -r:./../../class/lib/net_4_x/System.Transactions.dll -nowarn:618,169,612,219,168</flags>
       <output>net_4_x_System.Data_test.dll</output>
       <built_sources>gen_OdbcConnection.cs gen_OleDbConnection.cs gen_OdbcParameter.cs gen_OleDbParameter.cs gen_OdbcParameterCollection.cs gen_OleDbParameterCollection.cs</built_sources>
       <library_output>net_4_x_System.Data_test.dll</library_output>

diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh
index 6aecd45ad20578f7adb42116ddd3d32b263b7d90..f8e2f2d79dec35f64fb31ef629b043b73f6135c8 100755 (executable)
--- a/scripts/ci/run-jenkins.sh
+++ b/scripts/ci/run-jenkins.sh
@@ -29,6 +29,7 @@ elif [[ ${CI_TAGS} == *'hybridaot_llvm'* ]];     then EXTRA_CONF_FLAGS="${EXTRA_
 elif [[ ${CI_TAGS} == *'aot_llvm'* ]];           then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --enable-llvm=yes --with-runtime_preset=aot ";
 elif [[ ${CI_TAGS} == *'fullaot'* ]];            then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=fullaot";
 elif [[ ${CI_TAGS} == *'hybridaot'* ]];          then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=hybridaot";
+elif [[ ${CI_TAGS} == *'winaot'* ]];             then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=winaot";
 elif [[ ${CI_TAGS} == *'aot'* ]];                then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=aot";
 elif [[ ${CI_TAGS} == *'bitcode'* ]];            then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=bitcode";
 elif [[ ${CI_TAGS} == *'interpreter'* ]];        then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-interpreter=yes";
@@ -52,7 +53,6 @@ if [ -x "/usr/bin/dpkg-architecture" ];
        wget -qO- https://download.mono-project.com/test/new-certs.tgz| tar zx -C ~/.config/.mono/
 fi
 
-
 ${TESTCMD} --label=configure --timeout=60m --fatal ./autogen.sh $EXTRA_CONF_FLAGS
 if [[ ${label} == 'w32' ]];
     then
@@ -64,6 +64,14 @@ if [[ ${label} == w* ]];
     ${TESTCMD} --label=make-msvc-sgen --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release /p:MONO_TARGET_GC=sgen msvc/mono.sln
 fi
 
+if [[ ${CI_TAGS} == *'winaot'* ]];
+    then
+    # The AOT compiler on Windows requires Visual Studio's clang.exe and link.exe in $PATH
+    # and we must make sure Visual Studio's link.exe comes before Cygwin's link.exe
+    VC_ROOT="/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC"
+    export PATH="$VC_ROOT/ClangC2/bin/amd64:$VC_ROOT/bin/amd64":$PATH
+fi
+
 if [[ ${CI_TAGS} == *'monolite'* ]]; then make get-monolite-latest; fi
 
 make_parallelism=-j4

diff --git a/scripts/ci/run-test-winaot.sh b/scripts/ci/run-test-winaot.sh
new file mode 100755 (executable)
index 0000000..c8b5d79
--- /dev/null
+++ b/scripts/ci/run-test-winaot.sh
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+
+if test -n "${MONO_LLVMONLY}";
+then
+${TESTCMD} --label=mini --timeout=25m make -j 4 -w -C mono/mini -k llvmonlycheck
+else
+${TESTCMD} --label=mini --timeout=25m make -j 4 -w -C mono/mini -k fullaotcheck
+fi
+
+${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 CI=1
+${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test
+${TESTCMD} --label=verify --timeout=15m make -w -C runtime mcs-compileall
+${TESTCMD} --label=profiler --timeout=30m make -w -C mono/profiler -k check
+${TESTCMD} --label=System --timeout=10m make -w -C mcs/class/System run-test
+${TESTCMD} --label=System.XML --timeout=5m make -w -C mcs/class/System.XML run-test
+${TESTCMD} --label=Mono.Security --timeout=5m make -w -C mcs/class/Mono.Security run-test
+${TESTCMD} --label=System.Data --timeout=5m make -w -C mcs/class/System.Data run-test
+${TESTCMD} --label=System.Web.Services --timeout=5m make -w -C mcs/class/System.Web.Services run-test
+${TESTCMD} --label=I18N.CJK --timeout=5m make -w -C mcs/class/I18N/CJK run-test
+${TESTCMD} --label=I18N.West --timeout=5m make -w -C mcs/class/I18N/West run-test
+${TESTCMD} --label=I18N.MidEast --timeout=5m make -w -C mcs/class/I18N/MidEast run-test
+${TESTCMD} --label=System.Transactions --timeout=5m make -w -C mcs/class/System.Transactions run-test
+${TESTCMD} --label=System.Core --timeout=15m make -w -C mcs/class/System.Core run-test
+${TESTCMD} --label=System.Xml.Linq --timeout=5m make -w -C mcs/class/System.Xml.Linq run-test
+${TESTCMD} --label=System.Runtime.Serialization --timeout=5m make -w -C mcs/class/System.Runtime.Serialization run-test
+${TESTCMD} --label=System.ServiceModel --timeout=15m make -w -C mcs/class/System.ServiceModel run-test
+${TESTCMD} --label=System.ServiceModel.Web --timeout=5m make -w -C mcs/class/System.ServiceModel.Web run-test
+${TESTCMD} --label=System.ComponentModel.DataAnnotations --timeout=5m make -w -C mcs/class/System.ComponentModel.DataAnnotations run-test
+${TESTCMD} --label=Mono.CSharp --timeout=5m make -w -C mcs/class/Mono.CSharp run-test
+${TESTCMD} --label=System.Numerics --timeout=5m make -w -C mcs/class/System.Numerics run-test
+${TESTCMD} --label=System.Net.Http --timeout=5m make -w -C mcs/class/System.Net.Http run-test
+${TESTCMD} --label=System.Json --timeout=5m make -w -C mcs/class/System.Json run-test
+
+rm -fr /tmp/jenkins-temp-aspnet*