aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordkanada <dkanada@users.noreply.github.com>2020-06-23 21:17:35 +0900
committerGitHub <noreply@github.com>2020-06-23 21:17:35 +0900
commitec017be16b91fbca4f76f17fc53686dce75c7f3b (patch)
tree82f2bb01c3b128c8c3b90d81ed2bcf923987bd7f
parent4e088760284947c92147bcc794e942da520de0c2 (diff)
parent712d581e01335aff0c516c6bf0119ee5359b6648 (diff)
Merge pull request #3407 from telans/vscode
.gitignore: ignore jellyfin-web symlink & .vscode: dotnet telemetry optout
-rw-r--r--.gitignore3
-rw-r--r--.vscode/launch.json12
-rw-r--r--.vscode/tasks.json7
3 files changed, 13 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 46f036ad9..0df7606ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@ ProgramData*/
CorePlugins*/
ProgramData-Server*/
ProgramData-UI*/
-MediaBrowser.WebDashboard/jellyfin-web/**
#################
## Visual Studio
@@ -276,4 +275,4 @@ BenchmarkDotNet.Artifacts
# Ignore web artifacts from native builds
web/
web-src.*
-MediaBrowser.WebDashboard/jellyfin-web/
+MediaBrowser.WebDashboard/jellyfin-web
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 73f347c9f..0f698bfa4 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,9 +1,6 @@
{
- // Use IntelliSense to find out which attributes exist for C# debugging
- // Use hover for the description of the existing attributes
- // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
- "version": "0.2.0",
- "configurations": [
+ "version": "0.2.0",
+ "configurations": [
{
"name": ".NET Core Launch (console)",
"type": "coreclr",
@@ -24,5 +21,8 @@
"request": "attach",
"processId": "${command:pickProcess}"
}
- ,]
+ ],
+ "env": {
+ "DOTNET_CLI_TELEMETRY_OPTOUT": "1"
+ }
}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 2289fd991..7ddc49d5c 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -21,5 +21,10 @@
],
"problemMatcher": "$msCompile"
}
- ]
+ ],
+ "options": {
+ "env": {
+ "DOTNET_CLI_TELEMETRY_OPTOUT": "1"
+ }
+ }
}