Merge branch 'master' into warn12

sjww233 · Jan 10, 2020 · bb236b9 · bb236b9
2 parents 7f5a174 + 162c1ac
commit bb236b9
Show file tree

Hide file tree

Showing 156 changed files with 2,309 additions and 7,587 deletions.
diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/netcoreapp3.0/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/netcoreapp3.1/jellyfin.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Jellyfin.Server",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window

diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj
diff --git a/BDInfo/BDInfoSettings.cs b/BDInfo/BDInfoSettings.cs