Skip to content

Commit c1ed24e

Browse files
mocsharpmocsharp
committed
Use .NET 8
Signed-off-by: Victor Chang <vicchang@nvidia.com>
1 parent f35c347 commit c1ed24e

File tree

6 files changed

+90
-90
lines changed

6 files changed

+90
-90
lines changed

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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,14 +212,14 @@ 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

‎docs/docfx.json‎

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
11
{
2-
"metadata": [
2+
"metadata": [
3+
{
4+
"src": [
35
{
4-
"src": [
5-
{
6-
"files": [
7-
"TaskManager/API/bin/Release/net6.0/Monai.Deploy.WorkflowManager.TaskManager.API.dll",
8-
"WorkflowManager/Contracts/bin/Release/net6.0/Monai.Deploy.WorkflowManager.Contracts.dll",
9-
"Shared/Configuration/bin/Release/net6.0/Monai.Deploy.WorkflowManager.Configuration.dll"
10-
],
11-
"exclude": [
12-
"**/obj/**",
13-
"**Test/**",
14-
"_site/**"
15-
],
16-
"src": "../src"
17-
}
18-
],
19-
"dest": "obj/api/dotnet",
20-
"filter": "filterConfig.yml",
21-
"properties": {
22-
"TargetFramework": "net6.0"
23-
}
6+
"files": [
7+
"TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj",
8+
"WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj",
9+
"Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj"
10+
],
11+
"exclude": [
12+
"**/obj/**",
13+
"**Test/**",
14+
"_site/**"
15+
],
16+
"src": "../src"
2417
}
25-
],
26-
"build": {
27-
"content": [
28-
{
29-
"files": [
30-
"**/*.yml"
31-
],
32-
"src": "obj/api",
33-
"dest": "api"
34-
},
35-
{
36-
"files": [
37-
"**/*.md",
38-
"**/toc.yml",
39-
"toc.yml"
40-
]
41-
}
42-
],
43-
"resource": [
44-
{
45-
"files": [
46-
"images/**"
47-
],
48-
"exclude": [
49-
"obj/**",
50-
"_site/**"
51-
]
52-
}
53-
],
54-
"globalMetadata": {
55-
"_appTitle": "MONAI Deploy Workflow Manager v0.0.0",
56-
"_enableSearch": true,
57-
"_appFaviconPath": "images/favicon.ico",
58-
"_appLogoPath": "images/MONAI-logo-color.svg",
59-
"_appFooter": "Copyright © 2022 <a href=\"https://monai.io/\">Project MONAI</a><br>Generated by <strong>DocFX</strong>",
60-
"_gitContribute": {
61-
"repo": "https://github.com/Project-MONAI/monai-deploy-workflow-manager.git",
62-
"branch": "main",
63-
"path": "docs/"
64-
},
65-
"_gitUrlPattern": "github"
66-
},
67-
"markdownEngineName": "markdig",
68-
"dest": "_site",
69-
"xrefService": [
70-
"https://xref.docs.microsoft.com/query?uid={uid}"
18+
],
19+
"dest": "obj/api/dotnet",
20+
"filter": "filterConfig.yml",
21+
"properties": {
22+
"TargetFramework": "net8.0"
23+
}
24+
}
25+
],
26+
"build": {
27+
"content": [
28+
{
29+
"files": [
30+
"**/*.yml"
7131
],
72-
"template": [
73-
"default",
74-
"templates/material"
32+
"src": "obj/api",
33+
"dest": "api"
34+
},
35+
{
36+
"files": [
37+
"**/*.md",
38+
"**/toc.yml",
39+
"toc.yml"
40+
]
41+
}
42+
],
43+
"resource": [
44+
{
45+
"files": [
46+
"images/**"
7547
],
76-
"fileMetadata": {
77-
"_disableBreadcrumb": {
78-
"index.md": true,
79-
"changelog.md": true,
80-
"dicom.md": true,
81-
"apis.md": true
82-
}
83-
},
84-
"postProcessors": [
85-
"ExtractSearchIndex"
48+
"exclude": [
49+
"obj/**",
50+
"_site/**"
8651
]
87-
}
52+
}
53+
],
54+
"globalMetadata": {
55+
"_appTitle": "MONAI Deploy Workflow Manager v0.0.0",
56+
"_enableSearch": true,
57+
"_appFaviconPath": "images/favicon.ico",
58+
"_appLogoPath": "images/MONAI-logo-color.svg",
59+
"_appFooter": "Copyright © 2022 <a href=\"https://monai.io/\">Project MONAI</a><br>Generated by <strong>DocFX</strong>",
60+
"_gitContribute": {
61+
"repo": "https://github.com/Project-MONAI/monai-deploy-workflow-manager.git",
62+
"branch": "main",
63+
"path": "docs/"
64+
},
65+
"_gitUrlPattern": "github"
66+
},
67+
"markdownEngineName": "markdig",
68+
"dest": "_site",
69+
"xrefService": [
70+
"https://xref.docs.microsoft.com/query?uid={uid}"
71+
],
72+
"template": [
73+
"default",
74+
"templates/material"
75+
],
76+
"fileMetadata": {
77+
"_disableBreadcrumb": {
78+
"index.md": true,
79+
"changelog.md": true,
80+
"dicom.md": true,
81+
"apis.md": true
82+
}
83+
},
84+
"postProcessors": [
85+
"ExtractSearchIndex"
86+
]
87+
}
8888
}

‎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": "6.0.100",
3+
"version": "8.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

‎guidelines/mwm-developer-setup.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
- python 3 installed.
2222
- Helm 3 https://helm.sh/docs/intro/install/
2323
- rabbitmqadmin https://www.rabbitmq.com/management-cli.html
24-
- mc.exe https://github.com/minio/mc install and add its location to the storage_settings_executableLocation setting (appsettings.local.json) including the name itself ! ie `mc.exe` if its in the folder of the running executable (\bin\Debug\net6.0).
24+
- mc.exe https://github.com/minio/mc install and add its location to the storage_settings_executableLocation setting (appsettings.local.json) including the name itself ! ie `mc.exe` if its in the folder of the running executable (\bin\Debug\net8.0).
2525

2626
Note. if you already have docker container for Minio Rabbit etc running Stop these.
2727

@@ -196,7 +196,7 @@ paste the above (with the proper workflowId) into bash and press enter.
196196

197197
Debug in VisualStudio (if its not already running) and view the progress
198198
if you see error messages in the debug terminal in vs about mc.exe make sure you've copied it over as mentioned above.
199-
ie copy mc.exe to `\monai-deploy-workflow-manager\src\TaskManager\TaskManager\bin\Debug\net6.0`
199+
ie copy mc.exe to `\monai-deploy-workflow-manager\src\TaskManager\TaskManager\bin\Debug\net8.0`
200200

201201
in the argo workflows tab [https://localhost:2746/workflows?limit=50](https://localhost:2746/workflows?limit=50)
202202
you should see the activity of the argo task running. once complete the code will process the callback and update messages.

‎tests/IntegrationTests/TaskManager.IntegrationTests/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI
5454
Run the integration tests to generate a TestExecution.json
5555

5656
```bash
57-
livingdoc test-assembly {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.dll -t {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\TestExecution.json
57+
livingdoc test-assembly {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net8.0\Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.dll -t {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\TestExecution.json
5858
```

‎tests/IntegrationTests/WorkflowExecutor.IntegrationTests/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI
5959
Run the integration tests to generate a TestExecution.json
6060

6161
```bash
62-
livingdoc test-assembly {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.dll -t {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\TestExecution.json
62+
livingdoc test-assembly {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net8.0\Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.dll -t {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\TestExecution.json
6363
```

0 commit comments

Comments
 (0)