Skip to content

Commit c6a2350

Browse files
andrewlockandrewlock
authored
Add support for npgsql 10 (#7855)
## Summary of changes Adds support for recently release Npgsql 10 ## Reason for change We want to support the latest versions ## Implementation details Just bump some version numbers. Note that it looks like IAST was incorrectly _not_ supporting 9.0.0, so bumped that to latest as well. ## Test coverage Removed 8.0.0 (2 major versions back) from regular testing, as it seems unnecessary at this point (we already test 4 major versions) ## Other details 10.0.0 dropped support for <= .NET 8, so updated that too
1 parent 3697fd6 commit c6a2350

File tree

12 files changed

+83
-79
lines changed

12 files changed

+83
-79
lines changed

‎tracer/build/PackageVersionsGeneratorDefinitions.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,17 @@
292292
"SampleProjectName": "Samples.Npgsql",
293293
"NugetPackageSearchName": "Npgsql",
294294
"MinVersion": "4.0.0",
295-
"MaxVersionExclusive": "10.0.0",
295+
"MaxVersionExclusive": "11.0.0",
296296
"SpecificVersions": [
297297
"4.*.*",
298298
"6.*.*",
299-
"8.*.*",
300-
"9.*.*"
299+
"9.*.*",
300+
"10.*.*"
301301
],
302302
"VersionConditions": [{
303+
"MinVersion": "10.0.0",
304+
"ExcludeTargetFrameworks": ["net48","netcoreapp2.1", "netcoreapp3.0", "netcoreapp3.1", "net5.0", "net6.0", "net7.0"]
305+
},{
303306
"MinVersion": "9.0.0",
304307
"ExcludeTargetFrameworks": ["net48","netcoreapp2.1", "netcoreapp3.0", "netcoreapp3.1", "net5.0"]
305308
},{

‎tracer/build/PackageVersionsLatestMajors.g.props‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1914,6 +1914,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
19141914
<RequiresDockerDependency>All</RequiresDockerDependency>
19151915
<SampleName>Samples.Npgsql</SampleName>
19161916
</PackageVersionSample>
1917+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
1918+
<Properties>ApiVersion=10.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
1919+
<TargetFramework>net9.0</TargetFramework>
1920+
<RequiresDockerDependency>All</RequiresDockerDependency>
1921+
<SampleName>Samples.Npgsql</SampleName>
1922+
</PackageVersionSample>
19171923
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
19181924
<Properties>ApiVersion=4.1.14;RestoreRecursive=false;BuildProjectReferences=false</Properties>
19191925
<TargetFramework>net10.0</TargetFramework>
@@ -1950,6 +1956,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
19501956
<RequiresDockerDependency>All</RequiresDockerDependency>
19511957
<SampleName>Samples.Npgsql</SampleName>
19521958
</PackageVersionSample>
1959+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
1960+
<Properties>ApiVersion=10.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
1961+
<TargetFramework>net10.0</TargetFramework>
1962+
<RequiresDockerDependency>All</RequiresDockerDependency>
1963+
<SampleName>Samples.Npgsql</SampleName>
1964+
</PackageVersionSample>
19531965
<PackageVersionSample Include="test\test-applications\integrations\Samples.GoogleProtobuf\Samples.GoogleProtobuf.csproj">
19541966
<Properties>ApiVersion=3.33.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
19551967
<TargetFramework>net48</TargetFramework>

‎tracer/build/PackageVersionsLatestMinors.g.props‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9960,6 +9960,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
99609960
<RequiresDockerDependency>All</RequiresDockerDependency>
99619961
<SampleName>Samples.Npgsql</SampleName>
99629962
</PackageVersionSample>
9963+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
9964+
<Properties>ApiVersion=10.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
9965+
<TargetFramework>net8.0</TargetFramework>
9966+
<RequiresDockerDependency>All</RequiresDockerDependency>
9967+
<SampleName>Samples.Npgsql</SampleName>
9968+
</PackageVersionSample>
99639969
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
99649970
<Properties>ApiVersion=4.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
99659971
<TargetFramework>net9.0</TargetFramework>
@@ -10002,6 +10008,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
1000210008
<RequiresDockerDependency>All</RequiresDockerDependency>
1000310009
<SampleName>Samples.Npgsql</SampleName>
1000410010
</PackageVersionSample>
10011+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
10012+
<Properties>ApiVersion=10.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
10013+
<TargetFramework>net9.0</TargetFramework>
10014+
<RequiresDockerDependency>All</RequiresDockerDependency>
10015+
<SampleName>Samples.Npgsql</SampleName>
10016+
</PackageVersionSample>
1000510017
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
1000610018
<Properties>ApiVersion=4.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
1000710019
<TargetFramework>net10.0</TargetFramework>
@@ -10044,6 +10056,12 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
1004410056
<RequiresDockerDependency>All</RequiresDockerDependency>
1004510057
<SampleName>Samples.Npgsql</SampleName>
1004610058
</PackageVersionSample>
10059+
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
10060+
<Properties>ApiVersion=10.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
10061+
<TargetFramework>net10.0</TargetFramework>
10062+
<RequiresDockerDependency>All</RequiresDockerDependency>
10063+
<SampleName>Samples.Npgsql</SampleName>
10064+
</PackageVersionSample>
1004710065
<PackageVersionSample Include="test\test-applications\integrations\Samples.GoogleProtobuf\Samples.GoogleProtobuf.csproj">
1004810066
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
1004910067
<TargetFramework>net48</TargetFramework>

‎tracer/build/PackageVersionsLatestSpecific.g.props‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2784,12 +2784,6 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
27842784
<RequiresDockerDependency>All</RequiresDockerDependency>
27852785
<SampleName>Samples.Npgsql</SampleName>
27862786
</PackageVersionSample>
2787-
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2788-
<Properties>ApiVersion=8.0.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2789-
<TargetFramework>net48</TargetFramework>
2790-
<RequiresDockerDependency>All</RequiresDockerDependency>
2791-
<SampleName>Samples.Npgsql</SampleName>
2792-
</PackageVersionSample>
27932787
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
27942788
<Properties>ApiVersion=4.1.14;RestoreRecursive=false;BuildProjectReferences=false</Properties>
27952789
<TargetFramework>netcoreapp2.1</TargetFramework>
@@ -2814,12 +2808,6 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
28142808
<RequiresDockerDependency>All</RequiresDockerDependency>
28152809
<SampleName>Samples.Npgsql</SampleName>
28162810
</PackageVersionSample>
2817-
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2818-
<Properties>ApiVersion=8.0.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2819-
<TargetFramework>netcoreapp3.1</TargetFramework>
2820-
<RequiresDockerDependency>All</RequiresDockerDependency>
2821-
<SampleName>Samples.Npgsql</SampleName>
2822-
</PackageVersionSample>
28232811
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
28242812
<Properties>ApiVersion=4.1.14;RestoreRecursive=false;BuildProjectReferences=false</Properties>
28252813
<TargetFramework>net5.0</TargetFramework>
@@ -2832,12 +2820,6 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
28322820
<RequiresDockerDependency>All</RequiresDockerDependency>
28332821
<SampleName>Samples.Npgsql</SampleName>
28342822
</PackageVersionSample>
2835-
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2836-
<Properties>ApiVersion=8.0.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2837-
<TargetFramework>net5.0</TargetFramework>
2838-
<RequiresDockerDependency>All</RequiresDockerDependency>
2839-
<SampleName>Samples.Npgsql</SampleName>
2840-
</PackageVersionSample>
28412823
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
28422824
<Properties>ApiVersion=4.1.14;RestoreRecursive=false;BuildProjectReferences=false</Properties>
28432825
<TargetFramework>net6.0</TargetFramework>
@@ -2850,12 +2832,6 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
28502832
<RequiresDockerDependency>All</RequiresDockerDependency>
28512833
<SampleName>Samples.Npgsql</SampleName>
28522834
</PackageVersionSample>
2853-
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2854-
<Properties>ApiVersion=8.0.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2855-
<TargetFramework>net6.0</TargetFramework>
2856-
<RequiresDockerDependency>All</RequiresDockerDependency>
2857-
<SampleName>Samples.Npgsql</SampleName>
2858-
</PackageVersionSample>
28592835
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
28602836
<Properties>ApiVersion=9.0.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
28612837
<TargetFramework>net6.0</TargetFramework>
@@ -2874,12 +2850,6 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
28742850
<RequiresDockerDependency>All</RequiresDockerDependency>
28752851
<SampleName>Samples.Npgsql</SampleName>
28762852
</PackageVersionSample>
2877-
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2878-
<Properties>ApiVersion=8.0.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2879-
<TargetFramework>net7.0</TargetFramework>
2880-
<RequiresDockerDependency>All</RequiresDockerDependency>
2881-
<SampleName>Samples.Npgsql</SampleName>
2882-
</PackageVersionSample>
28832853
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
28842854
<Properties>ApiVersion=9.0.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
28852855
<TargetFramework>net7.0</TargetFramework>
@@ -2899,13 +2869,13 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
28992869
<SampleName>Samples.Npgsql</SampleName>
29002870
</PackageVersionSample>
29012871
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2902-
<Properties>ApiVersion=8.0.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2872+
<Properties>ApiVersion=9.0.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
29032873
<TargetFramework>net8.0</TargetFramework>
29042874
<RequiresDockerDependency>All</RequiresDockerDependency>
29052875
<SampleName>Samples.Npgsql</SampleName>
29062876
</PackageVersionSample>
29072877
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2908-
<Properties>ApiVersion=9.0.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2878+
<Properties>ApiVersion=10.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
29092879
<TargetFramework>net8.0</TargetFramework>
29102880
<RequiresDockerDependency>All</RequiresDockerDependency>
29112881
<SampleName>Samples.Npgsql</SampleName>
@@ -2923,13 +2893,13 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
29232893
<SampleName>Samples.Npgsql</SampleName>
29242894
</PackageVersionSample>
29252895
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2926-
<Properties>ApiVersion=8.0.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2896+
<Properties>ApiVersion=9.0.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
29272897
<TargetFramework>net9.0</TargetFramework>
29282898
<RequiresDockerDependency>All</RequiresDockerDependency>
29292899
<SampleName>Samples.Npgsql</SampleName>
29302900
</PackageVersionSample>
29312901
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2932-
<Properties>ApiVersion=9.0.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2902+
<Properties>ApiVersion=10.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
29332903
<TargetFramework>net9.0</TargetFramework>
29342904
<RequiresDockerDependency>All</RequiresDockerDependency>
29352905
<SampleName>Samples.Npgsql</SampleName>
@@ -2947,13 +2917,13 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
29472917
<SampleName>Samples.Npgsql</SampleName>
29482918
</PackageVersionSample>
29492919
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2950-
<Properties>ApiVersion=8.0.8;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2920+
<Properties>ApiVersion=9.0.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
29512921
<TargetFramework>net10.0</TargetFramework>
29522922
<RequiresDockerDependency>All</RequiresDockerDependency>
29532923
<SampleName>Samples.Npgsql</SampleName>
29542924
</PackageVersionSample>
29552925
<PackageVersionSample Include="test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj">
2956-
<Properties>ApiVersion=9.0.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
2926+
<Properties>ApiVersion=10.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
29572927
<TargetFramework>net10.0</TargetFramework>
29582928
<RequiresDockerDependency>All</RequiresDockerDependency>
29592929
<SampleName>Samples.Npgsql</SampleName>

‎tracer/build/supported_calltargets.g.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13036,7 +13036,7 @@
1303613036
"Item3": 0
1303713037
},
1303813038
"MaximumVersion": {
13039-
"Item1": 9,
13039+
"Item1": 10,
1304013040
"Item2": 65535,
1304113041
"Item3": 65535
1304213042
},
@@ -13061,7 +13061,7 @@
1306113061
"Item3": 0
1306213062
},
1306313063
"MaximumVersion": {
13064-
"Item1": 9,
13064+
"Item1": 10,
1306513065
"Item2": 65535,
1306613066
"Item3": 65535
1306713067
},
@@ -13083,7 +13083,7 @@
1308313083
"Item3": 0
1308413084
},
1308513085
"MaximumVersion": {
13086-
"Item1": 9,
13086+
"Item1": 10,
1308713087
"Item2": 65535,
1308813088
"Item3": 65535
1308913089
},
@@ -13107,7 +13107,7 @@
1310713107
"Item3": 0
1310813108
},
1310913109
"MaximumVersion": {
13110-
"Item1": 9,
13110+
"Item1": 10,
1311113111
"Item2": 65535,
1311213112
"Item3": 65535
1311313113
},
@@ -13129,7 +13129,7 @@
1312913129
"Item3": 0
1313013130
},
1313113131
"MaximumVersion": {
13132-
"Item1": 9,
13132+
"Item1": 10,
1313313133
"Item2": 65535,
1313413134
"Item3": 65535
1313513135
},
@@ -13153,7 +13153,7 @@
1315313153
"Item3": 0
1315413154
},
1315513155
"MaximumVersion": {
13156-
"Item1": 9,
13156+
"Item1": 10,
1315713157
"Item2": 65535,
1315813158
"Item3": 65535
1315913159
},
@@ -13178,7 +13178,7 @@
1317813178
"Item3": 0
1317913179
},
1318013180
"MaximumVersion": {
13181-
"Item1": 9,
13181+
"Item1": 10,
1318213182
"Item2": 65535,
1318313183
"Item3": 65535
1318413184
},
@@ -13200,7 +13200,7 @@
1320013200
"Item3": 0
1320113201
},
1320213202
"MaximumVersion": {
13203-
"Item1": 9,
13203+
"Item1": 10,
1320413204
"Item2": 65535,
1320513205
"Item3": 65535
1320613206
},
@@ -13224,7 +13224,7 @@
1322413224
"Item3": 0
1322513225
},
1322613226
"MaximumVersion": {
13227-
"Item1": 9,
13227+
"Item1": 10,
1322813228
"Item2": 65535,
1322913229
"Item3": 65535
1323013230
},
@@ -13274,7 +13274,7 @@
1327413274
"Item3": 0
1327513275
},
1327613276
"MaximumVersion": {
13277-
"Item1": 8,
13277+
"Item1": 10,
1327813278
"Item2": 65535,
1327913279
"Item3": 65535
1328013280
},
@@ -13298,7 +13298,7 @@
1329813298
"Item3": 0
1329913299
},
1330013300
"MaximumVersion": {
13301-
"Item1": 8,
13301+
"Item1": 10,
1330213302
"Item2": 65535,
1330313303
"Item3": 65535
1330413304
},
@@ -13320,7 +13320,7 @@
1332013320
"Item3": 0
1332113321
},
1332213322
"MaximumVersion": {
13323-
"Item1": 8,
13323+
"Item1": 10,
1332413324
"Item2": 65535,
1332513325
"Item3": 65535
1332613326
},
@@ -13344,7 +13344,7 @@
1334413344
"Item3": 0
1334513345
},
1334613346
"MaximumVersion": {
13347-
"Item1": 8,
13347+
"Item1": 10,
1334813348
"Item2": 65535,
1334913349
"Item3": 65535
1335013350
},

‎tracer/build/supported_versions.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,8 +1061,8 @@
10611061
"minVersionSupportedInclusive": "4.0.0",
10621062
"minVersionTestedInclusive": "4.1.14",
10631063
"maxVersionSupportedInclusive": "9.0.4",
1064-
"maxVersionAvailableInclusive": "9.0.4",
1065-
"maxVersionTestedInclusive": "9.0.4"
1064+
"maxVersionAvailableInclusive": "10.0.0",
1065+
"maxVersionTestedInclusive": "10.0.0"
10661066
}
10671067
]
10681068
},

‎tracer/dependabot/integrations/Datadog.Dependabot.Npgsql.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<ItemGroup>
99
<!-- Integration: Npgsql -->
1010
<!-- Assembly: Npgsql -->
11-
<!-- Latest package https://www.nuget.org/packages/Npgsql/9.0.4 -->
12-
<PackageReference Include="Npgsql" Version="9.0.4" />
11+
<!-- Latest package https://www.nuget.org/packages/Npgsql/10.0.0 -->
12+
<PackageReference Include="Npgsql" Version="10.0.0" />
1313
</ItemGroup>
1414

1515
</Project>

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Npgsql/NpgsqlDefinitions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
AssemblyName = "Npgsql",
1313
TypeName = "Npgsql.NpgsqlCommand",
1414
MinimumVersion = "4.0.0",
15-
MaximumVersion = "9.*.*",
15+
MaximumVersion = "10.*.*",
1616
IntegrationName = nameof(IntegrationId.Npgsql),
1717
DataReaderType = "Npgsql.NpgsqlDataReader",
1818
DataReaderTaskType = "System.Threading.Tasks.Task`1[Npgsql.NpgsqlDataReader]",
@@ -42,7 +42,7 @@
4242
AssemblyName = "Npgsql",
4343
TypeName = "Npgsql.NpgsqlDataReader",
4444
MinimumVersion = "4.0.0",
45-
MaximumVersion = "8.*.*",
45+
MaximumVersion = "10.*.*",
4646
IntegrationName = nameof(IntegrationId.Npgsql),
4747
DataReaderType = "Npgsql.NpgsqlDataReader",
4848
DataReaderTaskType = "System.Threading.Tasks.Task`1[Npgsql.NpgsqlDataReader]",

0 commit comments

Comments
 (0)