Skip to content

Commit 4e323a0

Browse files
mattjohnsonpintmattjohnsonpint
authored
Enable SqlDiagnosticListener on .NET Standard (#1931)
1 parent b534f15 commit 4e323a0

File tree

5 files changed

+13
-52
lines changed

5 files changed

+13
-52
lines changed

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -516,11 +516,10 @@
516516
<Link>Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.NotSupported.cs</Link>
517517
</Compile>
518518
</ItemGroup>
519-
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetGroup)' == 'netstandard'">
519+
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetFramework)' == 'netstandard2.0'">
520520
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIStreams.Task.cs" />
521521
<Compile Include="Microsoft\Data\SqlClient\SNI\SslOverTdsStream.NetStandard.cs" />
522522
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.NetStandard.cs" />
523-
<Compile Include="Microsoft\Data\SqlClient\SqlDiagnosticListener.NetStandard.cs" />
524523
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.NetStandard.cs" />
525524
<Compile Include="Microsoft\Data\SqlClient\TdsParser.NetStandard.cs" />
526525
</ItemGroup>
@@ -552,25 +551,21 @@
552551
<Compile Include="..\..\src\Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs">
553552
<Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs</Link>
554553
</Compile>
554+
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIStreams.ValueTask.cs" />
555+
<Compile Include="Microsoft\Data\SqlClient\SNI\SslOverTdsStream.NetCoreApp.cs" />
555556
<Compile Include="Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.CrossPlatform.cs" />
556-
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.NetCoreApp.cs" />
557-
</ItemGroup>
558-
<!-- netstandard 2.1 and above -->
559-
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetFramework)' != 'netstandard2.0'">
557+
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.NetCoreApp.cs" />
560558
<Compile Include="Microsoft\Data\SqlClient\SqlClientEventSource.NetCoreApp.cs" />
559+
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.NetCoreApp.cs" />
560+
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.NetCoreApp.cs" />
561+
<Compile Include="Microsoft\Data\SqlClient\TdsParser.NetCoreApp.cs" />
561562
</ItemGroup>
562563
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetGroup)' == 'netcoreapp'">
563564
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.cs">
564565
<Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.cs</Link>
565566
</Compile>
566567
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPool.NetCoreApp.cs" />
567-
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIStreams.ValueTask.cs" />
568-
<Compile Include="Microsoft\Data\SqlClient\SNI\SslOverTdsStream.NetCoreApp.cs" />
569-
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.NetCoreApp.cs" />
570-
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />
571-
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.NetCoreApp.cs" />
572-
<Compile Include="Microsoft\Data\SqlClient\SqlDiagnosticListener.NetCoreApp.cs" />
573-
<Compile Include="Microsoft\Data\SqlClient\TdsParser.NetCoreApp.cs" />
568+
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />
574569
</ItemGroup>
575570
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS'">
576571
<Compile Include="Resources\StringsHelper.cs">
@@ -642,6 +637,7 @@
642637
<Compile Include="Microsoft\Data\SqlClient\SqlDataReader.cs" />
643638
<Compile Include="Microsoft\Data\SqlClient\SqlDbColumn.cs" />
644639
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs" />
640+
<Compile Include="Microsoft\Data\SqlClient\SqlDiagnosticListener.cs" />
645641
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
646642
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
647643
<Compile Include="Microsoft\Data\SqlClient\SqlUtil.cs" />
@@ -959,7 +955,7 @@
959955
<!-- Enable the project reference for debugging purposes. -->
960956
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
961957
<PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />
962-
<PackageReference Condition="$(TargetGroup) == 'netcoreapp' " Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
958+
<PackageReference Condition="$(TargetGroup) == 'netstandard'" Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
963959
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
964960
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
965961
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlDiagnosticListener.NetStandard.cs‎

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

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlDiagnosticListener.NetCoreApp.cs‎ renamed to ‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlDiagnosticListener.cs‎

File renamed without changes.

‎tools/props/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<MicrosoftDataSqlClientSNIRuntimeVersion>5.1.0</MicrosoftDataSqlClientSNIRuntimeVersion>
3939
<SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
4040
<MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
41-
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
4241
<SystemDiagnosticsPerformanceCounterVersion>6.0.1</SystemDiagnosticsPerformanceCounterVersion>
4342
<SystemRuntimeCachingVersion>6.0.0</SystemRuntimeCachingVersion>
4443
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
@@ -49,6 +48,7 @@
4948
<!-- NetStandard project dependencies -->
5049
<PropertyGroup>
5150
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
51+
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
5252
</PropertyGroup>
5353
<!-- AKV Provider project dependencies -->
5454
<PropertyGroup>

‎tools/specs/Microsoft.Data.SqlClient.nuspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
4646
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.24.0" />
4747
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
4848
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
49-
<dependency id="System.Diagnostics.DiagnosticSource" version="6.0.0" exclude="Compile" />
5049
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
5150
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
5251
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
@@ -63,6 +62,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
6362
<dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
6463
<dependency id="System.Buffers" version="4.5.1" />
6564
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
65+
<dependency id="System.Diagnostics.DiagnosticSource" version="6.0.0" exclude="Compile" />
6666
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
6767
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
6868
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
@@ -79,6 +79,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
7979
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
8080
<dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
8181
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
82+
<dependency id="System.Diagnostics.DiagnosticSource" version="6.0.0" exclude="Compile" />
8283
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
8384
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
8485
<dependency id="System.Text.Encodings.Web" version="6.0.0" />

0 commit comments

Comments
 (0)