diff options
author | Egor Bogatov <egorbo@gmail.com> | 2017-10-19 19:20:03 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2017-10-19 19:20:03 +0300 |
commit | 61559965a188d03456d6f7840a0cdabdf35c2400 (patch) | |
tree | acde54522e5ae3ff5849c846ddfda404df3b94ca /mcs/class/System.Data.DataSetExtensions | |
parent | c50b4ef9c7878cad91e232c57c49cc564d52552d (diff) |
[System.Data] move to corefx (#4893)
* [System.Data] move to corefx
* [System.Data] Missing API: SqlTypesSchemaImporters
* [System.Data] Missing API: SqlNotification*
* [System.Data] Missing API: SqlDataSourceEnumerator
* [System.Data] Missing API: SQLDebugging
* [System.Data] fix build
* [System.Data] remove public API from different assemblies
* Apply corefx changes
* Hide some PropertiesTest (missing API in corefx)
* Missing API: TypedDataSetGenerator*, etc
* Missing API: SqlClientMetaDataCollectionNames
* Missing API: SqlCredential
* SqlMetaDataFactory.cs is actually sqlmetadatafactory.cs (case sensitive)
* Missing API: PoolBlockingPeriod
* Fix case-sensitive issues
* Odbc support (requires changes in corefx)
* ODBC support
* Re-enable ODBC ProviderTests
* Apply corefx changes
* temp commit: fix build
* Missing API: Microsoft.SqlServer.Server.*
* Missing API: DBDataPermission, OdbcPermission, SqlClientPermission
* Missing API: DbProviderFactoriesConfigurationHandler, DbProviderConfigurationHandler, DbProviderFactory.CreatePermission
* Missing API: DbProviderFactories
* Missing API: SqlCommand BeginXXX methods, SqlException.Message, OdbcFactory.CreatePermission
* Add System.Data.SqlClient.SqlMetaData.xml (embedded resource)
* reorganize *.sources files for win32, macos and linux
* bump corefx
* [System.Data] API: SqlDataSourceEnumerator, SqlClientFactory, SqlParameter, SqlMetaData
* [System.Data] cleanup
* [System.Data] mobile profile, cleanup
* [System.Data] Fix few odbc tests (changes are in corefx PR)
* [System.Data] fix Open_ConnectionString_DatabaseInvalid test
* [System.Data] enable all tests
* Add AsynchronousProcessing and ConnectionReset to SqlConnectionStringBuilder
* [System.Data] fix build
* fix all ProvierTests
* fix tests (files several issues against the corefx)
* system-data code cleanup
* system-data code cleanup
* add SqlTypesSchemaImporters
* remove corefx/RuntimeInformation.cs, add OleDbPermission stub
* OleDbPermission should be serializable (fixing tests)
* remove ODBC from mobile profile
* fix linux build - add 619 (obsolete) to nowarn list.
* temp commit
* fix a few api diff issues
* add OleDbType type (currently exists even in mobile profiles)
* add stubs
* Add stubs for OleDb
* improve oledb stubs
* improve oledb stubs
* improve oledb stubs
* more oledb stubs
* add xunit tests from corefx
* Add SqlClient corefx tests
* use corefx sources for System.Data.DataSetExtensions
* Remove [InternalsVisibleTo ("System.Data.DataSetExtensions")] from System.Data
* [System.Data] sync with external/corefx
* fix linux\macOS builds
* Fix xunit tests
* System.Data/Makefile cleanup
* tabify System.Data
* Rollback changes in System.Web & SqlSharpCli
* small cleanup
* [System.Data] Remove redundant .sources files
* [System.Data] update odbc Res.cs
* [System.Data] Remove redundant .sources files
* fix System.Data.dll.sources (add a blank line)
* remove TypeForwarder for DBNull and register xunit tests for System.Data
* Bump API snapshot submodule
Diffstat (limited to 'mcs/class/System.Data.DataSetExtensions')
4 files changed, 34 insertions, 18 deletions
diff --git a/mcs/class/System.Data.DataSetExtensions/Makefile b/mcs/class/System.Data.DataSetExtensions/Makefile index 0e92b9ee3b4..407e7c2e3b1 100644 --- a/mcs/class/System.Data.DataSetExtensions/Makefile +++ b/mcs/class/System.Data.DataSetExtensions/Makefile @@ -1,19 +1,19 @@ thisdir = class/System.Data.DataSetExtensions -SUBDIRS = Test +SUBDIRS = include ../../build/rules.make LIBRARY = System.Data.DataSetExtensions.dll -TXT_RESOURCE_STRINGS = ../referencesource/System.Data.DataSetExtensions/System.Data.DataSetExtensions.txt - LIB_REFS = System.Core System System.Data System.Xml KEYFILE = ../ecma.pub -LIB_MCS_FLAGS = -nowarn:436 +LIB_MCS_FLAGS = -nowarn:436 -d:COREFX -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219 -nowarn:169 $(NUNIT_RESOURCE_FILES:%=/resource:%) +TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:219 -nowarn:169 $(NUNIT_RESOURCE_FILES:%=/resource:%) EXTRA_DISTFILES = $(RESOURCE_FILES) \ Test/System.Data/testdataset1.xml -include ../../build/library.make +RESX_RESOURCE_STRING = \ + ../../../external/corefx/src/System.Data.DataSetExtensions/src/Resources/Strings.resx +include ../../build/library.make diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.dll.sources b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.dll.sources index 212303fc27e..7e529ed466f 100644 --- a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.dll.sources +++ b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.dll.sources @@ -1,14 +1,14 @@ ../../build/common/Consts.cs Assembly/AssemblyInfo.cs -../referencesource/System.Data.DataSetExtensions/System/Data/DataRowComparer.cs -../referencesource/System.Data.DataSetExtensions/System/Data/DataRowExtensions.cs -../referencesource/System.Data.DataSetExtensions/System/Data/DataSetUtil.cs -../referencesource/System.Data.DataSetExtensions/System/Data/DataTableExtensions.cs -../referencesource/System.Data.DataSetExtensions/System/Data/EnumerableRowCollection.cs -../referencesource/System.Data.DataSetExtensions/System/Data/EnumerableRowCollectionExtensions.cs -../referencesource/System.Data.DataSetExtensions/System/Data/LinqDataView.cs -../referencesource/System.Data.DataSetExtensions/System/Data/OrderedEnumerableRowCollection.cs -../referencesource/System.Data.DataSetExtensions/System/Data/SortExpressionBuilder.cs -../referencesource/System.Data.DataSetExtensions/System/Data/TypedTableBase.cs -../referencesource/System.Data.DataSetExtensions/System/Data/TypedTableBaseExtensions.cs -ReferenceSources/Strings.cs +corefx/SR.cs + +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/DataRowComparer.cs +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/DataRowExtensions.cs +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/DataSetUtil.cs +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/DataTableExtensions.cs +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/EnumerableRowCollection.cs +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/EnumerableRowCollectionExtensions.cs +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/OrderedEnumerableRowCollection.cs +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/SortExpressionBuilder.cs +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/TypedTableBase.cs +../../../external/corefx/src/System.Data.DataSetExtensions/src/System/Data/TypedTableBaseExtensions.cs diff --git a/mcs/class/System.Data.DataSetExtensions/Test/System.Data/DataTableExtensionsTest.cs b/mcs/class/System.Data.DataSetExtensions/Test/System.Data/DataTableExtensionsTest.cs index 7049ffb687b..31f2d75a4f7 100644 --- a/mcs/class/System.Data.DataSetExtensions/Test/System.Data/DataTableExtensionsTest.cs +++ b/mcs/class/System.Data.DataSetExtensions/Test/System.Data/DataTableExtensionsTest.cs @@ -89,6 +89,7 @@ namespace MonoTests.System.Data Assert.AreEqual (2, i.Current ["ID"], "#4"); } +#if !COREFX //LinqDataView is not supported yet [Test] public void AsDataView () { @@ -99,5 +100,6 @@ namespace MonoTests.System.Data Assert.AreEqual (1, dv [0] ["ID"], "#1"); Assert.AreEqual (4, dv [1] ["ID"], "#2"); } +#endif } } diff --git a/mcs/class/System.Data.DataSetExtensions/corefx/SR.cs b/mcs/class/System.Data.DataSetExtensions/corefx/SR.cs new file mode 100644 index 00000000000..dc03d0dec60 --- /dev/null +++ b/mcs/class/System.Data.DataSetExtensions/corefx/SR.cs @@ -0,0 +1,14 @@ +// +// This file was generated by resx2sr tool +// + +partial class SR +{ + public const string DataSetLinq_InvalidEnumerationValue = "The {0} enumeration value, {1}, is not valid."; + public const string DataSetLinq_EmptyDataRowSource = "The source contains no DataRows."; + public const string DataSetLinq_NullDataRow = "The source contains a DataRow reference that is null."; + public const string DataSetLinq_CannotLoadDetachedRow = "The source contains a detached DataRow that cannot be copied to the DataTable."; + public const string DataSetLinq_CannotCompareDeletedRow = "The DataRowComparer does not work with DataRows that have been deleted since it only compares current values."; + public const string DataSetLinq_CannotLoadDeletedRow = "The source contains a deleted DataRow that cannot be copied to the DataTable."; + public const string DataSetLinq_NonNullableCast = "Cannot cast DBNull. Value to type '{0}'. Please use a nullable type."; +} |