Skip to content

Commit ff821cf

Browse files
authored
Share SqlCredential (#1038)
1 parent 2f19bc4 commit ff821cf

File tree

4 files changed

+10
-82
lines changed

4 files changed

+10
-82
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
@@ -214,6 +214,9 @@
214214
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs">
215215
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs</Link>
216216
</Compile>
217+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCredential.cs">
218+
<Link>Microsoft\Data\SqlClient\SqlCredential.cs</Link>
219+
</Compile>
217220
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
218221
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
219222
</Compile>
@@ -530,7 +533,6 @@
530533
<Compile Include="Microsoft\Data\SqlClient\SNI\SSRP.cs" />
531534
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectManaged.cs" />
532535
<Compile Include="Interop\SNINativeMethodWrapper.Common.cs" />
533-
<Compile Include="Microsoft\Data\SqlClient\SqlCredential.cs" />
534536
<Compile Include="Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs" />
535537
<Compile Include="Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs" />
536538
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,9 @@
454454
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionString.cs" />
455455
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs" />
456456
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs" />
457-
<Compile Include="Microsoft\Data\SqlClient\SqlCredential.cs" />
457+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCredential.cs">
458+
<Link>Microsoft\Data\SqlClient\SqlCredential.cs</Link>
459+
</Compile>
458460
<Compile Include="Microsoft\Data\SqlClient\SqlDataAdapter.cs" />
459461
<Compile Include="Microsoft\Data\SqlClient\SqlDataReader.cs" />
460462
<Compile Include="Microsoft\Data\SqlClient\SqlDataReaderSmi.cs" />

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

Lines changed: 0 additions & 76 deletions
This file was deleted.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
namespace Microsoft.Data.SqlClient
99
{
10-
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCredential.xml' path='docs/members[@name="SqlCredential"]/SqlCredential/*' />
10+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCredential.xml' path='docs/members[@name="SqlCredential"]/SqlCredential/*' />
1111
public sealed class SqlCredential
1212
{
1313
string _userId;
1414
SecureString _password;
1515

16-
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCredential.xml' path='docs/members[@name="SqlCredential"]/ctor/*' />
16+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCredential.xml' path='docs/members[@name="SqlCredential"]/ctor/*' />
1717
public SqlCredential(string userId, SecureString password)
1818
{
1919
if (userId == null)
@@ -45,10 +45,10 @@ public SqlCredential(string userId, SecureString password)
4545
_password = password;
4646
}
4747

48-
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCredential.xml' path='docs/members[@name="SqlCredential"]/UserId/*' />
48+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCredential.xml' path='docs/members[@name="SqlCredential"]/UserId/*' />
4949
public string UserId => _userId;
5050

51-
/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCredential.xml' path='docs/members[@name="SqlCredential"]/Password/*' />
51+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCredential.xml' path='docs/members[@name="SqlCredential"]/Password/*' />
5252
public SecureString Password => _password;
5353

5454
}

0 commit comments

Comments
 (0)