Merge pull request #597 from the1812/bugfix

Update to v1.10.26

.gitignore

@@ -1,4 +1,3 @@
-.vscode/
 builder/dotnet/Properties
 .node_modules/
 .ts-output/

.vscode/html-in-js.code-snippets

@@ -0,0 +1,24 @@
+{
+	// Place your Bilibili Evo workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
+	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
+	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
+	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
+	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
+	// Placeholders with the same ids are connected.
+	// Example:
+	// "Print to console": {
+	// 	"scope": "javascript,typescript",
+	// 	"prefix": "log",
+	// 	"body": [
+	// 		"console.log('$1');",
+	// 		"$2"
+	// 	],
+	// 	"description": "Log output to console"
+	// }
+	"Insert HTML": {
+		"scope": "javascript, typescript",
+		"prefix": "html",
+		"body": "/*html*/`$0`",
+		"description": "Insert HTML snippet"
+	}
+}

.vscode/launch.json

@@ -0,0 +1,31 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "重新编译 rebuild",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "${workspaceFolder}/builder/dotnet/bin/Debug/netcoreapp3.1/build.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}",
+      "stopAtEntry": false,
+      "console": "internalConsole",
+      "preLaunchTask": "构建编译器 (Debug模式) compile builder"
+    },
+    {
+      "name": "监视 watch",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "${workspaceFolder}/builder/dotnet/bin/Debug/netcoreapp3.1/build.dll",
+      "args": ["watch"],
+      "cwd": "${workspaceFolder}",
+      "stopAtEntry": false,
+      "internalConsoleOptions": "neverOpen",
+      "console": "integratedTerminal",
+      "preLaunchTask": "构建编译器 (Debug模式) compile builder"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,67 @@
+{
+    "todohighlight.exclude": [
+        "**/node_modules/**",
+        "**/bower_components/**",
+        "**/dist/**",
+        "**/build/**",
+        "**/.vscode/**",
+        "**/.github/**",
+        "**/_output/**",
+        "**/*.min.*",
+        "**/*.map",
+        "**/.next/**",
+        "**/.vs/**",
+        "**/build-scripts/**"
+    ],
+    "cSpell.words": [
+        "Bangumi",
+        "Biliplus",
+        "Bing",
+        "Danmaku",
+        "Doujin",
+        "HEVC",
+        "Liveroom",
+        "Otaku",
+        "Swiper",
+        "Violentmonkey",
+        "Vuex",
+        "afterbegin",
+        "afterend",
+        "bili",
+        "bilibili",
+        "bofqi",
+        "bvid",
+        "clipboardy",
+        "cntr",
+        "compositionend",
+        "compositionstart",
+        "csrf",
+        "ctnr",
+        "danmakus",
+        "debounced",
+        "downloaders",
+        "dpis",
+        "durl",
+        "githubusercontent",
+        "haruna",
+        "hdslb",
+        "iconfont",
+        "jinkela",
+        "jsdelivr",
+        "kanban",
+        "kichiku",
+        "materialdesignicons",
+        "overscroll",
+        "pako",
+        "reloadable",
+        "reloadables",
+        "repo",
+        "repost",
+        "reposts",
+        "superchat",
+        "tabindex",
+        "truetype",
+        "xmlhttp"
+    ],
+    "javascript.validate.enable": true
+}

.vscode/tasks.json

@@ -0,0 +1,91 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "重新编译 rebuild",
+      "type": "shell",
+      "command": "dotnet builder/dotnet/publish/build.dll",
+      "options": {
+        "cwd": "./"
+      },
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "presentation": {
+        "echo": false,
+        "reveal": "always",
+        "focus": true,
+        "panel": "shared",
+        "showReuseMessage": false
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "监视 watch",
+      "type": "shell",
+      "command": "dotnet builder/dotnet/publish/build.dll watch",
+      "options": {
+        "cwd": "./"
+      },
+      "group": "build",
+      "presentation": {
+        "echo": false,
+        "reveal": "always",
+        "focus": true,
+        "panel": "shared",
+        "showReuseMessage": false
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "构建编译器 compile builder",
+      "type": "shell",
+      "command": "dotnet publish -c Release -o publish/",
+      "options": {
+        "cwd": "./builder/dotnet/"
+      },
+      "group": "build",
+      "presentation": {
+        "echo": false,
+        "reveal": "always",
+        "focus": true,
+        "panel": "shared",
+        "showReuseMessage": false
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "构建编译器 (Debug模式) compile builder",
+      "type": "shell",
+      "command": "dotnet build",
+      "options": {
+        "cwd": "./builder/dotnet/"
+      },
+      "group": "build",
+      "presentation": {
+        "echo": false,
+        "reveal": "always",
+        "focus": true,
+        "panel": "shared",
+        "showReuseMessage": false
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "同步i18n数据 sync i18n",
+      "type": "shell",
+      "command": "node ./builder/node/i18n-sync/i18n-sync.js",
+      "presentation": {
+        "echo": false,
+        "reveal": "silent",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": false
+      },
+      "problemMatcher": []
+    }
+  ]
+}

builder/dotnet/dotnet.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Authors>Grant Howard</Authors>
     <Product>Bilibili-Evolved Project Builder</Product>
     <StartupObject>BilibiliEvolved.Build.Program</StartupObject>

builder/dotnet/publish/build.deps.json

@@ -1,11 +1,11 @@
 {
   "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v3.0",
+    "name": ".NETCoreApp,Version=v3.1",
     "signature": ""
   },
   "compilationOptions": {},
   "targets": {
-    ".NETCoreApp,Version=v3.0": {
+    ".NETCoreApp,Version=v3.1": {
       "build/1.0.0": {
         "dependencies": {
           "Microsoft.Extensions.Configuration": "2.1.1",

builder/dotnet/publish/build.runtimeconfig.json

@@ -1,9 +1,9 @@
 {
   "runtimeOptions": {
-    "tfm": "netcoreapp3.0",
+    "tfm": "netcoreapp3.1",
     "framework": {
       "name": "Microsoft.NETCore.App",
-      "version": "3.0.0"
+      "version": "3.1.0"
     }
   }
 }

extras/video-link-downloader/.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "program": "${workspaceFolder}\\video-link-downloader.js",
+            "outFiles": [
+                "${workspaceFolder}/**/*.js"
+            ]
+        }
+    ]
+}

extras/video-link-downloader/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "clipboardy"
+    ]
+}