Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dustinmoris committed Feb 8, 2018
2 parents 57d2b6f + 85b94ea commit 99a258b
Show file tree
Hide file tree
Showing 49 changed files with 5,547 additions and 4,781 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -2,7 +2,7 @@ language: csharp
sudo: required
dist: trusty

dotnet: 2.0.3
dotnet: 2.1.4
mono:
- 4.6.1
- 4.8.1
Expand Down
44 changes: 5 additions & 39 deletions .vscode/launch.json
@@ -1,49 +1,15 @@
{
// 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": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceRoot}/samples/SampleApp/SampleApp/bin/Debug/netcoreapp2.0/SampleApp.dll",
"args": [],
"cwd": "${workspaceRoot}/samples/SampleApp/SampleApp/bin/Debug/netcoreapp2.0",
"stopAtEntry": false,
"console": "internalConsole"
},
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceRoot}/samples/SampleApp/SampleApp/bin/Debug/netcoreapp2.0/SampleApp.dll",
"args": [],
"cwd": "${workspaceRoot}/samples/SampleApp/SampleApp/bin/Debug/netcoreapp2.0",
"stopAtEntry": false,
"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"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
"processId": "${command:pickProcess}",
"justMyCode": false
}
]
}
16 changes: 0 additions & 16 deletions .vscode/tasks.json

This file was deleted.

0 comments on commit 99a258b

Please sign in to comment.