Fix builds on release/2.x

[andrewlock]

Summary of changes

Fix PRs targeting release/2.x

Reason for change

PRs targeting release/2.x currently don't work

Implementation details

Make sure we merge to the correct branch

Test coverage

This is the test

Other details

Will cherry pick to master afterwards, but easier to check here.

[datadog-ddstaging]

Datadog Report

Branch report: andrew/ci/fix-target
Commit report: 9ab70fe
Test service: dd-trace-dotnet

✅ 0 Failed, 342933 Passed, 1769 Skipped, 14h 19m 24.09s Total Time

[andrewlock]

Execution-Time Benchmarks Report ⏱️

Execution-time results for samples comparing the following branches/commits:

• This PR (5826)
• master

Execution-time benchmarks measure the whole time it takes to execute a program. And are intended to measure the one-off costs. Cases where the execution time results for the PR are worse than latest master results are shown in red. The following thresholds were used for comparing the execution times:

• Welch test with statistical test for significance of 5%
• Only results indicating a difference greater than 5% and 5 ms are considered.

Note that these results are based on a single point-in-time result for each branch. For full results, see the dashboard.

Graphs show the p99 interval based on the mean and StdDev of the test run, as well as the mean value of the run (shown as a diamond below the graph).

gantt
    title Execution time (ms) FakeDbCommand (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5826) - mean (73ms)  : 64, 83
     .   : milestone, 73,
    master - mean (70ms)  : 67, 74
     .   : milestone, 70,

    section CallTarget+Inlining+NGEN
    This PR (5826) - mean (1,029ms)  : 1004, 1054
     .   : milestone, 1029,
    master - mean (1,047ms)  : 1020, 1075
     .   : milestone, 1047,

Loading

gantt
    title Execution time (ms) FakeDbCommand (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5826) - mean (110ms)  : 107, 113
     .   : milestone, 110,
    master - mean (110ms)  : 106, 113
     .   : milestone, 110,

    section CallTarget+Inlining+NGEN
    This PR (5826) - mean (715ms)  : 695, 736
     .   : milestone, 715,
    master - mean (736ms)  : 708, 765
     .   : milestone, 736,

Loading

gantt
    title Execution time (ms) FakeDbCommand (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5826) - mean (93ms)  : 90, 95
     .   : milestone, 93,
    master - mean (93ms)  : 90, 96
     .   : milestone, 93,

    section CallTarget+Inlining+NGEN
    This PR (5826) - mean (668ms)  : 640, 696
     .   : milestone, 668,
    master - mean (681ms)  : 658, 704
     .   : milestone, 681,

Loading

gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5826) - mean (193ms)  : 189, 197
     .   : milestone, 193,
    master - mean (191ms)  : 189, 194
     .   : milestone, 191,

    section CallTarget+Inlining+NGEN
    This PR (5826) - mean (1,129ms)  : 1101, 1157
     .   : milestone, 1129,
    master - mean (1,145ms)  : 1121, 1169
     .   : milestone, 1145,

Loading

gantt
    title Execution time (ms) HttpMessageHandler (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5826) - mean (276ms)  : 271, 281
     .   : milestone, 276,
    master - mean (277ms)  : 271, 282
     .   : milestone, 277,

    section CallTarget+Inlining+NGEN
    This PR (5826) - mean (884ms)  : 861, 907
     .   : milestone, 884,
    master - mean (904ms)  : 872, 936
     .   : milestone, 904,

Loading

gantt
    title Execution time (ms) HttpMessageHandler (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (5826) - mean (265ms)  : 262, 269
     .   : milestone, 265,
    master - mean (265ms)  : 261, 270
     .   : milestone, 265,

    section CallTarget+Inlining+NGEN
    This PR (5826) - mean (866ms)  : 838, 894
     .   : milestone, 866,
    master - mean (884ms)  : 858, 911
     .   : milestone, 884,

Loading