Skip to content

Commit

Permalink
Update to GA version of .NET 9
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewlock committed Nov 13, 2024
1 parent 8bf4c28 commit 5e70959
Show file tree
Hide file tree
Showing 30 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/noop-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pr:

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

Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/ultimate-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ schedules:
# Global variables
variables:
buildConfiguration: Release
dotnetCoreSdkLatestVersion: 9.0.100-rc.2.24474.11
dotnetCoreSdkLatestVersion: 9.0.100
# This is required until we're out of rc.
# After GA we can do a find and replace and get rid of this
dotnetCoreSdkLatestVersionShort: 9.0.100-rc.2
dotnetCoreSdkLatestVersionShort: 9.0.100
nativeBuildDotnetSdkVersion: 7.0.306
relativeArtifacts: /tracer/src/bin/artifacts
monitoringHome: $(System.DefaultWorkingDirectory)/shared/bin/monitoring-home
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/run-in-docker/action.yml
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=9.0.100-rc.2.24474.11 \
--build-arg DOTNETSDK_VERSION=9.0.100 \
--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 .github/workflows/auto_add_vnext_milestone_to_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Assign to vNext Milestone"
run: ./tracer/build.sh AssignPullRequestToMilestone
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_bump_test_package_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Regenerating package versions"
run: .\tracer\build.ps1 GeneratePackageVersions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_check_snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Check Snapshots"
run: ./tracer/build.sh SummaryOfSnapshotChanges
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_create_version_bump_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Update Changelog"
run: .\tracer\build.ps1 UpdateChangeLog
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_label_prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Add labels"
run: ./tracer/build.sh AssignLabelsToPullRequest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_update_benchmark_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Output current version"
id: versions
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: Download datadog-ci
run: |
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: Download datadog-ci
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Get current version"
id: versions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_draft_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Configure Git Credentials"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_hotfix_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Bump Version"
run: .\tracer\build.ps1 UpdateVersion
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/force_manual_version_bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Bump Version"
run: .\tracer\build.ps1 UpdateVersion
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_package_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Regenerating package versions"
run: .\tracer\build.ps1 GeneratePackageVersions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Removing existing Datadog.Trace.Trimming.xml"
run: Get-ChildItem –Path ".\tracer\src\Datadog.Trace.Trimming\build\Datadog.Trace.Trimming.xml" -Recurse -File | Remove-Item
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify_files_without_nullability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Removing existing missing-nullability-files.csv"
run: Get-ChildItem –Path ".\tracer\missing-nullability-files.csv" | Remove-Item
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify_integrations_map_added.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Regenerating package versions"
run: .\tracer\build.ps1 GeneratePackageVersions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Regenerating package versions"
run: .\tracer\build.ps1 BuildTracerHome
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.100-rc.2.24474.11'
dotnet-version: '9.0.100'

- name: "Regenerate docs/span_metadata.md"
run: .\tracer\build.ps1 GenerateSpanDocumentation
Expand Down
28 changes: 14 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100}
command: dotnet /build/bin/Debug/_build.dll BuildAndRunProfilerIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -393,8 +393,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100}
command: dotnet /build/bin/Debug/_build.dll RunLinuxIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -489,8 +489,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100}
command: dotnet /build/bin/Debug/_build.dll RunDebuggerIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -540,8 +540,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100}
command: dotnet /build/bin/Debug/_build.dll RunLinuxIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -596,8 +596,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100}
command: dotnet /build/bin/Debug/_build.dll RunExplorationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -671,8 +671,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100}
command: dotnet /build/bin/Debug/_build.dll RunLinuxIntegrationTests
volumes:
- ./:/project
Expand Down Expand Up @@ -768,8 +768,8 @@ services:
context: ./tracer/build/_build/
dockerfile: docker/${baseImage:-debian}.dockerfile
args:
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100-rc.2.24474.11}
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-9.0.100}
image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-9.0.100}
command: dotnet /build/bin/Debug/_build.dll RunDebuggerIntegrationTests
volumes:
- ./:/project
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100-rc.2.24474.11",
"version": "9.0.100",
"rollForward": "minor"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="System.DirectoryServices.Protocols">
<Version>9.0.0-rc.2.24473.5</Version>
<Version>9.0.0</Version>
</PackageReference>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="System.Text.Json" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion tracer/build/_build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<PackageReference Include="Sep" Version="0.5.2" />
<PackageReference Include="ByteSize" Version="2.1.0" />
<!-- Enable binary serialization for .NET 9 -->
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.0-*" Condition="$(USE_NATIVE_SDK_VERSION) != 'true'" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.0" Condition="$(USE_NATIVE_SDK_VERSION) != 'true'" />
</ItemGroup>

<!-- On it's own, since windows only and just used for notifications -->
Expand Down
2 changes: 1 addition & 1 deletion tracer/build_in_docker.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $BUILD_DIR="$ROOT_DIR/tracer/build/_build"
$IMAGE_NAME="dd-trace-dotnet/alpine-base"

&docker build `
--build-arg DOTNETSDK_VERSION=9.0.100-rc.2.24474.11 `
--build-arg DOTNETSDK_VERSION=9.0.100 `
--tag $IMAGE_NAME `
--file "$BUILD_DIR/docker/alpine.dockerfile" `
"$BUILD_DIR"
Expand Down
2 changes: 1 addition & 1 deletion tracer/build_in_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BUILD_DIR="$ROOT_DIR/tracer/build/_build"
IMAGE_NAME="dd-trace-dotnet/alpine-base"

docker build \
--build-arg DOTNETSDK_VERSION=9.0.100-rc.2.24474.11 \
--build-arg DOTNETSDK_VERSION=9.0.100 \
--tag $IMAGE_NAME \
--file "$BUILD_DIR/docker/alpine.dockerfile" \
"$BUILD_DIR"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net9')) ">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-*" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.0-*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0-rc.2.24474.1" />
<PackageReference Update="Microsoft.Data.Sqlite.Core" Version="9.0.0-rc.2.24474.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0" />
<PackageReference Update="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
<PackageReference Update="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
<PackageReference Update="SQLitePCLRaw.core" Version="2.1.10" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0-rc.2.24474.1" />
<PackageReference Update="Microsoft.Data.Sqlite.Core" Version="9.0.0-rc.2.24474.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0" />
<PackageReference Update="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
<PackageReference Update="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
<PackageReference Update="SQLitePCLRaw.core" Version="2.1.10" />
</ItemGroup>
Expand Down

0 comments on commit 5e70959

Please sign in to comment.