Skip to content

Merge | Diagnostic Files #3213

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 6 commits into from
Mar 19, 2025
Merged

Merge | Diagnostic Files #3213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24cda5d
Move diagnostic files into common project in diagnostics folder
benrr101 Mar 11, 2025
d7f97a8
Add stubs for sqlcommand and sqlconnection (for sqldiagnostic work)
benrr101 Mar 11, 2025
fb9e78d
Splitting SqlClientDiagnostic.netcore.cs into one file per class
benrr101 Mar 12, 2025
5c7ef3e
Put extension methods back in the listener class itself.
benrr101 Mar 12, 2025
6bcb79b
Decompose the extensions file into separate files for diagnostic scopes
benrr101 Mar 12, 2025
03b2459
Move remaining files to diagnostics namespace
benrr101 Mar 12, 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
Next Next commit
Move diagnostic files into common project in diagnostics folder
  • Loading branch information
@benrr101
benrr101 committed Mar 11, 2025
commit 24cda5dc15b8c41aba0348744ffc5d6c244f381f
12 changes: 9 additions & 3 deletions 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 @@ -179,6 +179,15 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
<Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientDiagnostic.netcore.cs">
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientDiagnostic.netcore.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientDiagnosticListenerExtensions.netcore.cs">
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientDiagnosticListenerExtensions.netcore.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.netcore.cs">
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.netcore.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs">
<Link>Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs</Link>
</Compile>
Expand Down Expand Up @@ -665,16 +674,13 @@
<Compile Include="Microsoft\Data\SqlClient\SNI\SSRP.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlAppContextSwitchManager.NetCoreApp.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnostic.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnosticListenerExtensions.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientEventSource.NetCoreApp.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDataReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDiagnosticListener.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
Expand Down
4 changes: 4 additions & 0 deletions ...oft/Data/SqlClient/SqlClientDiagnostic.cs → ...iagnostics/SqlClientDiagnostic.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if NET

using System;
using System.Collections;
using System.Collections.Generic;
Expand Down Expand Up @@ -968,3 +970,5 @@ public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
}
}
}

#endif
4 changes: 4 additions & 0 deletions .../SqlClientDiagnosticListenerExtensions.cs → ...ntDiagnosticListenerExtensions.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if NET

using System;
using System.Collections;
using System.Collections.Generic;
Expand Down Expand Up @@ -505,3 +507,5 @@ public static DiagnosticTransactionScope CreateTransactionRollbackScope(SqlDiagn
}
}
}

#endif
4 changes: 4 additions & 0 deletions ...t/Data/SqlClient/SqlDiagnosticListener.cs → ...gnostics/SqlDiagnosticListener.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if NET

using System.Diagnostics;
using System.Reflection;
using System.Runtime.Loader;
Expand All @@ -21,3 +23,5 @@ private void SqlDiagnosticListener_Unloading(AssemblyLoadContext obj)
}
}
}

#endif