Merge pull request #291 from puremourning/netcoredbg-update

Update netcoredbg

README.md

@@ -1098,7 +1098,8 @@ netcoredbg`
         "request": "launch",
         "program": "${workspaceRoot}/bin/Debug/netcoreapp2.2/csharp.dll",
         "args": [],
-        "stopAtEntry": true
+        "stopAtEntry": true,
+        "cwd": "${workspaceRoot}"
       }
     }
   }

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 ) )
 

python3/vimspector/gadgets.py

@@ -228,23 +228,23 @@ GADGETS = {
     'language': 'csharp',
     'enabled': False,
     'download': {
-      'url': 'https://github.com/Samsung/netcoredbg/releases/download/latest/'
+      'url': ( 'https://github.com/Samsung/netcoredbg/releases/download/'
-             '${file_name}',
+               '${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}"
+        }
       },
     }
   },

support/test/csharp/obj/csharp.csproj.nuget.g.props

@@ -3,12 +3,15 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/Users/ben/.vim/bundle/vimspector/support/test/csharp/obj/project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/ben/.nuget/packages/</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/ben/.nuget/packages/;/usr/local/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.9.4</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.7.0</NuGetToolVersion>
   </PropertyGroup>
+  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <SourceRoot Include="$([MSBuild]::EnsureTrailingSlash($(NuGetPackageFolders)))" />
+  </ItemGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>

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"
       }
     }
   }