Skip to content

Commit 7ba332f

Browse files
andrewlockandrewlock
committed
Merge remote-tracking branch 'origin/master' into dotnet10/UpdateToPreview
2 parents 1857f59 + 09736c2 commit 7ba332f

7 files changed

+11
-22
lines changed

‎tracer/build/PackageVersionsGeneratorDefinitions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,9 @@
744744
"8.*.*"
745745
],
746746
"VersionConditions": [{
747+
"MinVersion": "8.1.0",
748+
"ExcludeTargetFrameworks": ["net48", "netcoreapp2.1", "netcoreapp3.0", "netcoreapp3.1", "net5.0", "net6.0", "net7.0"]
749+
},{
747750
"MinVersion": "6.0.0",
748751
"ExcludeTargetFrameworks": ["net48", "netcoreapp2.1", "netcoreapp3.0", "netcoreapp3.1", "net5.0"]
749752
},{

‎tracer/build/PackageVersionsLatestMajors.g.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5539,7 +5539,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
55395539
<SampleName>Samples.Aerospike</SampleName>
55405540
</PackageVersionSample>
55415541
<PackageVersionSample Include="test\test-applications\integrations\Samples.Aerospike\Samples.Aerospike.csproj">
5542-
<Properties>ApiVersion=8.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
5542+
<Properties>ApiVersion=8.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
55435543
<TargetFramework>net6.0</TargetFramework>
55445544
<RequiresDockerDependency>All</RequiresDockerDependency>
55455545
<SampleName>Samples.Aerospike</SampleName>
@@ -5569,7 +5569,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
55695569
<SampleName>Samples.Aerospike</SampleName>
55705570
</PackageVersionSample>
55715571
<PackageVersionSample Include="test\test-applications\integrations\Samples.Aerospike\Samples.Aerospike.csproj">
5572-
<Properties>ApiVersion=8.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
5572+
<Properties>ApiVersion=8.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
55735573
<TargetFramework>net7.0</TargetFramework>
55745574
<RequiresDockerDependency>All</RequiresDockerDependency>
55755575
<SampleName>Samples.Aerospike</SampleName>

‎tracer/build/PackageVersionsLatestMinors.g.props

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30030,12 +30030,6 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
3003030030
<RequiresDockerDependency>All</RequiresDockerDependency>
3003130031
<SampleName>Samples.Aerospike</SampleName>
3003230032
</PackageVersionSample>
30033-
<PackageVersionSample Include="test\test-applications\integrations\Samples.Aerospike\Samples.Aerospike.csproj">
30034-
<Properties>ApiVersion=8.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
30035-
<TargetFramework>net6.0</TargetFramework>
30036-
<RequiresDockerDependency>All</RequiresDockerDependency>
30037-
<SampleName>Samples.Aerospike</SampleName>
30038-
</PackageVersionSample>
3003930033
<PackageVersionSample Include="test\test-applications\integrations\Samples.Aerospike\Samples.Aerospike.csproj">
3004030034
<Properties>ApiVersion=4.0.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
3004130035
<TargetFramework>net7.0</TargetFramework>
@@ -30144,12 +30138,6 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
3014430138
<RequiresDockerDependency>All</RequiresDockerDependency>
3014530139
<SampleName>Samples.Aerospike</SampleName>
3014630140
</PackageVersionSample>
30147-
<PackageVersionSample Include="test\test-applications\integrations\Samples.Aerospike\Samples.Aerospike.csproj">
30148-
<Properties>ApiVersion=8.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
30149-
<TargetFramework>net7.0</TargetFramework>
30150-
<RequiresDockerDependency>All</RequiresDockerDependency>
30151-
<SampleName>Samples.Aerospike</SampleName>
30152-
</PackageVersionSample>
3015330141
<PackageVersionSample Include="test\test-applications\integrations\Samples.Aerospike\Samples.Aerospike.csproj">
3015430142
<Properties>ApiVersion=4.0.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
3015530143
<TargetFramework>net8.0</TargetFramework>

‎tracer/build/PackageVersionsLatestSpecific.g.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7519,7 +7519,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
75197519
<SampleName>Samples.Aerospike</SampleName>
75207520
</PackageVersionSample>
75217521
<PackageVersionSample Include="test\test-applications\integrations\Samples.Aerospike\Samples.Aerospike.csproj">
7522-
<Properties>ApiVersion=8.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
7522+
<Properties>ApiVersion=8.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
75237523
<TargetFramework>net6.0</TargetFramework>
75247524
<RequiresDockerDependency>All</RequiresDockerDependency>
75257525
<SampleName>Samples.Aerospike</SampleName>
@@ -7549,7 +7549,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
75497549
<SampleName>Samples.Aerospike</SampleName>
75507550
</PackageVersionSample>
75517551
<PackageVersionSample Include="test\test-applications\integrations\Samples.Aerospike\Samples.Aerospike.csproj">
7552-
<Properties>ApiVersion=8.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
7552+
<Properties>ApiVersion=8.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
75537553
<TargetFramework>net7.0</TargetFramework>
75547554
<RequiresDockerDependency>All</RequiresDockerDependency>
75557555
<SampleName>Samples.Aerospike</SampleName>

‎tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,14 +2148,14 @@ public class PackageVersionsLatestMajors
21482148
new object[] { "5.4.1" },
21492149
new object[] { "6.2.2" },
21502150
new object[] { "7.4.0" },
2151-
new object[] { "8.1.0" },
2151+
new object[] { "8.0.2" },
21522152
#endif
21532153
#if NET7_0
21542154
new object[] { "4.3.1" },
21552155
new object[] { "5.4.1" },
21562156
new object[] { "6.2.2" },
21572157
new object[] { "7.4.0" },
2158-
new object[] { "8.1.0" },
2158+
new object[] { "8.0.2" },
21592159
#endif
21602160
#if NET8_0
21612161
new object[] { "4.3.1" },

‎tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6230,7 +6230,6 @@ public class PackageVersionsLatestMinors
62306230
new object[] { "7.3.0" },
62316231
new object[] { "7.4.0" },
62326232
new object[] { "8.0.2" },
6233-
new object[] { "8.1.0" },
62346233
#endif
62356234
#if NET7_0
62366235
new object[] { "4.0.3" },
@@ -6251,7 +6250,6 @@ public class PackageVersionsLatestMinors
62516250
new object[] { "7.3.0" },
62526251
new object[] { "7.4.0" },
62536252
new object[] { "8.0.2" },
6254-
new object[] { "8.1.0" },
62556253
#endif
62566254
#if NET8_0
62576255
new object[] { "4.0.3" },

‎tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2478,14 +2478,14 @@ public class PackageVersionsLatestSpecific
24782478
new object[] { "4.3.1" },
24792479
new object[] { "5.4.1" },
24802480
new object[] { "7.4.0" },
2481-
new object[] { "8.1.0" },
2481+
new object[] { "8.0.2" },
24822482
#endif
24832483
#if NET7_0
24842484
new object[] { "4.0.3" },
24852485
new object[] { "4.3.1" },
24862486
new object[] { "5.4.1" },
24872487
new object[] { "7.4.0" },
2488-
new object[] { "8.1.0" },
2488+
new object[] { "8.0.2" },
24892489
#endif
24902490
#if NET8_0
24912491
new object[] { "4.0.3" },

0 commit comments

Comments
 (0)