REORG

.vscode/launch.json

@@ -17,13 +17,13 @@
             "console": "internalConsole"
         },
         {
-            "name": "web",
+            "name": "org",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/src/Yavsc/bin/Debug/net9.0/Yavsc.dll",
+            "program": "${workspaceFolder}/src/Org/bin/Debug/net9.0/Org.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/src/Yavsc",
+            "cwd": "${workspaceFolder}/src/Org",
             "stopAtEntry": false,
             "serverReadyAction": {
                 "action": "openExternally",
@@ -33,18 +33,18 @@
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
             "sourceFileMap": {
-                "/Views": "${workspaceFolder}/src/Yavsc/Views"
+                "/Views": "${workspaceFolder}/src/Org/Views"
             }
         },
         
         {
-            "name": "sample web",
+            "name": "Web",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/src/sampleWebAsWebApiClient/bin/Debug/net9.0/sampleWebAsWebApiClient.dll",
+            "program": "${workspaceFolder}/src/Web/bin/Debug/net9.0/Web.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/src/sampleWebAsWebApiClient",
+            "cwd": "${workspaceFolder}/src/Web",
             "stopAtEntry": false,
             "serverReadyAction": {
                 "action": "openExternally",
@@ -54,7 +54,7 @@
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
             "sourceFileMap": {
-                "/Views": "${workspaceFolder}/src/sampleWebAsWebApiClient/Views"
+                "/Views": "${workspaceFolder}/src/Web/Views"
             }
         },
         
@@ -62,29 +62,18 @@
             "name": "Api",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "build-webapi",
+            "preLaunchTask": "build-web",
-            "program": "${workspaceFolder}/src/Api/bin/Debug/net8.0/Api.dll",
+            "program": "${workspaceFolder}/src/Api/bin/Debug/net9.0/Api.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/Api",
             "stopAtEntry": false,
             "console": "internalConsole"
         },
         {
-            "name": "dotnet webClient",
+            "name": "dotnet org",
             "type": "dotnet",
             "request": "launch",
-            //"projectPath": "${workspaceFolder}/src/Yavsc/Yavsc.csproj",
+            "projectPath": "${workspaceFolder}/src/Org/Org.csproj",
-            "projectPath": "${workspaceFolder}/src/sampleWebAsWebApiClient/sampleWebAsWebApiClient.csproj",
-            "serverReadyAction": {
-                "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
-            }
-        },
-        {
-            "name": "dotnet web",
-            "type": "dotnet",
-            "request": "launch",
-            "projectPath": "${workspaceFolder}/src/Yavsc/Yavsc.csproj",
              "serverReadyAction": {
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"

.vscode/tasks.json

@@ -47,7 +47,7 @@
 			"isBackground": true
 		},
 		{
-			"label": "build-webclient",
+			"label": "build-web",
 			"type": "process",
 			"problemMatcher": ["$msCompile"],
 			"command": "dotnet",
@@ -57,7 +57,7 @@
 			"runOptions": {
 			},
 			"options": {
-				"cwd": "src/sampleWebAsWebApiClient"
+				"cwd": "src/Web"
 			},
 			"group": {
 				"kind": "build"

Makefile

@@ -2,6 +2,8 @@
 CONFIG=Debug
 FRAMEWORK=net9.0
 DESTDIR=/tmp/yavsc
+APP_PATH=srv/www/yavsc
+APP_FULL_PATH=$(DESTDIR)/$(APP_PATH)
 
 all:
 	dotnet build --nologo
@@ -27,12 +29,14 @@ src/Yavsc.Server/bin/$(CONFIG)/$(FRAMEWORK)/Yavsc.Server.dll:
 src/Yavsc/bin/$(CONFIG)/$(FRAMEWORK)/Yavsc.dll:
 	dotnet build -p:Configuration=$(CONFIG) --project src/Yavsc/Yavsc.csproj
 
+$(DESTDIR): 
+	mkdir $(DESTDIR)
 
-publish:
+install: $(DESTDIR)
-	dotnet publish src/Yavsc/Yavsc.csproj -c Release -o $(DESTDIR)/srv/www/yavsc
+	dotnet publish src/Org/Org.csproj -c Release -o $(APP_FULL_PATH)
-
+	dotnet publish src/Api/Api.csproj -c Release -o $(APP_FULL_PATH)
-install: publish
+	dotnet publish src/Web/Web.csproj -c Release -o $(APP_FULL_PATH)
-	sudo chown -R www-data:www-data $(DESTDIR)/srv/www/yavsc
+	sudo chown -R www-data:www-data $(APP_FULL_PATH)
 
 docker-image:
 	docker build .