Skip to content

Commit 260940b

Browse files
paulmedynskipaulmedynski
authored
Fix Wave Analysis issues (#3403)
1 parent e649a7c commit 260940b

File tree

9 files changed

+65
-47
lines changed

9 files changed

+65
-47
lines changed

‎src/Directory.Packages.props

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
<PackageVersion Include="Microsoft.Data.SqlClient.SNI" Version="6.0.2" />
99
<PackageVersion Include="System.Buffers" Version="4.5.1" />
1010
<PackageVersion Include="System.Memory" Version="4.5.5" />
11-
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
12-
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
1311
<PackageVersion Include="System.Data.Common" Version="4.3.0" />
12+
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
1413
</ItemGroup>
1514
<!-- NetFx and NetCore project dependencies -->
1615
<ItemGroup>
@@ -54,15 +53,17 @@
5453
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
5554
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.5" />
5655
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
57-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.5" />
58-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
5956
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
57+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
58+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.5" />
59+
<PackageVersion Include="System.Text.Json" Version="9.0.5" />
6060
</ItemGroup>
6161
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
6262
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="8.0.0" />
6363
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
64-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
65-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
6664
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
65+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
66+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
67+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
6768
</ItemGroup>
6869
</Project>

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,18 @@
3232
<Compile Include="..\..\ref\Microsoft.Data.SqlClient.Batch.NetCoreApp.cs" />
3333
</ItemGroup>
3434
<ItemGroup>
35+
<PackageReference Include="Azure.Identity" />
36+
<PackageReference Include="Microsoft.Bcl.Cryptography" />
3537
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
3638
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
37-
<PackageReference Include="Microsoft.SqlServer.Server" />
38-
<PackageReference Include="Azure.Identity" />
39-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
4039
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
40+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
41+
<PackageReference Include="Microsoft.SqlServer.Server" />
4142
<PackageReference Include="System.Configuration.ConfigurationManager" />
4243
<PackageReference Include="System.Security.Cryptography.Pkcs" />
43-
<PackageReference Include="Microsoft.Bcl.Cryptography" />
44+
45+
<!-- Transitive dependencies that would otherwise bring in older, vulnerable versions. -->
46+
<PackageReference Include="System.Text.Json" />
4447
</ItemGroup>
4548

4649
<Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetGroup)' != 'netcoreapp'" />

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -663,8 +663,8 @@
663663
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
664664
<Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
665665
</Compile>
666-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetadataFactory.cs">
667-
<Link>Microsoft\Data\SqlClient\SqlMetadataFactory.cs</Link>
666+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetaDataFactory.cs">
667+
<Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link>
668668
</Compile>
669669
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs">
670670
<Link>Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs</Link>
@@ -1036,18 +1036,20 @@
10361036
</ItemGroup>
10371037
<!-- Package References Etc -->
10381038
<ItemGroup>
1039+
<PackageReference Include="Azure.Identity" />
1040+
<PackageReference Include="Microsoft.Bcl.Cryptography" />
10391041
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
10401042
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
1041-
<!-- Enable the project reference for debugging purposes. -->
1042-
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
1043-
<PackageReference Include="Microsoft.SqlServer.Server" />
1044-
<PackageReference Include="Azure.Identity" />
1045-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
10461043
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
1044+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
1045+
<PackageReference Include="Microsoft.SqlServer.Server" />
10471046
<PackageReference Include="System.Configuration.ConfigurationManager" />
10481047
<PackageReference Include="System.Security.Cryptography.Pkcs" />
1049-
<PackageReference Include="Microsoft.Bcl.Cryptography" />
1048+
1049+
<!-- Transitive dependencies that would otherwise bring in older, vulnerable versions. -->
1050+
<PackageReference Include="System.Text.Json" />
10501051
</ItemGroup>
1052+
10511053
<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
10521054
<Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
10531055
<Import Project="$(ToolsDir)targets\NotSupported.targets" Condition="'$(OSGroup)' == 'AnyOS'" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@
3232
<Reference Include="System.Transactions" />
3333
</ItemGroup>
3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
36-
<PackageReference Include="System.Text.Encodings.Web" />
35+
<PackageReference Include="Azure.Identity" />
36+
<PackageReference Include="Microsoft.Bcl.Cryptography" />
3737
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
3838
<PrivateAssets>All</PrivateAssets>
3939
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4040
</PackageReference>
41-
<PackageReference Include="Azure.Identity" />
42-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
41+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
4342
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
43+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
4444
<PackageReference Include="System.Buffers" />
45-
<PackageReference Include="System.Text.Json" />
4645
<PackageReference Include="System.Data.Common" />
4746
<PackageReference Include="System.Security.Cryptography.Pkcs" />
48-
<PackageReference Include="Microsoft.Bcl.Cryptography" />
47+
<PackageReference Include="System.Text.Encodings.Web" />
48+
<PackageReference Include="System.Text.Json" />
4949
</ItemGroup>
5050
<Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" />
5151
</Project>

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

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.Net.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{407890AC-9876-4FEF-A6F1-F36A876BAADE}</ProjectGuid>
44
<RootNamespace></RootNamespace>
@@ -12,9 +12,6 @@
1212
<DocumentationFile>$(OutputPath)\Microsoft.Data.SqlClient.xml</DocumentationFile>
1313
<IntermediateOutputPath>$(ObjPath)$(AssemblyName)\netfx\</IntermediateOutputPath>
1414
<Product>Framework $(BaseProduct)</Product>
15-
<!-- ResolveComReferenceSilent suppresses warnings thrown due to the inclusion of mscoree.
16-
We should remove ResolveComReferenceSilent as soon as we can remove the dependency on mscoree. -->
17-
<ResolveComReferenceSilent>True</ResolveComReferenceSilent>
1815
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
1916
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
2017
</PropertyGroup>
@@ -61,7 +58,10 @@
6158
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
6259
<Utf8Output>True</Utf8Output>
6360
<ErrorReport>None</ErrorReport>
64-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
61+
62+
<!-- This code analysis ruleset only exists with the .NET Framework toolset. -->
63+
<CodeAnalysisRuleSet Condition="$(MSBuildRuntimeType) == 'Full'">MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
64+
6565
<BuildProjectReferences>True</BuildProjectReferences>
6666
<GenerateAssemblyRefs>True</GenerateAssemblyRefs>
6767
<DefineConstants>$(DefineConstants);USEOFFSET;CODE_ANALYSIS_BASELINE;FEATURE_LEGACYSURFACEAREA;FEATURE_UTF32;FEATURE_UTF7;TRACE;</DefineConstants>
@@ -951,7 +951,7 @@
951951
</ItemGroup>
952952
<ItemGroup>
953953
<Compile Include="Microsoft\Data\Common\ConnectionString\DbConnectionOptions.netfx.cs" />
954-
<Compile Include="Microsoft\Data\Common\DbConnectionString.cs" />
954+
<Compile Include="Microsoft\Data\Common\DBConnectionString.cs" />
955955
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
956956
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />
957957
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStreamChars.cs" />
@@ -1000,29 +1000,18 @@
10001000
</EmbeddedResource>
10011001
</ItemGroup>
10021002
<ItemGroup>
1003-
<COMReference Include="mscoree">
1004-
<Guid>{5477469E-83B1-11D2-8B49-00A0C9B7C9C4}</Guid>
1005-
<VersionMajor>2</VersionMajor>
1006-
<VersionMinor>4</VersionMinor>
1007-
<Lcid>0</Lcid>
1008-
<WrapperTool>tlbimp</WrapperTool>
1009-
<Isolated>False</Isolated>
1010-
<EmbedInteropTypes>True</EmbedInteropTypes>
1011-
</COMReference>
1012-
</ItemGroup>
1013-
<ItemGroup>
1014-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
1015-
<PackageReference Include="System.Text.Encodings.Web" />
1003+
<PackageReference Include="Azure.Identity" />
1004+
<PackageReference Include="Microsoft.Bcl.Cryptography" />
10161005
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
10171006
<PrivateAssets>All</PrivateAssets>
10181007
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
10191008
</PackageReference>
1020-
<PackageReference Include="Azure.Identity" />
1021-
<PackageReference Include="Microsoft.Bcl.Cryptography" />
1022-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
1009+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
10231010
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
1011+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
10241012
<PackageReference Include="System.Buffers" />
10251013
<PackageReference Include="System.Security.Cryptography.Pkcs" />
1014+
<PackageReference Include="System.Text.Encodings.Web" />
10261015
<PackageReference Include="System.Text.Json" />
10271016
</ItemGroup>
10281017
<Import Project="$(CommonSourceRoot)tools\targets\GenerateResourceStringsSource.targets" />

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetadataFactory.cs renamed to ‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs

File renamed without changes.

‎src/Microsoft.Data.SqlClient/tests/Directory.Packages.props

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
<Project>
22
<Import Project="..\..\Directory.Packages.props" />
3-
<!-- Test Project Dependencies for NetFx only -->
3+
4+
<!-- Test Project Dependencies for all targets. -->
5+
<ItemGroup>
6+
<!--
7+
Transitive dependencies with vulnerabilities, so we explicitly ask for
8+
non-vulnerable versions.
9+
-->
10+
<PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
11+
</ItemGroup>
12+
13+
<!-- Test Project Dependencies for NetFx only. -->
414
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
515
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
616
</ItemGroup>
17+
18+
<!-- MDS Package Dependency -->
719
<ItemGroup Condition="$(ReferenceType) == 'Package'">
820
<PackageVersion Include="Microsoft.Data.SqlClient" Version="$(TestMicrosoftDataSqlClientVersion)" />
921
</ItemGroup>

‎src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" />
9+
10+
<!--
11+
Transitive dependencies with vulnerabilities, so we explicitly ask for
12+
non-vulnerable versions.
13+
-->
14+
<PackageReference Include="System.Formats.Asn1" />
15+
</ItemGroup>
16+
<ItemGroup>
917
<ProjectReference Include="../Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
1018
</ItemGroup>
1119
</Project>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
5252
<dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
5353
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
54+
<dependency id="System.Text.Json" version="8.0.5" />
5455
</group>
5556
<group targetFramework="net9.0">
5657
<dependency id="Azure.Identity" version="1.13.2" />
@@ -62,6 +63,7 @@
6263
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
6364
<dependency id="System.Configuration.ConfigurationManager" version="9.0.4" exclude="Compile" />
6465
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.4" />
66+
<dependency id="System.Text.Json" version="9.0.5" />
6567
</group>
6668
<group targetFramework="netstandard2.0">
6769
<dependency id="Azure.Identity" version="1.13.2" />
@@ -73,6 +75,7 @@
7375
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
7476
<dependency id="System.Configuration.ConfigurationManager" version="9.0.4" exclude="Compile" />
7577
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.4" />
78+
<dependency id="System.Text.Json" version="9.0.5" />
7679
</group>
7780
</dependencies>
7881
<frameworkAssemblies>

0 commit comments

Comments
 (0)