From e50ea7f938538889f5c402a93eaad73ffebacce4 Mon Sep 17 00:00:00 2001 From: Austen Ott Date: Tue, 20 Jul 2021 15:05:39 -0700 Subject: [PATCH 1/5] Update to version 1.23.14 of vsdbg/vsdbg-ui. Also, add win-arm64 package. --- package.json | 53 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index d398f66b81..7acae0145b 100644 --- a/package.json +++ b/package.json @@ -217,8 +217,8 @@ { "id": "Debugger", "description": ".NET Core Debugger (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/15786370-6d35-4cac-8d70-618dfc5aa9ad/d133bd53b5360d1041f8a6ab28b82d4e/coreclr-debug-win7-x64.zip", - "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-12/coreclr-debug-win7-x64.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/b490d6a6de4ec50e2bd22f690489ef6c/coreclr-debug-win7-x64.zip", + "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-win7-x64.zip", "installPath": ".debugger", "platforms": [ "win32" @@ -227,13 +227,28 @@ "x86_64" ], "installTestPath": "./.debugger/vsdbg-ui.exe", - "integrity": "D6B804513BA83E10B1428CEEDD6E2AC4749DC2AAFFD5BE56AEB6FD430C916618" + "integrity": "9EA16813520F5E74535739DAD1E9E72465D7F496A6C8465AEA3EF57C86CF320C" + }, + { + "id": "Debugger", + "description": ".NET Core Debugger (Windows / ARM64)", + "url": "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/82a75a9c89a2e5087908651b602d7d01/coreclr-debug-win10-arm64.zip", + "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-win10-arm64.zip", + "installPath": ".debugger", + "platforms": [ + "win32" + ], + "architectures": [ + "arm4" + ], + "installTestPath": "./.debugger/vsdbg-ui.exe", + "integrity": "FD9A1B46DA9C7226828595826F6CE215DF769C5111D02DB567494A1EB095E155" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/15786370-6d35-4cac-8d70-618dfc5aa9ad/829575bd3a1e1837b3be4c2d1e02fc85/coreclr-debug-osx-x64.zip", - "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-12/coreclr-debug-osx-x64.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/c1122f7141735472d9583c1124024c55/coreclr-debug-osx-x64.zip", + "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-x64.zip", "installPath": ".debugger/x86_64", "platforms": [ "darwin" @@ -247,13 +262,13 @@ "./vsdbg" ], "installTestPath": "./.debugger/x86_64/vsdbg-ui", - "integrity": "2C7CD642F8F3B405D0AB95FABD3CCAD51A6DD2B919B9BE221C0F18FC724604AE" + "integrity": "554436E48F02C994BD05AD365EFFF9E242710C49CD2BDE695DBABD222098E323" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / arm64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/15786370-6d35-4cac-8d70-618dfc5aa9ad/55697478c628061578739b1b2ae62dc4/coreclr-debug-osx-arm64.zip", - "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-12/coreclr-debug-osx-arm64.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/96a88189c7904a517f3bb59b2dba8bd1/coreclr-debug-osx-arm64.zip", + "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-arm64.zip", "installPath": ".debugger/arm64", "platforms": [ "darwin" @@ -266,13 +281,13 @@ "./vsdbg" ], "installTestPath": "./.debugger/arm64/vsdbg-ui", - "integrity": "1B2954EB75B647D5168AD816A942F61D46EB8DCEF384A8C2514DB9898B1F0022" + "integrity": "40395770CDBA25FD67D2A5B8630F16146B293EAE8A07205DF1646D1805F87384" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM)", - "url": "https://download.visualstudio.microsoft.com/download/pr/15786370-6d35-4cac-8d70-618dfc5aa9ad/9ff9dada26542d0d6f3799cbc969339c/coreclr-debug-linux-arm.zip", - "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-12/coreclr-debug-linux-arm.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/f346e34bb51c0595cf7f4727cac76907/coreclr-debug-linux-arm.zip", + "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-arm.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -285,13 +300,13 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "2D45ABEB478F8234854AB2A0E801B9EA0143B47F208F97AFC95F6020BC4E7BB7" + "integrity": "4283432742665B400B1807A76770475B2CA43895C7E7870D85E34C3ADF4D1B3F" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/15786370-6d35-4cac-8d70-618dfc5aa9ad/e64e76d0bfb1e50da16678db728c8bad/coreclr-debug-linux-arm64.zip", - "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-12/coreclr-debug-linux-arm64.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/7a723bfbda6d196c52084226b6835b36/coreclr-debug-linux-arm64.zip", + "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-arm64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -304,13 +319,13 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "0F1BED966A9FBF308A431995A1CC7EC49D690C8E3986F88F47FF3DA198B4F997" + "integrity": "7C266186F481159BFC40406BF4CE479FC4144179C69128B01CD3E1E3062E8AB4" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/15786370-6d35-4cac-8d70-618dfc5aa9ad/92eeb7715c63c006df2318abeefc15b4/coreclr-debug-linux-x64.zip", - "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-12/coreclr-debug-linux-x64.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/dd019b4c839f458596e26bfcfe6a3e7f/coreclr-debug-linux-x64.zip", + "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-x64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -323,7 +338,7 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "A1AF7EB043B14DB777108D6B9D91F8CA2DC5551E3BC8340C96477B5BDC974C4B" + "integrity": "F389283020F345DA4BAC1067E9D8E5B28BD4306338C651075D07285D0600BE30" }, { "id": "Razor", @@ -3729,4 +3744,4 @@ ] } } -} +} \ No newline at end of file From 84f81156c3477cc302dfba248a24aa145b20b559 Mon Sep 17 00:00:00 2001 From: Austen Ott Date: Tue, 20 Jul 2021 15:44:15 -0700 Subject: [PATCH 2/5] PR feedback Update changelog Fix activation logic to handle windows arm64 (and cleanup older logic). --- CHANGELOG.md | 2 ++ src/coreclr-debug/activate.ts | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17bf04e0b1..e7ccea0eb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ * Update OmniSharp version to 1.37.13 * Update Roslyn to 4.0.0-2.21354.7 (PR: [omnisharp-roslyn#2189](https://github.com/OmniSharp/omnisharp-roslyn/pull/2189)) * Update included Build Tools to match .NET SDK 6 Preview 6 (PR: [omnisharp-roslyn#2187](https://github.com/OmniSharp/omnisharp-roslyn/pull/2187)) +* Debugger changes: + * Added support for win10-arm64 debugging (PR: [#4672](https://github.com/OmniSharp/omnisharp-vscode/pull/4672)) ## 1.23.13 (July 13th, 2021) * Fixes Razor editing support (PR: [#4642](https://github.com/OmniSharp/omnisharp-vscode/pull/4642)) diff --git a/src/coreclr-debug/activate.ts b/src/coreclr-debug/activate.ts index e515ac2858..b9d4dfbc41 100644 --- a/src/coreclr-debug/activate.ts +++ b/src/coreclr-debug/activate.ts @@ -21,8 +21,8 @@ export async function activate(thisExtension: vscode.Extension { +async function checkIsValidArchitecture(platformInformation: PlatformInformation, eventStream: EventStream): Promise { if (platformInformation) { if (platformInformation.isMacOS()) { if (platformInformation.architecture === "arm64") { eventStream.post(new DebuggerPrerequisiteWarning(`[WARNING]: arm64 macOS is not officially supported by the .NET Core debugger. You may experience unexpected issues when running in this configuration.`)); - return false; + return true; } // Validate we are on compatiable macOS version if we are x86_64 if ((platformInformation.architecture !== "x86_64") || (platformInformation.architecture === "x86_64" && !CoreClrDebugUtil.isMacOSSupported())) { eventStream.post(new DebuggerPrerequisiteFailure("[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.")); - return true; + return false; } + + return true; } - else if (platformInformation.architecture !== "x86_64") { - if (platformInformation.isWindows() && platformInformation.architecture === "x86") { + else if (platformInformation.isWindows()) { + if (platformInformation.architecture === "x86") { eventStream.post(new DebuggerPrerequisiteWarning(`[WARNING]: x86 Windows is not currently supported by the .NET Core debugger. Debugging will not be available.`)); - } else { - eventStream.post(new DebuggerPrerequisiteWarning(`[WARNING]: Processor architecture '${platformInformation.architecture}' is not currently supported by the .NET Core debugger. Debugging will not be available.`)); + return false; } + + return true; + } + else { return true; } } From 5b938cce9ef8b7cc2408a78aa6b76a660f1b5ed5 Mon Sep 17 00:00:00 2001 From: Austen Ott Date: Tue, 20 Jul 2021 16:15:01 -0700 Subject: [PATCH 3/5] Fix missing method update --- src/coreclr-debug/activate.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr-debug/activate.ts b/src/coreclr-debug/activate.ts index b9d4dfbc41..597818b109 100644 --- a/src/coreclr-debug/activate.ts +++ b/src/coreclr-debug/activate.ts @@ -74,9 +74,9 @@ async function completeDebuggerInstall(platformInformation: PlatformInformation, return _debugUtil.checkDotNetCli() .then(async (dotnetInfo: DotnetInfo) => { - let isInvalidArchitecture: boolean = await checkForInvalidArchitecture(platformInformation, eventStream); + let isValidArchitecture: boolean = await checkIsValidArchitecture(platformInformation, eventStream); - if (isInvalidArchitecture) { + if (!isValidArchitecture) { eventStream.post(new DebuggerNotInstalledFailure()); vscode.window.showErrorMessage('Failed to complete the installation of the C# extension. Please see the error in the output window below.'); return false; From 8eef5fb58ff17b884c3605be08ad1dd4d15d24f4 Mon Sep 17 00:00:00 2001 From: Austen Ott Date: Tue, 20 Jul 2021 16:48:45 -0700 Subject: [PATCH 4/5] Add reference to the correct issue in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7ccea0eb9..058f372dbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ * Update Roslyn to 4.0.0-2.21354.7 (PR: [omnisharp-roslyn#2189](https://github.com/OmniSharp/omnisharp-roslyn/pull/2189)) * Update included Build Tools to match .NET SDK 6 Preview 6 (PR: [omnisharp-roslyn#2187](https://github.com/OmniSharp/omnisharp-roslyn/pull/2187)) * Debugger changes: - * Added support for win10-arm64 debugging (PR: [#4672](https://github.com/OmniSharp/omnisharp-vscode/pull/4672)) + * Added support for win10-arm64 debugging ([#3006](https://github.com/OmniSharp/omnisharp-vscode/issues/3006), PR: [#4672](https://github.com/OmniSharp/omnisharp-vscode/pull/4672)) ## 1.23.13 (July 13th, 2021) * Fixes Razor editing support (PR: [#4642](https://github.com/OmniSharp/omnisharp-vscode/pull/4642)) From e97ac1467edddabd038ffe11ca3e08c103627c83 Mon Sep 17 00:00:00 2001 From: Austen Ott Date: Tue, 20 Jul 2021 16:53:03 -0700 Subject: [PATCH 5/5] Add error for unknown platforms. --- src/coreclr-debug/activate.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/coreclr-debug/activate.ts b/src/coreclr-debug/activate.ts index 597818b109..c45f98308b 100644 --- a/src/coreclr-debug/activate.ts +++ b/src/coreclr-debug/activate.ts @@ -62,11 +62,12 @@ async function checkIsValidArchitecture(platformInformation: PlatformInformation return true; } - else { + else if (platformInformation.isLinux()) { return true; } } + eventStream.post(new DebuggerPrerequisiteFailure("[ERROR] The debugger cannot be installed. Unknown platform.")); return false; }