From ca0ad479a08eb7c67a5273359e7e8405fe3a29ec Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Mon, 3 Jun 2019 19:55:45 -0700
Subject: [PATCH] Move settings into new devcontainer.json property

---
 .devcontainer/Dockerfile           | 3 ---
 .devcontainer/devcontainer.json    | 5 ++++-
 .devcontainer/settings.vscode.json | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 .devcontainer/settings.vscode.json

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 63bdd8c..5959e0e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,9 +5,6 @@
 
 FROM rust:1
 
-# Copy endpoint specific user setting overrides into container
-COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
-
 RUN rustup update 2>&1
 RUN rustup component add rls rust-analysis rust-src 2>&1
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d81b282..ec6b42e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -10,5 +10,8 @@
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",
 		"seccomp=unconfined"
-	]
+	],
+	"settings": {
+		"lldb.executable": "/usr/bin/lldb-3.9"
+	}
 }
\ No newline at end of file
diff --git a/.devcontainer/settings.vscode.json b/.devcontainer/settings.vscode.json
deleted file mode 100644
index 746a7be..0000000
--- a/.devcontainer/settings.vscode.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "lldb.executable": "/usr/bin/lldb-3.9"
-}
\ No newline at end of file