Browse Source

Ensure the CollisionSample sln points to the right projects. Added VSCode entries for Android and iOS, even though they don't currently run.

CartBlanche 2 months ago
parent
commit
70c82a29f2
3 changed files with 39 additions and 33 deletions
  1. 16 0
      Collisions/.vscode/launch.json
  2. 18 28
      Collisions/.vscode/tasks.json
  3. 5 5
      Collisions/CollisionSample.sln

+ 16 - 0
Collisions/.vscode/launch.json

@@ -22,6 +22,22 @@
             "cwd": "${workspaceFolder}",
             "console": "internalConsole",
             "stopAtEntry": false
+        },
+        {
+            "name": "Launch Android",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-android",
+            "program": "${workspaceFolder}/Platforms/Android/bin/Debug/net8.0-android/Collision.dll",
+            "cwd": "${workspaceFolder}/Platforms/Android"
+        },
+        {
+            "name": "Launch iOS",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-ios",
+            "program": "${workspaceFolder}/Platforms/iOS/bin/Debug/net8.0-ios/Collision.dll",
+            "cwd": "${workspaceFolder}/Platforms/iOS"
         }
     ]
 }

+ 18 - 28
Collisions/.vscode/tasks.json

@@ -42,47 +42,37 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/CollisionSample.Android.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "group": "build",
-            "presentation": {
-                "reveal": "always"
-            },
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/CollisionSample.DesktopGL.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "${workspaceFolder}/Platforms/Android/CollisionSample.Android.csproj"
             ],
             "group": "build",
             "presentation": {
-                "reveal": "silent"
+                "echo": true,
+                "reveal": "silent",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
             },
-            "problemMatcher": "$msCompile"
+            "problemMatcher": "$msCompile",
         },
         {
-            "label": "watch",
+            "label": "build-ios",
             "command": "dotnet",
             "type": "process",
             "args": [
-                "watch",
-                "run",
-                "--project",
-                "${workspaceFolder}/CollisionSample.DesktopGL.csproj"
+                "build",
+                "${workspaceFolder}/Platforms/iOS/CollisionSample.iOS.csproj"
             ],
             "group": "build",
             "presentation": {
-                "reveal": "always"
+                "echo": true,
+                "reveal": "silent",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
             },
-            "problemMatcher": "$msCompile"
+            "problemMatcher": "$msCompile",
         }
     ]
 }

+ 5 - 5
Collisions/CollisionSample.sln

@@ -2,15 +2,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.2.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample", "CollisionSample.csproj", "{5AFF6754-07AD-AE68-CA0D-F7A4E2A23328}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample.Core", "Core\CollisionSample.Core.csproj", "{5AFF6754-07AD-AE68-CA0D-F7A4E2A23328}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample.Windows", "CollisionSample.Windows.csproj", "{AFFFC991-4956-45EF-8746-C1AE3FC7A246}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample.Windows", "Platforms\Windows\CollisionSample.Windows.csproj", "{AFFFC991-4956-45EF-8746-C1AE3FC7A246}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample.DesktopGL", "CollisionSample.DesktopGL.csproj", "{AFFFC991-4956-45EF-8746-C1AE3FC7A247}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample.DesktopGL", "Platforms\Desktop\CollisionSample.DesktopGL.csproj", "{AFFFC991-4956-45EF-8746-C1AE3FC7A247}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample.Android", "CollisionSample.Android.csproj", "{AFFFC991-4956-45EF-8746-C1AE3FC7A248}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample.Android", "Platforms\Android\CollisionSample.Android.csproj", "{AFFFC991-4956-45EF-8746-C1AE3FC7A248}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample.iOS", "CollisionSample.iOS.csproj", "{AFFFC991-4956-45EF-8746-C1AE3FC7A249}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CollisionSample.iOS", "Platforms\iOS\CollisionSample.iOS.csproj", "{AFFFC991-4956-45EF-8746-C1AE3FC7A249}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution