Skip to content

Commit b8a6f8e

Browse files
author
Chris Maunder
committed
Corrections to .NET handling in macOS
1 parent 9dc0456 commit b8a6f8e

File tree

2 files changed

+12
-35
lines changed

2 files changed

+12
-35
lines changed

‎.vscode/launch.json‎

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
"request": "launch",
1414
"preLaunchTask": "build-server",
1515
// "postDebugTask": "stop-all",
16-
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server",
17-
"windows": {
18-
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server",
19-
},
16+
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server",
2017
"linux": {
2118
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.dll",
2219
},
@@ -85,10 +82,7 @@
8582
"request": "launch",
8683
"preLaunchTask": "build-all",
8784
// "postDebugTask": "stop-all",
88-
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server",
89-
"windows": {
90-
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server",
91-
},
85+
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server",
9286
"linux": {
9387
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.dll",
9488
},
@@ -144,10 +138,7 @@
144138
"name": "Launch Server",
145139
"type": "coreclr",
146140
"request": "launch",
147-
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server",
148-
"windows": {
149-
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server",
150-
},
141+
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server",
151142
"linux": {
152143
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.dll",
153144
},
@@ -197,10 +188,7 @@
197188
"type": "coreclr",
198189
"request": "launch",
199190
"preLaunchTask": "build-server",
200-
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server",
201-
"windows": {
202-
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server.exe",
203-
},
191+
"program": "${workspaceFolder}/src/server/bin/Debug/net9.0/CodeProject.AI.Server.exe",
204192
"linux": {
205193
"program": "${workspaceFolder}/src/server/bin/Debug/${env:dotNetTarget}/CodeProject.AI.Server.dll",
206194
},
@@ -242,10 +230,7 @@
242230
"type": "coreclr",
243231
"request": "launch",
244232
"preLaunchTask": "build-yolo-net",
245-
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/${env:dotNetTarget}/ObjectDetectionYOLOv5Net",
246-
"windows": {
247-
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/9.0/ObjectDetectionYOLOv5Net",
248-
},
233+
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/9.0/ObjectDetectionYOLOv5Net",
249234
"linux": {
250235
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/${env:dotNetTarget}/ObjectDetectionYOLOv5Net.dll",
251236
},
@@ -347,10 +332,7 @@
347332
"type": "coreclr",
348333
"request": "launch",
349334
"preLaunchTask": "build-parsejson",
350-
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/${env:dotNetTarget}/ParseJSON",
351-
"windows": {
352-
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/9.0/ParseJSON",
353-
},
335+
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/9.0/ParseJSON",
354336
"linux": {
355337
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/${env:dotNetTarget}/ParseJSON.dll",
356338
},
@@ -494,9 +476,6 @@
494476
"linux": {
495477
"program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/${env:dotNetTarget}/JsonAPI.dll",
496478
},
497-
"osx": {
498-
"program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/${env:dotNetTarget}/JsonAPI.dll",
499-
},
500479
"args": [],
501480
"cwd": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/",
502481
"stopAtEntry": false,
@@ -615,10 +594,7 @@
615594
"type": "coreclr",
616595
"request": "launch",
617596
"preLaunchTask": "build-demo-net",
618-
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/${env:dotNetTarget}/DotNetSimple",
619-
"windows": {
620-
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/net9.0/DotNetSimple",
621-
},
597+
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/net9.0/DotNetSimple",
622598
"linux": {
623599
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/${env:dotNetTarget}/DotNetSimple.dll",
624600
},
@@ -645,10 +621,7 @@
645621
"type": "coreclr",
646622
"request": "launch",
647623
"preLaunchTask": "build-demo_module_dotnetlongprocess",
648-
"program": "${workspaceFolder}/src/demos/modules/DotNetLongProcess/bin/Debug/${env:dotNetTarget}/DotNetLongProcess",
649-
"windows": {
650-
"program": "${workspaceFolder}/src/demos/modules/DotNetLongProcess/bin/Debug/net9.0/DotNetLongProcess",
651-
},
624+
"program": "${workspaceFolder}/src/demos/modules/DotNetLongProcess/bin/Debug/net9.0/DotNetLongProcess",
652625
"linux": {
653626
"program": "${workspaceFolder}/src/demos/modules/DotNetLongProcess/bin/Debug/${env:dotNetTarget}/DotNetLongProcess.dll",
654627
},

‎src/scripts/utils.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -823,6 +823,10 @@ function setupDotNet () {
823823
export DOTNET_ROOT=${dotnet_path}
824824
export PATH=${DOTNET_ROOT}${PATH:+:${PATH}}
825825

826+
if [ -e /usr/local/bin/dotnet ]; then
827+
rm /usr/local/bin/dotnet
828+
fi
829+
826830
if [ ! -e /usr/local/bin/dotnet ]; then
827831
ln -fs "${dotnet_path}dotnet" "/usr/local/bin/dotnet"
828832
fi

0 commit comments

Comments
 (0)