diff --git a/README.md b/README.md index 1e4e491..6f12096 100644 --- a/README.md +++ b/README.md @@ -1098,7 +1098,8 @@ netcoredbg` "request": "launch", "program": "${workspaceRoot}/bin/Debug/netcoreapp2.2/csharp.dll", "args": [], - "stopAtEntry": true + "stopAtEntry": true, + "cwd": "${workspaceRoot}" } } } diff --git a/python3/vimspector/debug_adapter_connection.py b/python3/vimspector/debug_adapter_connection.py index 63e0c89..283c40c 100644 --- a/python3/vimspector/debug_adapter_connection.py +++ b/python3/vimspector/debug_adapter_connection.py @@ -169,6 +169,10 @@ class DebugAdapterConnection( object ): self._headers = {} def _SendMessage( self, msg ): + if not self._Write: + # Connection was destroyed + return False + msg = json.dumps( msg ) self._logger.debug( 'Sending Message: {0}'.format( msg ) ) diff --git a/python3/vimspector/gadgets.py b/python3/vimspector/gadgets.py index cc80e4c..5dccf94 100644 --- a/python3/vimspector/gadgets.py +++ b/python3/vimspector/gadgets.py @@ -228,23 +228,23 @@ GADGETS = { 'language': 'csharp', 'enabled': False, 'download': { - 'url': 'https://github.com/Samsung/netcoredbg/releases/download/latest/' - '${file_name}', + 'url': ( 'https://github.com/Samsung/netcoredbg/releases/download/' + '${version}/${file_name}' ), 'format': 'tar', }, 'all': { - 'version': 'master' + 'version': '1.2.0-635' }, 'macos': { - 'file_name': 'netcoredbg-osx-master.tar.gz', + 'file_name': 'netcoredbg-osx.tar.gz', 'checksum': '', }, 'linux': { - 'file_name': 'netcoredbg-linux-master.tar.gz', + 'file_name': 'netcoredbg-linux-bionic.tar.gz', 'checksum': '', }, 'windows': { - 'file_name': 'netcoredbg-win64-master.zip', + 'file_name': 'netcoredbg-win64.zip', 'checksum': '', }, 'do': lambda name, root, gadget: installer.MakeSymlink( @@ -261,6 +261,9 @@ GADGETS = { "pidProperty": "processId", "pidSelect": "ask" }, + "configuration": { + "cwd": "${workspaceRoot}" + } }, } }, diff --git a/support/test/csharp/obj/csharp.csproj.nuget.g.props b/support/test/csharp/obj/csharp.csproj.nuget.g.props index 4751d88..c71f0e6 100644 --- a/support/test/csharp/obj/csharp.csproj.nuget.g.props +++ b/support/test/csharp/obj/csharp.csproj.nuget.g.props @@ -3,12 +3,15 @@ True NuGet - /Users/ben/.vim/bundle/vimspector/support/test/csharp/obj/project.assets.json + $(MSBuildThisFileDirectory)project.assets.json /Users/ben/.nuget/packages/ /Users/ben/.nuget/packages/;/usr/local/share/dotnet/sdk/NuGetFallbackFolder PackageReference - 4.9.4 + 5.7.0 + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/support/test/csharp/obj/project.assets.json b/support/test/csharp/obj/project.assets.json index e6c9b94..bd6c0fc 100644 --- a/support/test/csharp/obj/project.assets.json +++ b/support/test/csharp/obj/project.assets.json @@ -732,10 +732,16 @@ } }, "imports": [ - "net461" + "net461", + "net462", + "net47", + "net471", + "net472", + "net48" ], "assetTargetFallback": true, - "warn": true + "warn": true, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/3.1.402/RuntimeIdentifierGraph.json" } } }