Updated VS Code project

- settings.json: included some Tools projects into file list
- launch.json: added separate option for UITest
- tasks.json: using built-in problem matcher, added task for building UITest
- UITest/build.sh: passing command line parameters to main build.sh

.vscode/c_cpp_properties.json

@@ -13,7 +13,7 @@
                 "_UNICODE"
             ],
             "windowsSdkVersion": "10.0.17134.0",
-            "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.15.26726/bin/Hostx64/x64/cl.exe",
+            "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.21.27702/bin/Hostx64/x64/cl.exe",
             "cStandard": "c11",
             "cppStandard": "c++17",
             "intelliSenseMode": "msvc-x64",

.vscode/launch.json

@@ -28,6 +28,18 @@
 			"externalConsole": false,
 			"logging": { "moduleLoad": false },
 			"visualizerFile": "${workspaceFolder}/Tools/umodel.natvis"
+		},
+		{
+			"name": "UI Test",
+			"type": "cppvsdbg",
+			"request": "launch",
+			"preLaunchTask": "Build UITest",
+			"program": "${workspaceFolder}/Tools/UITest/uitest.exe",
+			"args": [],
+			"cwd": "${workspaceFolder}",
+			"externalConsole": false,
+			"logging": { "moduleLoad": false },
+			"visualizerFile": "${workspaceFolder}/Tools/umodel.natvis"
 		}
 	]
 }

.vscode/settings.json

@@ -10,7 +10,7 @@
         "**/Docs": true,
         "**/makefile-*": true,
         "**/obj": true,
-        "**/Tools/**": true,
+        "**/Tools/{M,P,T,Umd,UT,unpack}*": true,
         "**/UI/stl-stub": true,
         "**/UmodelExport": true,
         "**/UmodelSaved": true,

.vscode/tasks.json

@@ -16,20 +16,7 @@
 				"showReuseMessage": false,
 				"clear": true
 			},
-			"problemMatcher": {
-				"owner": "cpp",
-				"fileLocation": [
-					"relative",
-					"${workspaceRoot}"
-				],
-				"pattern": {
-					"regexp": "^(.*)\\((\\d+)\\)\\s+:\\s+(error|warning)\\s+(\\w+\\s*:\\s+.*)$",
-					"file": 1,
-					"line": 2,
-					"severity": 3,
-					"message": 4
-				}
-			}
+			"problemMatcher": "$msCompile"
 		},
 		{
 			"label": "Compile",
@@ -40,20 +27,21 @@
 				"showReuseMessage": false,
 				"clear": true
 			},
-			"problemMatcher": {
-				"owner": "cpp",
-				"fileLocation": [
-					"relative",
-					"${workspaceRoot}"
-				],
-				"pattern": {
-					"regexp": "^(.*)\\((\\d+)\\)\\s+:\\s+(error|warning)\\s+(\\w+\\s*:\\s+.*)$",
-					"file": 1,
-					"line": 2,
-					"severity": 3,
-					"message": 4
-				}
-			}
+			"problemMatcher": "$msCompile"
+		},
+		{
+			"label": "Build UITest",
+			"type": "shell",
+			"command": "./build.sh --debug",
+			"presentation": {
+				"reveal": "always",
+				"showReuseMessage": false,
+				"clear": true
+			},
+			"options": {
+				"cwd": "Tools/UITest"
+			},
+			"problemMatcher": "$msCompile"
 		}
 	]
 }

Tools/UITest/build.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-# VC2013 has problems with using lambdas in BIND_LAMBDA, so use VS2015
-vc_ver=2015
+vc_ver=latest
 project="uitest"
 root="../.."
 render=0
-source $root/build.sh
+source $root/build.sh $*