Skip to content

Merge | SqlConnection.cs #3608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Sep 23, 2025
Merged

Merge | SqlConnection.cs #3608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
61ed5c2
Merge InternalsVisibleTo attribute
edwardneal Sep 10, 2025
c253b8c
netfx: sync collection syntax from netcore
edwardneal Sep 10, 2025
adf79e3
netfx: reorder SspiContextProvider property
edwardneal Sep 10, 2025
b6315e4
netfx, netcore: harmonise usage of GetOpenTdsConnection
edwardneal Sep 10, 2025
09bc6fd
netfx: port #378
edwardneal Sep 10, 2025
44df943
netfx: port #379
edwardneal Sep 10, 2025
20dd63a
netfx: sync use of named parameters
edwardneal Sep 10, 2025
2f6b38e
netfx: move GetSchema and CopyFrom from SqlConnectionHelper
edwardneal Sep 10, 2025
4ae818d
netfx: port dotnet/corefx#34047
edwardneal Sep 10, 2025
09b5377
netcore, netfx: sync constructor
edwardneal Sep 10, 2025
14f7c6e
netfx, netcore: sync designer attributes
edwardneal Sep 10, 2025
b8f7c85
netcore, netfx: sync trace messages
edwardneal Sep 10, 2025
26c732a
netcore, netfx: sync whitespace and comment changes
edwardneal Sep 10, 2025
e1ce3d8
netfx, netcore: conditionally compile CAS
edwardneal Sep 10, 2025
f7b25c0
netfx, netcore: conditionally compile WindowsIdentity impersonation
edwardneal Sep 10, 2025
1452ba9
netcore: prevent changing password when Authentication is Active Dire…
edwardneal Sep 10, 2025
aec831f
netfx, netcore: merge differing approaches to InfoMessage
edwardneal Sep 10, 2025
b966f7a
netcore, netfx: final conditional compilations needed to render files…
edwardneal Sep 10, 2025
82414f8
Final move of SqlConnection
edwardneal Sep 10, 2025
b8bf2b9
Remediate XML documentation paths
edwardneal Sep 10, 2025
f122aa4
netcore, netfx: add designer attribute to ref projects
edwardneal Sep 11, 2025
825b723
Missing debug assertion
edwardneal Sep 11, 2025
02980de
Add CS0618 to the NotSupported target
edwardneal Sep 11, 2025
9e11e79
First code review response
edwardneal Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,9 @@ public void RegisterColumnEncryptionKeyStoreProvidersOnConnection(System.Collect
public int CommandTimeout { get { throw null; } }
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ConnectionString/*'/>
[System.ComponentModel.DefaultValueAttribute("")]
#pragma warning disable CS0618
[System.ComponentModel.RecommendedAsConfigurableAttribute(true)]
#pragma warning restore CS0618
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
[System.ComponentModel.SettingsBindableAttribute(true)]
public override string ConnectionString { get { throw null; } set { } }
Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandSet.cs">
<Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnection.cs">
<Link>Microsoft\Data\SqlClient\SqlConnection.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs</Link>
</Compile>
Expand Down Expand Up @@ -812,7 +815,6 @@
</Compile>

<Compile Include="Microsoft\Data\SqlClient\SqlCommand.netcore.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
Expand Down
3 changes: 3 additions & 0 deletions src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,9 @@ public SqlConnection(string connectionString, Microsoft.Data.SqlClient.SqlCreden
public int CommandTimeout { get { throw null; } }
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ConnectionString/*'/>
[System.ComponentModel.DefaultValueAttribute("")]
#pragma warning disable CS0618
[System.ComponentModel.RecommendedAsConfigurableAttribute(true)]
#pragma warning restore CS0618
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
[System.ComponentModel.SettingsBindableAttribute(true)]
public override string ConnectionString { get { throw null; } set { } }
Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandSet.cs">
<Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnection.cs">
<Link>Microsoft\Data\SqlClient\SqlConnection.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs</Link>
</Compile>
Expand Down Expand Up @@ -980,7 +983,6 @@
</Compile>

<Compile Include="Microsoft\Data\SqlClient\SqlCommand.netfx.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
Expand Down
2,544 changes: 0 additions & 2,544 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,6 @@ public SqlConnection() : base()
_innerConnection = DbConnectionClosedNeverOpened.SingletonInstance;
}

// Copy Constructor
private void CopyFrom(SqlConnection connection)
{ // V1.2.3300
ADP.CheckArgumentNull(connection, "connection");
_userConnectionOptions = connection.UserConnectionOptions;
_poolGroup = connection.PoolGroup;

// SQLBU 432115
// Match the original connection's behavior for whether the connection was never opened,
// but ensure Clone is in the closed state.
if (DbConnectionClosedNeverOpened.SingletonInstance == connection._innerConnection)
{
_innerConnection = DbConnectionClosedNeverOpened.SingletonInstance;
}
else
{
_innerConnection = DbConnectionClosedPreviouslyOpened.SingletonInstance;
}
}

/// <devdoc>We use the _closeCount to avoid having to know about all our
/// children; instead of keeping a collection of all the objects that
/// would be affected by a close, we simply increment the _closeCount
Expand Down Expand Up @@ -311,27 +291,6 @@ internal DbMetaDataFactory GetMetaDataFactoryInternal(DbConnectionInternal inter
return GetMetaDataFactory(internalConnection);
}

/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchema2/*' />
override public DataTable GetSchema()
{
return this.GetSchema(DbMetaDataCollectionNames.MetaDataCollections, null);
}

/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionName/*' />
override public DataTable GetSchema(string collectionName)
{
return this.GetSchema(collectionName, null);
}

/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionNameRestrictionValues/*' />
override public DataTable GetSchema(string collectionName, string[] restrictionValues)
{
// NOTE: This is virtual because not all providers may choose to support
// returning schema data
SqlConnection.ExecutePermission.Demand();
return InnerConnection.GetSchema(ConnectionFactory, PoolGroup, this, collectionName, restrictionValues);
}

internal void NotifyWeakReference(int message)
{
InnerConnection.NotifyWeakReference(message);
Expand Down
Loading
Loading