Skip to content

Commit 1697b8e

Browse files
NachoEchevarriaandrewlock
NachoEchevarria
and
andrewlock
authored
Update to .NET RC2 (#7659)
## Summary of changes This updates our build and testing from .NET SDK 10 RC1 to RC2. ## Reason for change https://devblogs.microsoft.com/dotnet/dotnet-10-rc-2/ https://github.com/dotnet/core/blob/main/release-notes/10.0/preview/rc2/libraries.md ## Implementation details * Update RC1 references to RC2 * Use new agent pools * Added <RestoreEnablePackagePruning>false</RestoreEnablePackagePruning> to avoid compilation errors based [on this](dotnet/sdk#51265) ## Test coverage This functionality is covered by our regular tests. ## Other details <!-- Fixes #{issue} --> <!-- ⚠️ Note: Where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. MergeQueue is NOT enabled in this repository. If you have write access to the repo, the PR has 1-2 approvals (see above), and all of the required checks have passed, you can use the Squash and Merge button to merge the PR. If you don't have write access, or you need help, reach out in the #apm-dotnet channel in Slack. --> --------- Co-authored-by: Andrew Lock <andrew.lock@datadoghq.com>
1 parent 4db71c7 commit 1697b8e

File tree

31 files changed

+122
-81
lines changed

31 files changed

+122
-81
lines changed

‎.azure-pipelines/noop-pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pr:
77

88
# Global variables
99
variables:
10-
dotnetCoreSdkLatestVersion: 10.0.100-rc.1.25451.107
10+
dotnetCoreSdkLatestVersion: 10.0.100-rc.2.25502.107
1111
OriginalCommitId: $[coalesce(variables['System.PullRequest.SourceCommitId'], variables['Build.SourceVersion'])] # required by update-github-status
1212
TargetBranch: $[variables['System.PullRequest.TargetBranch']]
1313

‎.azure-pipelines/ultimate-pipeline.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ schedules:
6363
# Global variables
6464
variables:
6565
buildConfiguration: Release
66-
dotnetCoreSdkLatestVersion: 10.0.100-rc.1.25451.107
66+
dotnetCoreSdkLatestVersion: 10.0.100-rc.2.25502.107
6767
# This is required until we're out of rc.
6868
# After GA we can do a find and replace and get rid of this
69-
dotnetCoreSdkLatestVersionShort: 10.0.100-rc.1
69+
dotnetCoreSdkLatestVersionShort: 10.0.100-rc.2
7070
nativeBuildDotnetSdkVersion: 7.0.306
7171
# These are the Managed DevOps pool names we use
7272
linuxTasksPool: azure-managed-linux-tasks
73-
linuxX64SmokePool: azure-managed-linux-smoke-2
74-
linuxX64Pool: azure-managed-linux-x64-2
75-
linuxArm64Pool: azure-managed-linux-arm64-1
76-
windowsX64Pool: azure-managed-windows-x64-2
73+
linuxX64SmokePool: azure-managed-linux-smoke
74+
linuxX64Pool: azure-managed-linux-x64-1
75+
linuxArm64Pool: azure-managed-linux-arm64-2
76+
windowsX64Pool: azure-managed-windows-x64-1
7777

7878
relativeArtifacts: /tracer/src/bin/artifacts
7979
monitoringHome: $(System.DefaultWorkingDirectory)/shared/bin/monitoring-home

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"context": "../tracer/build/_build",
88
"build": {
99
"args": {
10-
"DOTNETSDK_VERSION": "10.0.100-rc.1.25451.107"
10+
"DOTNETSDK_VERSION": "10.0.100-rc.2.25502.107"
1111
}
1212
},
1313
// Allow access to host machine

‎.github/actions/run-in-docker/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
shell: bash
1818
run: |
1919
docker build \
20-
--build-arg DOTNETSDK_VERSION=10.0.100-rc.1.25451.107 \
20+
--build-arg DOTNETSDK_VERSION=10.0.100-rc.2.25502.107 \
2121
--tag dd-trace-dotnet/${{ inputs.baseImage }}-builder \
2222
--target builder \
2323
--file "${GITHUB_WORKSPACE}/tracer/build/_build/docker/${{ inputs.baseImage }}.dockerfile" \

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ build:
3737
-e AWS_NETWORKING=true `
3838
-e SIGN_WINDOWS=true `
3939
-e NUGET_CERT_REVOCATION_MODE=offline `
40-
registry.ddbuild.io/images/mirror/datadog/dd-trace-dotnet-docker-build:dotnet10-rc1 `
40+
registry.ddbuild.io/images/mirror/datadog/dd-trace-dotnet-docker-build:dotnet10-rc2 `
4141
Info Clean BuildTracerHome BuildProfilerHome BuildNativeLoader BuildDdDotnet PublishFleetInstaller PackageTracerHome ZipSymbols SignDlls SignMsi DownloadWinSsiTelemetryForwarder
4242
- mkdir artifacts-out
4343
- xcopy /e/s build-out\${CI_JOB_ID}\*.* artifacts-out

‎.gitlab/benchmarks/dsm-throughput.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
22
DSM_THROUGHPUT_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-dotnet-dsm
3-
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-6
3+
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-7
44

55
stages:
66
- check-azure-pipeline

‎.gitlab/benchmarks/macrobenchmarks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ stages:
1313
- benchmarks-win
1414

1515
variables:
16-
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-6
16+
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-7
1717

1818
check_azure_pipeline:
1919
stage: check-azure-pipeline

‎docker-compose.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ services:
351351
context: ./tracer/build/_build/
352352
dockerfile: docker/${baseImage:-debian}.dockerfile
353353
args:
354-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
355-
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
354+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
355+
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
356356
command: dotnet /build/bin/Debug/_build.dll BuildAndRunProfilerIntegrationTests
357357
volumes:
358358
- ./:/project
@@ -402,8 +402,8 @@ services:
402402
context: ./tracer/build/_build/
403403
dockerfile: docker/${baseImage:-debian}.dockerfile
404404
args:
405-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
406-
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
405+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
406+
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
407407
command: dotnet /build/bin/Debug/_build.dll RunIntegrationTests
408408
volumes:
409409
- ./:/project
@@ -503,8 +503,8 @@ services:
503503
context: ./tracer/build/_build/
504504
dockerfile: docker/${baseImage:-debian}.dockerfile
505505
args:
506-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
507-
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
506+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
507+
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
508508
command: dotnet /build/bin/Debug/_build.dll RunDebuggerIntegrationTests
509509
volumes:
510510
- ./:/project
@@ -555,8 +555,8 @@ services:
555555
context: ./tracer/build/_build/
556556
dockerfile: docker/${baseImage:-debian}.dockerfile
557557
args:
558-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
559-
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
558+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
559+
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
560560
command: dotnet /build/bin/Debug/_build.dll RunIntegrationTests
561561
volumes:
562562
- ./:/project
@@ -612,8 +612,8 @@ services:
612612
context: ./tracer/build/_build/
613613
dockerfile: docker/${baseImage:-debian}.dockerfile
614614
args:
615-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
616-
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
615+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
616+
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
617617
command: dotnet /build/bin/Debug/_build.dll RunExplorationTests
618618
volumes:
619619
- ./:/project
@@ -688,8 +688,8 @@ services:
688688
context: ./tracer/build/_build/
689689
dockerfile: docker/${baseImage:-debian}.dockerfile
690690
args:
691-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
692-
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
691+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
692+
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
693693
command: dotnet /build/bin/Debug/_build.dll RunIntegrationTests
694694
volumes:
695695
- ./:/project
@@ -789,8 +789,8 @@ services:
789789
context: ./tracer/build/_build/
790790
dockerfile: docker/${baseImage:-debian}.dockerfile
791791
args:
792-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
793-
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
792+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
793+
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
794794
command: dotnet /build/bin/Debug/_build.dll RunDebuggerIntegrationTests
795795
volumes:
796796
- ./:/project

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25451.107",
3+
"version": "10.0.100-rc.2.25502.107",
44
"rollForward": "minor"
55
}
66
}

‎profiler/src/Demos/Samples.Computer01/Samples.Computer01.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
4242
<PackageReference Include="System.DirectoryServices.Protocols">
43-
<Version>10.0.0-rc.1.25451.107</Version>
43+
<Version>10.0.0-rc.2.25502.107</Version>
4444
</PackageReference>
4545
</ItemGroup>
4646
</Project>

0 commit comments

Comments
 (0)