Skip to content

Commit 647006e

Browse files
authored
Move to shared SqlClientMetaDataCollectionNames.cs (#1287)
1 parent 57dd66d commit 647006e

File tree

5 files changed

+59
-109
lines changed

5 files changed

+59
-109
lines changed

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,9 @@
208208
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionType.cs">
209209
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionType.cs</Link>
210210
</Compile>
211+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs">
212+
<Link>Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs</Link>
213+
</Compile>
211214
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs">
212215
<Link>Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs</Link>
213216
</Compile>
@@ -481,7 +484,6 @@
481484
<Compile Include="Microsoft\Data\SqlClient\SqlCachedBuffer.cs" />
482485
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnosticListenerExtensions.cs" />
483486
<Compile Include="Microsoft\Data\SqlClient\SqlClientFactory.cs" />
484-
<Compile Include="Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs" />
485487
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
486488
<Compile Include="Microsoft\Data\SqlClient\SqlCommandBuilder.cs" />
487489
<Compile Include="Microsoft\Data\SqlClient\SqlCommandSet.cs" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,9 @@
279279
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionType.cs">
280280
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionType.cs</Link>
281281
</Compile>
282+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs">
283+
<Link>Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs</Link>
284+
</Compile>
282285
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs">
283286
<Link>Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs</Link>
284287
</Compile>
@@ -430,15 +433,14 @@
430433
<Compile Include="Microsoft\Data\SqlClient\Server\SqlDataRecord.cs" />
431434
<Compile Include="Microsoft\Data\SqlClient\Server\TriggerAction.cs" />
432435
<Compile Include="Microsoft\Data\SqlTypes\SqlFileStream.cs" />
433-
<Compile Include="Microsoft\Data\SqlTypes\UnsafeNativeMethods.cs" />
436+
<Compile Include="Microsoft\Data\SqlTypes\UnsafeNativeMethods.cs" />
434437
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs" />
435438
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.cs" />
436439
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
437440
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs" />
438441
<Compile Include="Microsoft\Data\SqlClient\SqlCachedBuffer.cs" />
439442
<Compile Include="Microsoft\Data\SqlClient\SqlCertificateCallbacks.cs" />
440443
<Compile Include="Microsoft\Data\SqlClient\SqlClientFactory.cs" />
441-
<Compile Include="Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs" />
442444
<Compile Include="Microsoft\Data\SqlClient\SqlClientOriginalAddressInfo.cs" />
443445
<Compile Include="Microsoft\Data\SqlClient\SqlClientPermission.cs" />
444446
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlClientMetaDataCollectionNames.cs

Lines changed: 0 additions & 53 deletions
This file was deleted.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
namespace Microsoft.Data.SqlClient
6+
{
7+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/SqlClientMetaDataCollectionNames/*' />
8+
public static class SqlClientMetaDataCollectionNames
9+
{
10+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/Columns/*' />
11+
public static readonly string Columns = "Columns";
12+
13+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/Databases/*' />
14+
public static readonly string Databases = "Databases";
15+
16+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/ForeignKeys/*' />
17+
public static readonly string ForeignKeys = "ForeignKeys";
18+
19+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/IndexColumns/*' />
20+
public static readonly string IndexColumns = "IndexColumns";
21+
22+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/Indexes/*' />
23+
public static readonly string Indexes = "Indexes";
24+
25+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/ProcedureParameters/*' />
26+
public static readonly string ProcedureParameters = "ProcedureParameters";
27+
28+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/Procedures/*' />
29+
public static readonly string Procedures = "Procedures";
30+
31+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/Tables/*' />
32+
public static readonly string Tables = "Tables";
33+
34+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/UserDefinedTypes/*' />
35+
public static readonly string UserDefinedTypes = "UserDefinedTypes";
36+
37+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/Users/*' />
38+
public static readonly string Users = "Users";
39+
40+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/ViewColumns/*' />
41+
public static readonly string ViewColumns = "ViewColumns";
42+
43+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/Views/*' />
44+
public static readonly string Views = "Views";
45+
46+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/AllColumns/*' />
47+
public static readonly string AllColumns = "AllColumns";
48+
49+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/ColumnSetColumns/*' />
50+
public static readonly string ColumnSetColumns = "ColumnSetColumns";
51+
}
52+
}

0 commit comments

Comments
 (0)