Skip to content

Commit acd4284

Browse files
authored
Upgrade to .NET 8 (#937)
* Upgrade to .NET 8 Signed-off-by: Victor Chang <vicchang@nvidia.com>
1 parent 84ee385 commit acd4284

File tree

146 files changed

+19404
-31084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+19404
-31084
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@ jobs:
6565
run: cat src/AssemblyInfo.cs
6666

6767
- name: Log in to the Container registry
68-
uses: docker/login-action@v2.1.0
68+
uses: docker/login-action@v3.0.0
6969
with:
7070
registry: ${{ env.REGISTRY }}
7171
username: ${{ github.actor }}
7272
password: ${{ secrets.GITHUB_TOKEN }}
7373

7474
- name: Extract metadata (tags, labels) for Docker
7575
id: meta
76-
uses: docker/metadata-action@v4.4.0
76+
uses: docker/metadata-action@v5.4.0
7777
with:
7878
images: ${{ matrix.image }}
7979
tags: |
8080
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
8181
type=raw,value=${{ steps.gitversion.outputs.semVer }}
8282
8383
- name: Build and Push Container Image for ${{ matrix.dockerfile }}
84-
uses: docker/build-push-action@v4.0.0
84+
uses: docker/build-push-action@v5.1.0
8585
with:
8686
context: .
8787
push: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/heads/develop') ||contains(github.head_ref, 'release/') || contains(github.head_ref, 'feature/') || contains(github.head_ref, 'develop') }}
@@ -124,7 +124,7 @@ jobs:
124124

125125
- name: Anchore Container Scan
126126
id: anchore-scan
127-
uses: anchore/scan-action@v3.3.5
127+
uses: anchore/scan-action@v3.3.8
128128
continue-on-error: true
129129
if: ${{ contains(github.ref, 'refs/heads/main') || contains(github.head_ref, 'release/') }}
130130
with:
@@ -153,7 +153,7 @@ jobs:
153153

154154
- uses: actions/setup-dotnet@v3
155155
with:
156-
dotnet-version: "6.0.x"
156+
dotnet-version: "8.0.x"
157157

158158
- name: Enable NuGet cache
159159
uses: actions/cache@v3.3.1

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
workflow_dispatch:
2727

2828
env:
29-
DOTNET_VERSION: '6.0.x'
29+
DOTNET_VERSION: '8.0.x'
3030

3131
jobs:
3232
analyze:

.github/workflows/license-scanning.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
workflow_dispatch:
2020

2121
env:
22-
DOTNET_VERSION: '6.0.x'
22+
DOTNET_VERSION: '8.0.x'
2323

2424
jobs:
2525
scan:

.github/workflows/nightly.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ jobs:
4747
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
4848

4949
- name: Log in to the Container registry
50-
uses: docker/login-action@v2.1.0
50+
uses: docker/login-action@v3.0.0
5151
with:
5252
registry: ${{ env.REGISTRY }}
5353
username: ${{ github.actor }}
5454
password: ${{ secrets.GITHUB_TOKEN }}
5555

5656
- name: Extract metadata (tags, labels) for Docker
5757
id: meta
58-
uses: docker/metadata-action@v4.4.0
58+
uses: docker/metadata-action@v5.4.0
5959
with:
6060
images: ${{ matrix.image }}
6161
tags: |
6262
type=raw,value=develop-latest
6363
type=raw,value=develop-nightly-${{ steps.date.outputs.date }}
6464
6565
- name: Build and Push Container Image for ${{ matrix.feature }}
66-
uses: docker/build-push-action@v4.0.0
66+
uses: docker/build-push-action@v5.1.0
6767
with:
6868
context: .
6969
push: true
@@ -80,7 +80,7 @@ jobs:
8080

8181
- name: Anchore Container Scan
8282
id: anchore-scan
83-
uses: anchore/scan-action@v3.3.5
83+
uses: anchore/scan-action@v3.3.8
8484
with:
8585
image: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
8686
fail-build: true

.github/workflows/security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
workflow_dispatch:
2020

2121
env:
22-
DOTNET_VERSION: '6.0.x'
22+
DOTNET_VERSION: '8.0.x'
2323

2424
jobs:
2525
secret-scan:
@@ -31,7 +31,7 @@ jobs:
3131
fetch-depth: 0
3232

3333
- name: TruffleHog OSS
34-
uses: trufflesecurity/trufflehog@v3.34.0
34+
uses: trufflesecurity/trufflehog@v3.63.7
3535
with:
3636
path: ./
3737
base: ${{ github.event.repository.default_branch }}

.github/workflows/test.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
workflow_dispatch:
2323

2424
env:
25-
DOTNET_VERSION: '6.0.x'
25+
DOTNET_VERSION: '8.0.x'
2626

2727
jobs:
2828
unit-tests-and-codecov:
@@ -135,14 +135,14 @@ jobs:
135135
- name: Generate LivingDoc HTML
136136
if: always()
137137
run: livingdoc test-assembly Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.dll -t TestExecution.json
138-
working-directory: ./tests/IntegrationTests/WorkflowExecutor.IntegrationTests/bin/Debug/net6.0
138+
working-directory: ./tests/IntegrationTests/WorkflowExecutor.IntegrationTests/bin/Debug/net8.0
139139

140140
- name: Publish report
141141
if: always()
142142
uses: actions/upload-artifact@v3.1.2
143143
with:
144144
name: WorkflowExecutorIntegrationTestReport
145-
path: ./tests/IntegrationTests/WorkflowExecutor.IntegrationTests/bin/Debug/net6.0/LivingDoc.html
145+
path: ./tests/IntegrationTests/WorkflowExecutor.IntegrationTests/bin/Debug/net8.0/LivingDoc.html
146146

147147
task-manager-integration-tests:
148148
runs-on: ubuntu-latest
@@ -212,19 +212,25 @@ jobs:
212212
- name: Generate LivingDoc HTML
213213
if: always()
214214
run: livingdoc test-assembly Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.dll -t TestExecution.json
215-
working-directory: ./tests/IntegrationTests/TaskManager.IntegrationTests/bin/Debug/net6.0
215+
working-directory: ./tests/IntegrationTests/TaskManager.IntegrationTests/bin/Debug/net8.0
216216

217217
- name: Publish report
218218
if: always()
219219
uses: actions/upload-artifact@v3.1.2
220220
with:
221221
name: TaskManagerIntegrationTestReport
222-
path: ./tests/IntegrationTests/TaskManager.IntegrationTests/bin/Debug/net6.0/LivingDoc.html
222+
path: ./tests/IntegrationTests/TaskManager.IntegrationTests/bin/Debug/net8.0/LivingDoc.html
223223

224224
sonarscanner:
225225
runs-on: ubuntu-latest
226226
needs: unit-tests-and-codecov
227227
steps:
228+
- name: Set up JDK 17
229+
uses: actions/setup-java@v3
230+
with:
231+
java-version: 17
232+
distribution: 'zulu' # Alternative distribution options are available.
233+
228234
- name: Checkout repository
229235
uses: actions/checkout@v3
230236
with:

TaskManager.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# See the License for the specific language governing permissions and
1010
# limitations under the License.
1111

12-
FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy as build
12+
FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy as build
1313

1414
# Install the tools
1515
RUN dotnet tool install --tool-path /tools dotnet-trace
@@ -27,7 +27,7 @@ RUN wget -O mc https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEAS
2727
RUN chmod +x mc
2828

2929
# Build runtime image
30-
FROM mcr.microsoft.com/dotnet/aspnet:6.0-jammy
30+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
3131

3232
ENV DEBIAN_FRONTEND=noninteractive
3333

WorkflowManager.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy as build
15+
FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy as build
1616

1717
# Install the tools
1818
RUN dotnet tool install --tool-path /tools dotnet-trace
@@ -26,7 +26,7 @@ RUN echo "Building MONAI Workflow Manager..."
2626
RUN dotnet publish -c Release -o out --nologo src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj
2727

2828
# Build runtime image
29-
FROM mcr.microsoft.com/dotnet/aspnet:6.0-jammy
29+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
3030

3131
ENV DEBIAN_FRONTEND=noninteractive
3232

0 commit comments

Comments
 (0)