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..6ba0cc0a7c 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 isValidArchitecture(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; } }