Merge pull request #22 from SilkyFowl/SilkyFowl/issue21

SilkyFowl · Aug 17, 2023 · 2fad2b8 · 2fad2b8
2 parents 2e7a62e + d3214db
commit 2fad2b8
Show file tree

Hide file tree

Showing 44 changed files with 874 additions and 1,416 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -2,20 +2,14 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "fake-cli": {
-      "version": "6.0.0",
-      "commands": [
-        "fake"
-      ]
-    },
     "paket": {
-      "version": "7.1.5",
+      "version": "7.2.1",
       "commands": [
         "paket"
       ]
     },
-    "fantomas-tool": {
-      "version": "4.7.9",
+    "fantomas": {
+      "version": "6.1.2",
       "commands": [
         "fantomas"
       ]

diff --git a/.editorconfig b/.editorconfig
@@ -8,4 +8,4 @@ trim_trailing_whitespace=true
 insert_final_newline=false
 
 [*.{fs,fsx}]
-fsharp_single_argument_web_mode=true
+fsharp_experimental_elmish=true
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -40,5 +40,12 @@
                 }
             }
         },
+        {
+            "name": "Debug Current Tests",
+            "type": "coreclr",
+            "request": "attach",
+            "preLaunchTask": "Start Current Test",
+            "processName": "testhost",
+        }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -2,13 +2,36 @@
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"type": "msbuild",
+			"type": "shell",
 			"problemMatcher": [
 				"$msCompile"
 			],
+			"command": "dotnet",
+			"args": [
+				"build"
+			],
 			"group": "build",
 			"label": "Build: solution",
 			"detail": "Build the Avalonia.FuncUI.LiveView.sln solution using dotnet build"
+		},
+		{
+			"label": "Start Current Test",
+			"type": "shell",
+			"command": "dotnet test ${fileDirname}",
+			"isBackground": true,
+			"options": {
+				"env": {
+					"VSTEST_HOST_DEBUG": "1"
+				}
+			},
+			"problemMatcher": {
+				"base": "$msCompile",
+				"background": {
+					"activeOnStart": true,
+					"beginsPattern": "Starting test execution, please wait\\.\\.\\.",
+					"endsPattern": "^Process Id: \\d+, Name: testhost$"
+				}
+			}
 		}
 	]
 }
diff --git a/Avalonia.FuncUI.LiveView.sln b/Avalonia.FuncUI.LiveView.sln
@@ -8,6 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{0A4244
 		paket.dependencies = paket.dependencies
 	EndProjectSection
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{049BAB3B-2D97-4B66-94C9-7E5E8F85171C}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DB8DF710-E6E6-4722-99D4-514834AEEB16}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Avalonia.FuncUI.LiveView.Core", "src\Avalonia.FuncUI.LiveView.Core\Avalonia.FuncUI.LiveView.Core.fsproj", "{AA59F86F-40EC-4935-928E-ACE854A73DE4}"
@@ -24,8 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{77D972B7
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Avalonia.FuncUI.LiveView.Core.Tests", "tests\Avalonia.FuncUI.LiveView.Core.Tests\Avalonia.FuncUI.LiveView.Core.Tests.fsproj", "{20DD3B4D-46C8-4F78-B114-6ED2CCAA1433}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{049BAB3B-2D97-4B66-94C9-7E5E8F85171C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU