diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index d918134b15..631a45c72b 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -208,6 +208,9 @@ Microsoft\Data\SqlClient\SqlClientEncryptionType.cs + + Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs + Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs @@ -477,7 +480,6 @@ - diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs deleted file mode 100644 index 1c805b53df..0000000000 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs +++ /dev/null @@ -1,53 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace Microsoft.Data.SqlClient -{ - - /// - public static class SqlClientMetaDataCollectionNames - { - /// - public static readonly string Columns = "Columns"; - - /// - public static readonly string Databases = "Databases"; - - /// - public static readonly string ForeignKeys = "ForeignKeys"; - - /// - public static readonly string IndexColumns = "IndexColumns"; - - /// - public static readonly string Indexes = "Indexes"; - - /// - public static readonly string ProcedureParameters = "ProcedureParameters"; - - /// - public static readonly string Procedures = "Procedures"; - - /// - public static readonly string Tables = "Tables"; - - /// - public static readonly string UserDefinedTypes = "UserDefinedTypes"; - - /// - public static readonly string Users = "Users"; - - /// - public static readonly string ViewColumns = "ViewColumns"; - - /// - public static readonly string Views = "Views"; - - /// - public static readonly string AllColumns = "AllColumns"; // supported starting from SQL Server 2008 - - /// - public static readonly string ColumnSetColumns = "ColumnSetColumns"; // supported starting from SQL Server 2008 - } -} diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj index f54e7630c6..7ac2634d8d 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -279,6 +279,9 @@ Microsoft\Data\SqlClient\SqlClientEncryptionType.cs + + Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs + Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs @@ -430,7 +433,7 @@ - + @@ -438,7 +441,6 @@ - diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs deleted file mode 100644 index 5400ac2fb0..0000000000 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs +++ /dev/null @@ -1,53 +0,0 @@ -//-// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace Microsoft.Data.SqlClient -{ - /// - public static class SqlClientMetaDataCollectionNames - { - /// - public static readonly string Columns = "Columns"; - - /// - public static readonly string Databases = "Databases"; - - /// - public static readonly string ForeignKeys = "ForeignKeys"; - - /// - public static readonly string IndexColumns = "IndexColumns"; - - /// - public static readonly string Indexes = "Indexes"; - - /// - public static readonly string ProcedureParameters = "ProcedureParameters"; - - /// - public static readonly string Procedures = "Procedures"; - - /// - public static readonly string Tables = "Tables"; - - /// - public static readonly string UserDefinedTypes = "UserDefinedTypes"; - - /// - public static readonly string Users = "Users"; - - /// - public static readonly string ViewColumns = "ViewColumns"; - - /// - public static readonly string Views = "Views"; - - /// - public static readonly string AllColumns = "AllColumns"; // supported starting from SQL Server 2008 - - /// - public static readonly string ColumnSetColumns = "ColumnSetColumns"; // supported starting from SQL Server 2008 - - } -} diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs new file mode 100644 index 0000000000..04ac2aab0f --- /dev/null +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs @@ -0,0 +1,52 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace Microsoft.Data.SqlClient +{ + /// + public static class SqlClientMetaDataCollectionNames + { + /// + public static readonly string Columns = "Columns"; + + /// + public static readonly string Databases = "Databases"; + + /// + public static readonly string ForeignKeys = "ForeignKeys"; + + /// + public static readonly string IndexColumns = "IndexColumns"; + + /// + public static readonly string Indexes = "Indexes"; + + /// + public static readonly string ProcedureParameters = "ProcedureParameters"; + + /// + public static readonly string Procedures = "Procedures"; + + /// + public static readonly string Tables = "Tables"; + + /// + public static readonly string UserDefinedTypes = "UserDefinedTypes"; + + /// + public static readonly string Users = "Users"; + + /// + public static readonly string ViewColumns = "ViewColumns"; + + /// + public static readonly string Views = "Views"; + + /// + public static readonly string AllColumns = "AllColumns"; + + /// + public static readonly string ColumnSetColumns = "ColumnSetColumns"; + } +}