Fixes for samples

microsoft · Mar 21, 2019 · 19798d1 · 19798d1
1 parent 1da6745
commit 19798d1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 36 deletions.
diff --git a/definitions/dotnetcore-2.2-fsharp/.vscode/launch.json b/definitions/dotnetcore-2.2-fsharp/.vscode/launch.json
@@ -12,41 +12,10 @@
       "program": "${workspaceFolder}/test-project/bin/Debug/netcoreapp2.2/app.dll",
       "args": [],
       "cwd": "${workspaceFolder}/test-project",
-      "console": "internalConsole",
+      "console": "integratedTerminal",
       "stopAtEntry": false,
       "internalConsoleOptions": "openOnSessionStart"
     },
-    {
-      "name": ".NET Core Launch (web)",
-      "type": "coreclr",
-      "request": "launch",
-      "preLaunchTask": "build",
-      "program": "${workspaceFolder}/test-project/bin/Debug/netcoreapp2.2/app.dll",
-      "args": [],
-      "cwd": "${workspaceFolder}/test-project",
-      "stopAtEntry": false,
-      "internalConsoleOptions": "openOnSessionStart",
-      "launchBrowser": {
-        "enabled": true,
-        "args": "${auto-detect-url}",
-        "windows": {
-          "command": "cmd.exe",
-          "args": "/C start ${auto-detect-url}"
-        },
-        "osx": {
-          "command": "open"
-        },
-        "linux": {
-          "command": "xdg-open"
-        }
-      },
-      "env": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "sourceFileMap": {
-        "/Views": "${workspaceFolder}/test-project/Views"
-      }
-    },
     {
       "name": ".NET Core Attach",
       "type": "coreclr",

diff --git a/definitions/dotnetcore-2.2-fsharp/.vscode/settings.json b/definitions/dotnetcore-2.2-fsharp/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-  "FSharp.fsacRuntime": "netcore"
+  "FSharp.fsacRuntime":"netcore",
+  "razor.disabled": true
 }
diff --git a/definitions/dotnetcore-2.2-fsharp/.vscode/tasks.json b/definitions/dotnetcore-2.2-fsharp/.vscode/tasks.json
@@ -5,7 +5,7 @@
   "tasks": [
     {
       "label": "build",
-      "command": "dotnet build",
+      "command": "cd test-project && dotnet build",
       "type": "shell",
       "group": "build",
       "presentation": {

diff --git a/definitions/dotnetcore-2.2-fsharp/dev-container.dockerfile b/definitions/dotnetcore-2.2-fsharp/dev-container.dockerfile
@@ -1,11 +1,13 @@
 FROM microsoft/dotnet:2.2-sdk
 
+# Alias xterm to bash if external console is triggered
+RUN echo "alias xterm=bash" >> /root/.bashrc
+
 # Install git
 RUN apt-get update && apt-get -y install git
 
-
 # Install fsharp
-RUN apt-get update && apt-get -y fsharp
+RUN apt-get install -y fsharp
 
 # Clean up
 RUN apt-get autoremove -y \

diff --git a/definitions/dotnetcore-2.2/.vscode/devContainer.json b/definitions/dotnetcore-2.2/.vscode/devContainer.json
@@ -1,6 +1,7 @@
 {
 	"name": ".NET Core",
 	"dockerFile": "dev-container.dockerfile",
+	"appPort": 8090,
 	"extensions": [
 		"ms-vscode.csharp"
 	]