Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 0273f1e

Browse files
KielekKielek
authored
Update .NET7.0 to stable version (#657)
1 parent 72947d2 commit 0273f1e

9 files changed

+52
-61
lines changed

‎.github/workflows/ci.yml

+31-36
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ on:
4141

4242
env:
4343
buildConfiguration: Release
44-
dotnetSdkVersion: 7.0.100-rc.2.22477.23
45-
dotnetSdkImageVersion: 7.0.100-rc.2
44+
dotnetSdkVersion: 7.0.100
4645
relativeTracerHome: /shared/bin/monitoring-home/tracer
4746
relativeArtifacts: /tracer/src/bin/artifacts
4847
binDir: ${{ github.workspace }}/tracer/src/bin
@@ -75,10 +74,10 @@ jobs:
7574
with:
7675
dotnet-version: |
7776
2.1.818
78-
3.1.424
77+
3.1.425
7978
5.0.408
80-
6.0.402
81-
7.0.100-rc.2.22477.23
79+
6.0.403
80+
7.0.100
8281
- name: Install CMake 3.19.8
8382
if: ${{ runner.os == 'Linux' }}
8483
run: curl -sL https://cmake.org/files/v3.19/cmake-3.19.8-Linux-x86_64.sh -o cmakeinstall.sh && chmod +x cmakeinstall.sh && sudo ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir
@@ -131,15 +130,14 @@ jobs:
131130
with:
132131
dotnet-version: |
133132
2.1.818
134-
3.1.424
133+
3.1.425
135134
5.0.408
136-
6.0.402
137-
7.0.100-rc.2.22477.23
135+
6.0.403
136+
7.0.100
138137
- name: Build Docker image
139138
run: |
140139
docker build \
141140
--build-arg DOTNETSDK_VERSION=${dotnetSdkVersion} \
142-
--build-arg DOTNETSDKIMAGE_VERSION=${dotnetSdkImageVersion} \
143141
--tag dd-trace-dotnet/${{ matrix.base-image }}-builder \
144142
--target builder \
145143
--file "./tracer/build/_build/docker/${{ matrix.base-image }}.dockerfile" \
@@ -179,10 +177,10 @@ jobs:
179177
with:
180178
dotnet-version: |
181179
2.1.818
182-
3.1.424
180+
3.1.425
183181
5.0.408
184-
6.0.402
185-
7.0.100-rc.2.22477.23
182+
6.0.403
183+
7.0.100
186184
- run: ./tracer/build.cmd Clean BuildTracerHome BuildAndRunManagedUnitTests
187185
- uses: actions/[email protected]
188186
with:
@@ -205,15 +203,14 @@ jobs:
205203
with:
206204
dotnet-version: |
207205
2.1.818
208-
3.1.424
206+
3.1.425
209207
5.0.408
210-
6.0.402
211-
7.0.100-rc.2.22477.23
208+
6.0.403
209+
7.0.100
212210
- name: Build Docker image
213211
run: |
214212
docker build \
215213
--build-arg DOTNETSDK_VERSION=${dotnetSdkVersion} \
216-
--build-arg DOTNETSDKIMAGE_VERSION=${dotnetSdkImageVersion} \
217214
--tag dd-trace-dotnet/${{ matrix.base-image }}-tester \
218215
--target tester \
219216
--file "./tracer/build/_build/docker/${{ matrix.base-image }}.dockerfile" \
@@ -253,10 +250,10 @@ jobs:
253250
with:
254251
dotnet-version: |
255252
2.1.818
256-
3.1.424
253+
3.1.425
257254
5.0.408
258-
6.0.402
259-
7.0.100-rc.2.22477.23
255+
6.0.403
256+
7.0.100
260257
- name: Install CMake 3.19.8
261258
if: ${{ runner.os == 'Linux' }}
262259
run: curl -sL https://cmake.org/files/v3.19/cmake-3.19.8-Linux-x86_64.sh -o cmakeinstall.sh && chmod +x cmakeinstall.sh && sudo ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir
@@ -279,15 +276,14 @@ jobs:
279276
with:
280277
dotnet-version: |
281278
2.1.818
282-
3.1.424
279+
3.1.425
283280
5.0.408
284-
6.0.402
285-
7.0.100-rc.2.22477.23
281+
6.0.403
282+
7.0.100
286283
- name: Build Docker image
287284
run: |
288285
docker build \
289286
--build-arg DOTNETSDK_VERSION=${dotnetSdkVersion} \
290-
--build-arg DOTNETSDKIMAGE_VERSION=${dotnetSdkImageVersion} \
291287
--tag dd-trace-dotnet/${{ matrix.base-image }}-builder \
292288
--target builder \
293289
--file "./tracer/build/_build/docker/${{ matrix.base-image }}.dockerfile" \
@@ -330,10 +326,10 @@ jobs:
330326
with:
331327
dotnet-version: |
332328
2.1.818
333-
3.1.424
329+
3.1.425
334330
5.0.408
335-
6.0.402
336-
7.0.100-rc.2.22477.23
331+
6.0.403
332+
7.0.100
337333
# Cosmos is _way_ to flaky at the moment. Try enabling again at a later time
338334
# - name: Start CosmosDB Emulator
339335
# if: ${{ matrix.target == 'BuildAndRunWindowsIntegrationTests' }}
@@ -390,15 +386,14 @@ jobs:
390386
with:
391387
dotnet-version: |
392388
2.1.818
393-
3.1.424
389+
3.1.425
394390
5.0.408
395-
6.0.402
396-
7.0.100-rc.2.22477.23
391+
6.0.403
392+
7.0.100
397393
- name: Build Docker image
398394
run: |
399395
docker build \
400396
--build-arg DOTNETSDK_VERSION=${dotnetSdkVersion} \
401-
--build-arg DOTNETSDKIMAGE_VERSION=${dotnetSdkImageVersion} \
402397
--tag dd-trace-dotnet/${{ matrix.base-image }}-builder \
403398
--target builder \
404399
--file "./tracer/build/_build/docker/${{ matrix.base-image }}.dockerfile" \
@@ -453,10 +448,10 @@ jobs:
453448
with:
454449
dotnet-version: |
455450
2.1.818
456-
3.1.424
451+
3.1.425
457452
5.0.408
458-
6.0.402
459-
7.0.100-rc.2.22477.23
453+
6.0.403
454+
7.0.100
460455
- name: install Microsoft.Net.Component.4.6.1.TargetingPack
461456
run: |
462457
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
@@ -503,10 +498,10 @@ jobs:
503498
with:
504499
dotnet-version: |
505500
2.1.818
506-
3.1.424
501+
3.1.425
507502
5.0.408
508-
6.0.402
509-
7.0.100-rc.2.22477.23
503+
6.0.403
504+
7.0.100
510505
- name: install Microsoft.Net.Component.4.6.1.TargetingPack
511506
run: |
512507
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"

‎.github/workflows/release-draft.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
timeout-minutes: 30
1616
env:
1717
baseImage: ${{ matrix.baseImage }}
18-
dotnetSdkVersion: 7.0.100-rc.2
18+
dotnetSdkVersion: 7.0.100
1919
steps:
2020
- uses: actions/[email protected]
2121
- name: Build Docker image
@@ -52,10 +52,10 @@ jobs:
5252
with:
5353
dotnet-version: |
5454
2.1.818
55-
3.1.424
55+
3.1.425
5656
5.0.408
57-
6.0.402
58-
7.0.100-rc.2.22477.23
57+
6.0.403
58+
7.0.100
5959
- run: tracer\build.cmd Clean BuildTracerHome PackageTracerHome
6060
shell: cmd
6161
- name: Upload Windows MSI

‎.github/workflows/verify_source_generated_changes_are_persisted.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
- uses: actions/[email protected]
1919
with:
20-
dotnet-version: '7.0.100-rc.2.22477.23'
20+
dotnet-version: '7.0.100'
2121

2222
- name: "Removing existing generated files"
2323
run: Get-ChildItem –Path ".\tracer\src\Datadog.Trace\Generated" -Recurse -File | Remove-Item

‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ linux-build:
2121
matrix:
2222
- baseImage: [ alpine, debian ]
2323
variables:
24-
dotnetSdkVersion: 7.0.100-rc.2
24+
dotnetSdkVersion: 7.0.100
2525
script:
2626
- |
2727
rm .dockerignore

‎docker-compose.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,7 @@ services:
487487
context: ./tracer/build/_build/
488488
dockerfile: docker/${baseImage:-centos7}.dockerfile
489489
args:
490-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-7.0.100-rc.2.22477.23}
491-
- DOTNETSDKIMAGE_VERSION=${dotnetCoreSdkLatestImageVersion:-7.0.100-rc.2}
490+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-7.0.100}
492491
image: dd-trace-dotnet/${baseImage:-centos7}-tester
493492
command: dotnet /build/bin/Debug/_build.dll RunProfilerLinuxIntegrationTests
494493
volumes:
@@ -511,8 +510,7 @@ services:
511510
context: ./tracer/build/_build/
512511
dockerfile: docker/${baseImage:-centos7}.dockerfile
513512
args:
514-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-7.0.100-rc.2.22477.23}
515-
- DOTNETSDKIMAGE_VERSION=${dotnetCoreSdkLatestImageVersion:-7.0.100-rc.2}
513+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-7.0.100}
516514
image: dd-trace-dotnet/${baseImage:-centos7}-tester
517515
command: dotnet /build/bin/Debug/_build.dll RunLinuxIntegrationTests --framework ${framework:-netcoreapp3.1} --code-coverage
518516
volumes:
@@ -585,8 +583,7 @@ services:
585583
context: ./tracer/build/_build/
586584
dockerfile: docker/${baseImage:-centos7}.dockerfile
587585
args:
588-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-7.0.100-rc.2.22477.23}
589-
- DOTNETSDKIMAGE_VERSION=${dotnetCoreSdkLatestImageVersion:-7.0.100-rc.2}
586+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-7.0.100}
590587
image: dd-trace-dotnet/${baseImage:-centos7}-tester
591588
command: dotnet /build/bin/Debug/_build.dll RunExplorationTests --explorationTestUseCase ${explorationTestUseCase:-debugger} --explorationTestName ${explorationTestName:-eshoponweb} --framework ${framework:-netcoreapp3.1} --code-coverage
592589
volumes:
@@ -643,8 +640,7 @@ services:
643640
context: ./tracer/build/_build/
644641
dockerfile: docker/${baseImage:-debian}.dockerfile
645642
args:
646-
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-7.0.100-rc.2.22477.23}
647-
- DOTNETSDKIMAGE_VERSION=${dotnetCoreSdkLatestImageVersion:-7.0.100-rc.2}
643+
- DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-7.0.100}
648644
image: dd-trace-dotnet/${baseImage:-debian}-tester
649645
command: dotnet /build/bin/Debug/_build.dll RunLinuxIntegrationTests --framework ${framework:-netcoreapp3.1}
650646
volumes:

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"allowPrerelease": true
3+
"allowPrerelease": false
44
}
55
}

‎tracer/build/_build/docker/alpine.dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG DOTNETSDKIMAGE_VERSION
2-
FROM mcr.microsoft.com/dotnet/sdk:$DOTNETSDKIMAGE_VERSION-alpine3.16 as base
1+
ARG DOTNETSDK_VERSION
2+
FROM mcr.microsoft.com/dotnet/sdk:$DOTNETSDK_VERSION-alpine3.16 as base
33

44
# SECURITY NOTE: Exception is made for APK packages,
55
# no need to lock versions
@@ -44,13 +44,13 @@ FROM base as tester
4444
# Install .NET Core runtimes using install script
4545
RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
4646
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
47-
&& echo "aaa889cd9fd06f098144fc065db3ab8525133666d9a21c2ca45017aabfef4d23 dotnet-install.sh" | sha256sum -c \
47+
&& echo "2c51739e843231e9829a777fc6038e50b31d420e12a593edb9e858d3587ea361 dotnet-install.sh" | sha256sum -c \
4848
&& chmod +x ./dotnet-install.sh \
4949
&& ./dotnet-install.sh --runtime aspnetcore --version 2.1.30 --install-dir /usr/share/dotnet --no-path \
5050
&& ./dotnet-install.sh --runtime aspnetcore --version 3.0.3 --install-dir /usr/share/dotnet --no-path \
51-
&& ./dotnet-install.sh --runtime aspnetcore --version 3.1.30 --install-dir /usr/share/dotnet --no-path \
51+
&& ./dotnet-install.sh --runtime aspnetcore --version 3.1.31 --install-dir /usr/share/dotnet --no-path \
5252
&& ./dotnet-install.sh --runtime aspnetcore --version 5.0.17 --install-dir /usr/share/dotnet --no-path \
53-
&& ./dotnet-install.sh --runtime aspnetcore --version 6.0.10 --install-dir /usr/share/dotnet --no-path \
53+
&& ./dotnet-install.sh --runtime aspnetcore --version 6.0.11 --install-dir /usr/share/dotnet --no-path \
5454
&& rm dotnet-install.sh
5555

5656
# Copy the build project in and build it

‎tracer/build/_build/docker/debian.dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN apt-get update \
4646
# Install the .NET SDK
4747
RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
4848
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
49-
&& echo "aaa889cd9fd06f098144fc065db3ab8525133666d9a21c2ca45017aabfef4d23 dotnet-install.sh" | sha256sum -c \
49+
&& echo "2c51739e843231e9829a777fc6038e50b31d420e12a593edb9e858d3587ea361 dotnet-install.sh" | sha256sum -c \
5050
&& chmod +x ./dotnet-install.sh \
5151
&& ./dotnet-install.sh --version $DOTNETSDK_VERSION --install-dir /usr/share/dotnet \
5252
&& rm ./dotnet-install.sh \
@@ -79,13 +79,13 @@ RUN if [ "$(uname -m)" = "x86_64" ]; \
7979
fi \
8080
&& curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
8181
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
82-
&& echo "aaa889cd9fd06f098144fc065db3ab8525133666d9a21c2ca45017aabfef4d23 dotnet-install.sh" | sha256sum -c \
82+
&& echo "2c51739e843231e9829a777fc6038e50b31d420e12a593edb9e858d3587ea361 dotnet-install.sh" | sha256sum -c \
8383
&& chmod +x ./dotnet-install.sh \
8484
&& ./dotnet-install.sh --runtime $NETCORERUNTIME2_1 --version 2.1.30 --install-dir /usr/share/dotnet --no-path \
8585
&& ./dotnet-install.sh --runtime aspnetcore --version 3.0.3 --install-dir /usr/share/dotnet --no-path \
86-
&& ./dotnet-install.sh --runtime aspnetcore --version 3.1.30 --install-dir /usr/share/dotnet --no-path \
86+
&& ./dotnet-install.sh --runtime aspnetcore --version 3.1.31 --install-dir /usr/share/dotnet --no-path \
8787
&& ./dotnet-install.sh --runtime aspnetcore --version 5.0.17 --install-dir /usr/share/dotnet --no-path \
88-
&& ./dotnet-install.sh --runtime aspnetcore --version 6.0.10 --install-dir /usr/share/dotnet --no-path \
88+
&& ./dotnet-install.sh --runtime aspnetcore --version 6.0.11 --install-dir /usr/share/dotnet --no-path \
8989
&& rm dotnet-install.sh
9090

9191

‎tracer/build_in_docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BUILD_DIR="$ROOT_DIR/tracer/build/_build"
99
IMAGE_NAME="signalfx-dotnet-tracing/debian-base"
1010

1111
docker build \
12-
--build-arg DOTNETSDK_VERSION=7.0.100-rc.2 \
12+
--build-arg DOTNETSDK_VERSION=7.0.100 \
1313
--tag $IMAGE_NAME \
1414
--file "$BUILD_DIR/docker/centos7.dockerfile" \
1515
"$BUILD_DIR"

0 commit comments

Comments
 (0)