Use .NET 8

Signed-off-by: Victor Chang <[email protected]>
Project-MONAI · Jan 5, 2024 · c1ed24e · c1ed24e
1 parent f35c347
commit c1ed24e
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 90 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -135,14 +135,14 @@ jobs:
     - name: Generate LivingDoc HTML
       if: always()
       run: livingdoc test-assembly Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.dll -t TestExecution.json
-      working-directory: ./tests/IntegrationTests/WorkflowExecutor.IntegrationTests/bin/Debug/net6.0
+      working-directory: ./tests/IntegrationTests/WorkflowExecutor.IntegrationTests/bin/Debug/net8.0
 
     - name: Publish report
       if: always()
       uses: actions/[email protected]
       with:
         name: WorkflowExecutorIntegrationTestReport
-        path: ./tests/IntegrationTests/WorkflowExecutor.IntegrationTests/bin/Debug/net6.0/LivingDoc.html
+        path: ./tests/IntegrationTests/WorkflowExecutor.IntegrationTests/bin/Debug/net8.0/LivingDoc.html
 
   task-manager-integration-tests:
     runs-on: ubuntu-latest
@@ -212,14 +212,14 @@ jobs:
     - name: Generate LivingDoc HTML
       if: always()
       run: livingdoc test-assembly Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.dll -t TestExecution.json
-      working-directory: ./tests/IntegrationTests/TaskManager.IntegrationTests/bin/Debug/net6.0
+      working-directory: ./tests/IntegrationTests/TaskManager.IntegrationTests/bin/Debug/net8.0
 
     - name: Publish report
       if: always()
       uses: actions/[email protected]
       with:
         name: TaskManagerIntegrationTestReport
-        path: ./tests/IntegrationTests/TaskManager.IntegrationTests/bin/Debug/net6.0/LivingDoc.html
+        path: ./tests/IntegrationTests/TaskManager.IntegrationTests/bin/Debug/net8.0/LivingDoc.html
 
   sonarscanner:
     runs-on: ubuntu-latest

diff --git a/docs/docfx.json b/docs/docfx.json
@@ -1,88 +1,88 @@
 {
-    "metadata": [
+  "metadata": [
+    {
+      "src": [
         {
-            "src": [
-                {
-                    "files": [
-                        "TaskManager/API/bin/Release/net6.0/Monai.Deploy.WorkflowManager.TaskManager.API.dll",
-                        "WorkflowManager/Contracts/bin/Release/net6.0/Monai.Deploy.WorkflowManager.Contracts.dll",
-                        "Shared/Configuration/bin/Release/net6.0/Monai.Deploy.WorkflowManager.Configuration.dll"
-                    ],
-                    "exclude": [
-                        "**/obj/**",
-                        "**Test/**",
-                        "_site/**"
-                    ],
-                    "src": "../src"
-                }
-            ],
-            "dest": "obj/api/dotnet",
-            "filter": "filterConfig.yml",
-            "properties": {
-                "TargetFramework": "net6.0"
-            }
+          "files": [
+            "TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj",
+            "WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj",
+            "Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj"
+          ],
+          "exclude": [
+            "**/obj/**",
+            "**Test/**",
+            "_site/**"
+          ],
+          "src": "../src"
         }
-    ],
-    "build": {
-        "content": [
-            {
-                "files": [
-                    "**/*.yml"
-                ],
-                "src": "obj/api",
-                "dest": "api"
-            },
-            {
-                "files": [
-                    "**/*.md",
-                    "**/toc.yml",
-                    "toc.yml"
-                ]
-            }
-        ],
-        "resource": [
-            {
-                "files": [
-                    "images/**"
-                ],
-                "exclude": [
-                    "obj/**",
-                    "_site/**"
-                ]
-            }
-        ],
-        "globalMetadata": {
-            "_appTitle": "MONAI Deploy Workflow Manager v0.0.0",
-            "_enableSearch": true,
-            "_appFaviconPath": "images/favicon.ico",
-            "_appLogoPath": "images/MONAI-logo-color.svg",
-            "_appFooter": "Copyright © 2022 <a href=\"https://monai.io/\">Project MONAI</a><br>Generated by <strong>DocFX</strong>",
-            "_gitContribute": {
-                "repo": "https://github.com/Project-MONAI/monai-deploy-workflow-manager.git",
-                "branch": "main",
-                "path": "docs/"
-            },
-            "_gitUrlPattern": "github"
-        },
-        "markdownEngineName": "markdig",
-        "dest": "_site",
-        "xrefService": [
-            "https://xref.docs.microsoft.com/query?uid={uid}"
+      ],
+      "dest": "obj/api/dotnet",
+      "filter": "filterConfig.yml",
+      "properties": {
+        "TargetFramework": "net8.0"
+      }
+    }
+  ],
+  "build": {
+    "content": [
+      {
+        "files": [
+          "**/*.yml"
         ],
-        "template": [
-            "default",
-            "templates/material"
+        "src": "obj/api",
+        "dest": "api"
+      },
+      {
+        "files": [
+          "**/*.md",
+          "**/toc.yml",
+          "toc.yml"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "images/**"
         ],
-        "fileMetadata": {
-            "_disableBreadcrumb": {
-                "index.md": true,
-                "changelog.md": true,
-                "dicom.md": true,
-                "apis.md": true
-            }
-        },
-        "postProcessors": [
-            "ExtractSearchIndex"
+        "exclude": [
+          "obj/**",
+          "_site/**"
         ]
-    }
+      }
+    ],
+    "globalMetadata": {
+      "_appTitle": "MONAI Deploy Workflow Manager v0.0.0",
+      "_enableSearch": true,
+      "_appFaviconPath": "images/favicon.ico",
+      "_appLogoPath": "images/MONAI-logo-color.svg",
+      "_appFooter": "Copyright © 2022 <a href=\"https://monai.io/\">Project MONAI</a><br>Generated by <strong>DocFX</strong>",
+      "_gitContribute": {
+        "repo": "https://github.com/Project-MONAI/monai-deploy-workflow-manager.git",
+        "branch": "main",
+        "path": "docs/"
+      },
+      "_gitUrlPattern": "github"
+    },
+    "markdownEngineName": "markdig",
+    "dest": "_site",
+    "xrefService": [
+      "https://xref.docs.microsoft.com/query?uid={uid}"
+    ],
+    "template": [
+      "default",
+      "templates/material"
+    ],
+    "fileMetadata": {
+      "_disableBreadcrumb": {
+        "index.md": true,
+        "changelog.md": true,
+        "dicom.md": true,
+        "apis.md": true
+      }
+    },
+    "postProcessors": [
+      "ExtractSearchIndex"
+    ]
+  }
 }
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/guidelines/mwm-developer-setup.md b/guidelines/mwm-developer-setup.md
@@ -21,7 +21,7 @@
 - python 3 installed.
 - Helm 3 https://helm.sh/docs/intro/install/
 - rabbitmqadmin https://www.rabbitmq.com/management-cli.html
-- 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).
+- 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).
 
 Note. if you already have docker container for Minio Rabbit etc running Stop these.
 
@@ -196,7 +196,7 @@ paste the above (with the proper workflowId) into bash and press enter.
 
 Debug in VisualStudio (if its not already running) and view the progress
 if you see error messages in the debug terminal in vs about mc.exe make sure you've copied it over as mentioned above.
-ie copy mc.exe to `\monai-deploy-workflow-manager\src\TaskManager\TaskManager\bin\Debug\net6.0`
+ie copy mc.exe to `\monai-deploy-workflow-manager\src\TaskManager\TaskManager\bin\Debug\net8.0`
 
 in the argo workflows tab [https://localhost:2746/workflows?limit=50](https://localhost:2746/workflows?limit=50)
 you should see the activity of the argo task running. once complete the code will process the callback and update messages.

diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/README.md b/tests/IntegrationTests/TaskManager.IntegrationTests/README.md
@@ -54,5 +54,5 @@ dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI
 Run the integration tests to generate a TestExecution.json
 
 ```bash
-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
+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
 ```
diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/README.md b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/README.md
@@ -59,5 +59,5 @@ dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI
 Run the integration tests to generate a TestExecution.json
 
 ```bash
-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
+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
 ```