Skip to content

Commit d6402bd

Browse files
rajkumar42rajkumar42
authored
Rajkumar42/vsdbgtest (#1280)
* Changing to vsdbg-ui * Updating to newer version of vsdbg.
1 parent c32f17b commit d6402bd

File tree

3 files changed

+51
-51
lines changed

3 files changed

+51
-51
lines changed

‎package.json‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -150,159 +150,159 @@
150150
},
151151
{
152152
"description": ".NET Core Debugger (Windows / x64)",
153-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-win7-x64.zip",
154-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-win7-x64.zip",
153+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-win7-x64.zip",
154+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-win7-x64.zip",
155155
"installPath": ".debugger",
156156
"runtimeIds": [
157157
"win7-x64"
158158
]
159159
},
160160
{
161161
"description": ".NET Core Debugger (macOS / x64)",
162-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-osx.10.11-x64.zip",
163-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-osx.10.11-x64.zip",
162+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-osx.10.11-x64.zip",
163+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-osx.10.11-x64.zip",
164164
"installPath": ".debugger",
165165
"runtimeIds": [
166166
"osx.10.11-x64"
167167
],
168168
"binaries": [
169-
"./OpenDebugAD7",
170-
"./clrdbg"
169+
"./vsdbg-ui",
170+
"./vsdbg"
171171
]
172172
},
173173
{
174174
"description": ".NET Core Debugger (CentOS / x64)",
175-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-centos.7-x64.zip",
176-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-centos.7-x64.zip",
175+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-centos.7-x64.zip",
176+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-centos.7-x64.zip",
177177
"installPath": ".debugger",
178178
"runtimeIds": [
179179
"centos.7-x64"
180180
],
181181
"binaries": [
182-
"./OpenDebugAD7",
183-
"./clrdbg"
182+
"./vsdbg-ui",
183+
"./vsdbg"
184184
]
185185
},
186186
{
187187
"description": ".NET Core Debugger (Debian / x64)",
188-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-debian.8-x64.zip",
189-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-debian.8-x64.zip",
188+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-debian.8-x64.zip",
189+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-debian.8-x64.zip",
190190
"installPath": ".debugger",
191191
"runtimeIds": [
192192
"debian.8-x64"
193193
],
194194
"binaries": [
195-
"./OpenDebugAD7",
196-
"./clrdbg"
195+
"./vsdbg-ui",
196+
"./vsdbg"
197197
]
198198
},
199199
{
200200
"description": ".NET Core Debugger (Fedora 23 / x64)",
201-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-fedora.23-x64.zip",
202-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-fedora.23-x64.zip",
201+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-fedora.23-x64.zip",
202+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-fedora.23-x64.zip",
203203
"installPath": ".debugger",
204204
"runtimeIds": [
205205
"fedora.23-x64"
206206
],
207207
"binaries": [
208-
"./OpenDebugAD7",
209-
"./clrdbg"
208+
"./vsdbg-ui",
209+
"./vsdbg"
210210
]
211211
},
212212
{
213213
"description": ".NET Core Debugger (Fedora 24 / x64)",
214-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-fedora.24-x64.zip",
215-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-fedora.24-x64.zip",
214+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-fedora.24-x64.zip",
215+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-fedora.24-x64.zip",
216216
"installPath": ".debugger",
217217
"runtimeIds": [
218218
"fedora.24-x64"
219219
],
220220
"binaries": [
221-
"./OpenDebugAD7",
222-
"./clrdbg"
221+
"./vsdbg-ui",
222+
"./vsdbg"
223223
]
224224
},
225225
{
226226
"description": ".NET Core Debugger (OpenSUSE 13 / x64)",
227-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-opensuse.13.2-x64.zip",
228-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-opensuse.13.2-x64.zip",
227+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-opensuse.13.2-x64.zip",
228+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-opensuse.13.2-x64.zip",
229229
"installPath": ".debugger",
230230
"runtimeIds": [
231231
"opensuse.13.2-x64"
232232
],
233233
"binaries": [
234-
"./OpenDebugAD7",
235-
"./clrdbg"
234+
"./vsdbg-ui",
235+
"./vsdbg"
236236
]
237237
},
238238
{
239239
"description": ".NET Core Debugger (OpenSUSE 42 / x64)",
240-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-opensuse.42.1-x64.zip",
241-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-opensuse.42.1-x64.zip",
240+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-opensuse.42.1-x64.zip",
241+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-opensuse.42.1-x64.zip",
242242
"installPath": ".debugger",
243243
"runtimeIds": [
244244
"opensuse.42.1-x64"
245245
],
246246
"binaries": [
247-
"./OpenDebugAD7",
248-
"./clrdbg"
247+
"./vsdbg-ui",
248+
"./vsdbg"
249249
]
250250
},
251251
{
252252
"description": ".NET Core Debugger (RHEL / x64)",
253-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-rhel.7.2-x64.zip",
254-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-rhel.7.2-x64.zip",
253+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-rhel.7.2-x64.zip",
254+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-rhel.7.2-x64.zip",
255255
"installPath": ".debugger",
256256
"runtimeIds": [
257257
"rhel.7-x64"
258258
],
259259
"binaries": [
260-
"./OpenDebugAD7",
261-
"./clrdbg"
260+
"./vsdbg-ui",
261+
"./vsdbg"
262262
]
263263
},
264264
{
265265
"description": ".NET Core Debugger (Ubuntu 14.04 / x64)",
266-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-ubuntu.14.04-x64.zip",
267-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-ubuntu.14.04-x64.zip",
266+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-ubuntu.14.04-x64.zip",
267+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-ubuntu.14.04-x64.zip",
268268
"installPath": ".debugger",
269269
"runtimeIds": [
270270
"ubuntu.14.04-x64"
271271
],
272272
"binaries": [
273-
"./OpenDebugAD7",
274-
"./clrdbg"
273+
"./vsdbg-ui",
274+
"./vsdbg"
275275
]
276276
},
277277
{
278278
"description": ".NET Core Debugger (Ubuntu 16.04 / x64)",
279-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-ubuntu.16.04-x64.zip",
280-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-ubuntu.16.04-x64.zip",
279+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-ubuntu.16.04-x64.zip",
280+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-ubuntu.16.04-x64.zip",
281281
"installPath": ".debugger",
282282
"runtimeIds": [
283283
"ubuntu.16.04-x64"
284284
],
285285
"binaries": [
286-
"./OpenDebugAD7",
287-
"./clrdbg"
286+
"./vsdbg-ui",
287+
"./vsdbg"
288288
]
289289
},
290290
{
291291
"description": ".NET Core Debugger (Ubuntu 16.10 / x64)",
292-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-1/coreclr-debug-ubuntu.16.10-x64.zip",
293-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-1/coreclr-debug-ubuntu.16.10-x64.zip",
292+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-8-2/coreclr-debug-ubuntu.16.10-x64.zip",
293+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-8-2/coreclr-debug-ubuntu.16.10-x64.zip",
294294
"installPath": ".debugger",
295295
"runtimeIds": [
296296
"ubuntu.16.10-x64"
297297
],
298298
"binaries": [
299-
"./OpenDebugAD7",
300-
"./clrdbg"
299+
"./vsdbg-ui",
300+
"./vsdbg"
301301
]
302302
}
303303
],
304304
"engines": {
305-
"vscode": "^1.9.0"
305+
"vscode": "^1.10.1"
306306
},
307307
"activationEvents": [
308308
"onLanguage:csharp",

‎src/coreclr-debug/install.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export class DebugInstaller {
7373
delete manifestObject.contributes.debuggers[0].runtime;
7474
delete manifestObject.contributes.debuggers[0].program;
7575

76-
let programString = './.debugger/OpenDebugAD7';
76+
let programString = './.debugger/vsdbg-ui';
7777
manifestObject.contributes.debuggers[0].windows = { program: programString + '.exe' };
7878
manifestObject.contributes.debuggers[0].osx = { program: programString };
7979
manifestObject.contributes.debuggers[0].linux = { program: programString };

‎src/coreclr-debug/proxy.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function sendDownloadingNotStartedMessage() {
5050
// When installation of the debugger components finishes, the extension manifest is rewritten so that this proxy is no longer called
5151
// If the debugger components have not finished downloading, the proxy displays an error message to the user
5252
// If the debugger components have finished downloading, the manifest has been rewritten but has not been reloaded.
53-
// This proxy will still be called and launch OpenDebugAD7 as a child process.
53+
// This proxy will still be called and launch vsdbg-ui as a child process.
5454
// During subsequent code sessions, the rewritten manifest will be loaded and this proxy will no longer be called.
5555
function proxy() {
5656
let extensionPath = path.resolve(__dirname, '../../../');
@@ -107,11 +107,11 @@ function proxy() {
107107
// debugger has finished install and manifest has been rewritten, kick off our debugger process
108108

109109
new Promise<void>((resolve, reject) => {
110-
let processPath = path.join(util.debugAdapterDir(), "OpenDebugAD7" + CoreClrDebugUtil.getPlatformExeExtension());
110+
let processPath = path.join(util.debugAdapterDir(), "vsdbg-ui" + CoreClrDebugUtil.getPlatformExeExtension());
111111
let args = process.argv.slice(2);
112112

113113
// do not explicitly set a current working dir
114-
// this seems to match what code does when OpenDebugAD7 is launched directly from the manifest
114+
// this seems to match what code does when vsdbg-ui is launched directly from the manifest
115115
const child = child_process.spawn(processPath, args);
116116

117117
// If we don't exit cleanly from the child process, log the error.

0 commit comments

Comments
 (0)