Skip to content

Update to .NET RC2 #7659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 37 commits into from
Oct 27, 2025
Merged

Update to .NET RC2 #7659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
5c0cdc4
Update to RC2
NachoEchevarria Oct 15, 2025
d73fb31
Update windowsX64Pool
NachoEchevarria Oct 16, 2025
97c73a0
FIx short name
NachoEchevarria Oct 17, 2025
8a8603e
Fix error: RegistryHive
NachoEchevarria Oct 17, 2025
65264c6
Fix open tracing sample error
NachoEchevarria Oct 17, 2025
5003cf9
try to fix compilation error
NachoEchevarria Oct 17, 2025
75cf2cb
Fix http error
NachoEchevarria Oct 17, 2025
7bfe40e
fix WindowsPrincipal compilation error
NachoEchevarria Oct 17, 2025
972e4c4
Fix HotChocolate error
NachoEchevarria Oct 17, 2025
99b9a69
Fix compilation error NU1510
NachoEchevarria Oct 17, 2025
6e8480b
Fix missing types error
NachoEchevarria Oct 20, 2025
4894ae2
Fix compilation
NachoEchevarria Oct 20, 2025
88ab968
Try to fix tuple error
NachoEchevarria Oct 20, 2025
68953f4
Second fix attempt System.ValueTuple
NachoEchevarria Oct 20, 2025
1d62791
Try to fix tuple error
NachoEchevarria Oct 21, 2025
32b5a60
Try fix tuple error
NachoEchevarria Oct 21, 2025
c51a963
Fix errors in extended logger
NachoEchevarria Oct 21, 2025
e7ef273
[LANGPLAT-839] Try to fix missing references when calling PackRunnerT…
NachoEchevarria Oct 21, 2025
27ea855
fix
NachoEchevarria Oct 21, 2025
bc0cab2
See if undo windows constant works
NachoEchevarria Oct 21, 2025
d33638a
MInimal change to project
NachoEchevarria Oct 21, 2025
71a9d52
Update tracer/test/test-applications/integrations/LogsInjection.ILogg…
NachoEchevarria Oct 22, 2025
7da303c
Update tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runn…
NachoEchevarria Oct 22, 2025
3631c9b
Update tracer/test/test-applications/integrations/LogsInjection.ILogg…
NachoEchevarria Oct 22, 2025
2129463
Update tracer/test/test-applications/integrations/Samples.Instrumente…
NachoEchevarria Oct 22, 2025
b96d9a9
Clean up, add comments
NachoEchevarria Oct 22, 2025
74bd055
Remove tuple exception
NachoEchevarria Oct 22, 2025
3312c1a
Merge branch 'master' into nacho/UpdateToNetRc2
NachoEchevarria Oct 22, 2025
16b32be
Try to simplify
NachoEchevarria Oct 22, 2025
2c375a7
Upgrade arm64 pool. Dummy debugger change.
NachoEchevarria Oct 22, 2025
a05df64
Update Linux VM image
NachoEchevarria Oct 22, 2025
d673769
Update gitlab image
NachoEchevarria Oct 23, 2025
51a7e5c
Merge branch 'master' into nacho/UpdateToNetRc2
NachoEchevarria Oct 23, 2025
5cbc79f
Undo debugger dummy changes
NachoEchevarria Oct 24, 2025
a7ce7f9
undo dummy change
NachoEchevarria Oct 24, 2025
9a56710
Merge branch 'master' into nacho/UpdateToNetRc2
NachoEchevarria Oct 24, 2025
c49a4a6
Merge branch 'master' into nacho/UpdateToNetRc2
NachoEchevarria Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/noop-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pr:

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

Expand Down
12 changes: 6 additions & 6 deletions .azure-pipelines/ultimate-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ schedules:
# Global variables
variables:
buildConfiguration: Release
dotnetCoreSdkLatestVersion: 10.0.100-rc.1.25451.107
dotnetCoreSdkLatestVersion: 10.0.100-rc.2.25502.107
# This is required until we're out of rc.
# After GA we can do a find and replace and get rid of this
dotnetCoreSdkLatestVersionShort: 10.0.100-rc.1
dotnetCoreSdkLatestVersionShort: 10.0.100-rc.2
nativeBuildDotnetSdkVersion: 7.0.306
# These are the Managed DevOps pool names we use
linuxTasksPool: azure-managed-linux-tasks
linuxX64SmokePool: azure-managed-linux-smoke-2
linuxX64Pool: azure-managed-linux-x64-2
linuxArm64Pool: azure-managed-linux-arm64-1
windowsX64Pool: azure-managed-windows-x64-2
linuxX64SmokePool: azure-managed-linux-smoke
linuxX64Pool: azure-managed-linux-x64-1
linuxArm64Pool: azure-managed-linux-arm64-2
windowsX64Pool: azure-managed-windows-x64-1

relativeArtifacts: /tracer/src/bin/artifacts
monitoringHome: $(System.DefaultWorkingDirectory)/shared/bin/monitoring-home
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"context": "../tracer/build/_build",
"build": {
"args": {
"DOTNETSDK_VERSION": "10.0.100-rc.1.25451.107"
"DOTNETSDK_VERSION": "10.0.100-rc.2.25502.107"
}
},
// Allow access to host machine
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/run-in-docker/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
shell: bash
run: |
docker build \
--build-arg DOTNETSDK_VERSION=10.0.100-rc.1.25451.107 \
--build-arg DOTNETSDK_VERSION=10.0.100-rc.2.25502.107 \
--tag dd-trace-dotnet/${{ inputs.baseImage }}-builder \
--target builder \
--file "${GITHUB_WORKSPACE}/tracer/build/_build/docker/${{ inputs.baseImage }}.dockerfile" \
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ build:
-e AWS_NETWORKING=true `
-e SIGN_WINDOWS=true `
-e NUGET_CERT_REVOCATION_MODE=offline `
registry.ddbuild.io/images/mirror/datadog/dd-trace-dotnet-docker-build:dotnet10-rc1 `
registry.ddbuild.io/images/mirror/datadog/dd-trace-dotnet-docker-build:dotnet10-rc2 `
Info Clean BuildTracerHome BuildProfilerHome BuildNativeLoader BuildDdDotnet PublishFleetInstaller PackageTracerHome ZipSymbols SignDlls SignMsi DownloadWinSsiTelemetryForwarder
- mkdir artifacts-out
- xcopy /e/s build-out\${CI_JOB_ID}\*.* artifacts-out
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/benchmarks/dsm-throughput.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
variables:
DSM_THROUGHPUT_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-dotnet-dsm
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-6
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-7

stages:
- check-azure-pipeline
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/benchmarks/macrobenchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stages:
- benchmarks-win

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

check_azure_pipeline:
stage: check-azure-pipeline
Expand Down
28 changes: 14 additions & 14 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
command: dotnet /build/bin/Debug/_build.dll BuildAndRunProfilerIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -402,8 +402,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
command: dotnet /build/bin/Debug/_build.dll RunIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -503,8 +503,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
command: dotnet /build/bin/Debug/_build.dll RunDebuggerIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -555,8 +555,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
command: dotnet /build/bin/Debug/_build.dll RunIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -612,8 +612,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
command: dotnet /build/bin/Debug/_build.dll RunExplorationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -688,8 +688,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
command: dotnet /build/bin/Debug/_build.dll RunIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -789,8 +789,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.1.25451.107}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-10.0.100-rc.2.25502.107}
command: dotnet /build/bin/Debug/_build.dll RunDebuggerIntegrationTests
volumes:
- ./:/project
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.100-rc.1.25451.107",
"version": "10.0.100-rc.2.25502.107",
"rollForward": "minor"
}
}
2 changes: 1 addition & 1 deletion profiler/src/Demos/Samples.Computer01/Samples.Computer01.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="System.DirectoryServices.Protocols">
<Version>10.0.0-rc.1.25451.107</Version>
<Version>10.0.0-rc.2.25502.107</Version>
</PackageReference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion profiler/src/Demos/Samples.FileAccess/Samples.FileAccess.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="System.Text.Json" Version="10.0.100-rc.1.25451.107" />
<PackageReference Include="System.Text.Json" Version="10.0.100-rc.2.25502.107" />
</ItemGroup>

</Project>
Loading
Loading