Skip to content

Commit 5035a14

Browse files
muhammadsammymuhammadsammy
committed
Update to v1.23.14
2 parents c6b51ea + 10fc4db commit 5035a14

File tree

10 files changed

+182
-135
lines changed

10 files changed

+182
-135
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@
188188
"updatePackageDependencies"
189189
],
190190
"env": {
191-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/3c4f351cd57f4ee47da8fe4c0f8c1ec2/omnisharp-linux-x64-1.37.12.zip,https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/e98ac03c455ed07c02df937f873c4647/omnisharp-linux-x86-1.37.12.zip,https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/5011d2b538f09203b0d46ffc35c425ae/omnisharp-osx-1.37.12.zip,https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/c9a3648abc9b449dc8a20bbbb9cf7836/omnisharp-win-x64-1.37.12.zip,https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/fb84198a5897439914e28e3954639c7f/omnisharp-win-x86-1.37.12.zip",
192-
"NEW_DEPS_VERSION": "1.37.12"
191+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/e145d76552fb4969f272a142374e5675/omnisharp-linux-x64-1.37.14.zip,https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/b312e31eb66167dcda0e1bd87cd9458d/omnisharp-linux-x86-1.37.14.zip,https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/6c2317a3a86a31e3a5d0a11ab401a17e/omnisharp-osx-1.37.14.zip,https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/7644fc2499e29df11c0a15022045e292/omnisharp-win-x64-1.37.14.zip,https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/4d9c13ba784867e1960dbc90bf17707a/omnisharp-win-x86-1.37.14.zip",
192+
"NEW_DEPS_VERSION": "1.37.14"
193193
},
194194
"cwd": "${workspaceFolder}"
195195
}

‎CHANGELOG.md‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Known Issues in 1.23.12
1+
## Known Issues in 1.23.14
22

33
* For Mono-based development (e.g. Unity) that requires full .NET framework, you need to set `"omnisharp.useGlobalMono": "always"`. The current value of "auto" will remain "never" until Mono [upgrades their bundled MSBuild version](https://github.com/mono/mono/issues/20250).
44
* After selecting a solution filter (*.slnf) from the project selector, the solution's name will be displayed in the status bar instead of the filter's.
@@ -11,7 +11,20 @@
1111
* Renaming symbol fails within a file that had recently been renamed without saving changes.
1212
* As a workaround, make an edit within the file before using Rename Symbol.
1313

14-
## 1.23.13 (Not yet released)
14+
## 1.23.14 (July 28th, 2021)
15+
* Bump minimum required version of VS Code (PR: [#4664](https://github.com/OmniSharp/omnisharp-vscode/pull/4664))
16+
* Change useGlobalMono scope to default (window) (PR: [#4674](https://github.com/OmniSharp/omnisharp-vscode/pull/4674))
17+
* Fix a typo in package.json (PR: [#4675](https://github.com/OmniSharp/omnisharp-vscode/pull/4675))
18+
* Update OmniSharp version to 1.37.14
19+
* Update Roslyn to 4.0.0-2.21354.7 (PR: [omnisharp-roslyn#2189](https://github.com/OmniSharp/omnisharp-roslyn/pull/2189))
20+
* Update included Build Tools to match .NET SDK 6 Preview 6 (PR: [omnisharp-roslyn#2187](https://github.com/OmniSharp/omnisharp-roslyn/pull/2187))
21+
* Update to latest .NET SDKs (PR: [omnisharp-roslyn#2197](https://github.com/OmniSharp/omnisharp-roslyn/pull/2197))
22+
* Update included Build Tools to match .NET SDK 6 Preview 7 (PR: [omnisharp-roslyn#2196](https://github.com/OmniSharp/omnisharp-roslyn/pull/2196))
23+
* Upgrade McMaster.Extensions.CommandLineUtils to 3.1.0 ([#4090](https://github.com/OmniSharp/omnisharp-vscode/issues/4090), PR: [omnisharp-roslyn#2192](https://github.com/OmniSharp/omnisharp-roslyn/pull/2192))
24+
* Debugger changes:
25+
* 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))
26+
27+
## 1.23.13 (July 13th, 2021)
1528
* Fixes Razor editing support (PR: [#4642](https://github.com/OmniSharp/omnisharp-vscode/pull/4642))
1629
* Use new CompletionItem label API ([#4640](https://github.com/OmniSharp/omnisharp-vscode/issues/4640), PR: [#4648](https://github.com/OmniSharp/omnisharp-vscode/pull/4648))
1730
* Support V2 version of GoToDefinition, which can show more than one location for partial types and show source-generated file information (PR: [#4581](https://github.com/OmniSharp/omnisharp-vscode/pull/4581))

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "muhammad-sammy",
4-
"version": "1.23.13",
4+
"version": "1.23.14",
55
"description": "C# support for vscode-compatible editors (powered by OmniSharp and NetCoreDbg).",
66
"displayName": "C#",
77
"author": "Muhammad Sammy",
@@ -35,7 +35,7 @@
3535
}
3636
},
3737
"defaults": {
38-
"omniSharp": "1.37.12",
38+
"omniSharp": "1.37.14",
3939
"razor": "6.0.0-preview.5.21358.6"
4040
},
4141
"main": "./dist/extension",
@@ -127,59 +127,59 @@
127127
{
128128
"id": "OmniSharp",
129129
"description": "OmniSharp for Windows (.NET 4.6 / x86)",
130-
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/fb84198a5897439914e28e3954639c7f/omnisharp-win-x86-1.37.12.zip",
131-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-win-x86-1.37.12.zip",
132-
"installPath": ".omnisharp/1.37.12",
130+
"url": "https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/4d9c13ba784867e1960dbc90bf17707a/omnisharp-win-x86-1.37.14.zip",
131+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.14/omnisharp-win-x86-1.37.14.zip",
132+
"installPath": ".omnisharp/1.37.14",
133133
"platforms": [
134134
"win32"
135135
],
136136
"architectures": [
137137
"x86",
138138
"arm64"
139139
],
140-
"installTestPath": "./.omnisharp/1.37.12/OmniSharp.exe",
140+
"installTestPath": "./.omnisharp/1.37.14/OmniSharp.exe",
141141
"platformId": "win-x86",
142-
"integrity": "B37631B7B24D6675A726A24D50913380F5B0009A003A6D87024C4CDB6CBA5F76"
142+
"integrity": "5BDD229934EB09EB54EB1C11CFA2284E1E4F3B6286E41E88763FAC72844911A2"
143143
},
144144
{
145145
"id": "OmniSharp",
146146
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
147-
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/c9a3648abc9b449dc8a20bbbb9cf7836/omnisharp-win-x64-1.37.12.zip",
148-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-win-x64-1.37.12.zip",
149-
"installPath": ".omnisharp/1.37.12",
147+
"url": "https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/7644fc2499e29df11c0a15022045e292/omnisharp-win-x64-1.37.14.zip",
148+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.14/omnisharp-win-x64-1.37.14.zip",
149+
"installPath": ".omnisharp/1.37.14",
150150
"platforms": [
151151
"win32"
152152
],
153153
"architectures": [
154154
"x86_64"
155155
],
156-
"installTestPath": "./.omnisharp/1.37.12/OmniSharp.exe",
156+
"installTestPath": "./.omnisharp/1.37.14/OmniSharp.exe",
157157
"platformId": "win-x64",
158-
"integrity": "32DE8DF9BBBB7D65FAF742AC6001E1E2AAF26F6B0C7576B70982559565BA6EB0"
158+
"integrity": "DB5F0F1EC6ECE7F547B21953218AA18B829A0AEACF0E15032D9FBA7452E03DE9"
159159
},
160160
{
161161
"id": "OmniSharp",
162162
"description": "OmniSharp for OSX",
163-
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/5011d2b538f09203b0d46ffc35c425ae/omnisharp-osx-1.37.12.zip",
164-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-osx-1.37.12.zip",
165-
"installPath": ".omnisharp/1.37.12",
163+
"url": "https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/6c2317a3a86a31e3a5d0a11ab401a17e/omnisharp-osx-1.37.14.zip",
164+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.14/omnisharp-osx-1.37.14.zip",
165+
"installPath": ".omnisharp/1.37.14",
166166
"platforms": [
167167
"darwin"
168168
],
169169
"binaries": [
170170
"./mono.osx",
171171
"./run"
172172
],
173-
"installTestPath": "./.omnisharp/1.37.12/run",
173+
"installTestPath": "./.omnisharp/1.37.14/run",
174174
"platformId": "osx",
175-
"integrity": "3BE059E300393E9CAC108D4120E4D43720C87F7087D10E3AAEEFDD4895C91405"
175+
"integrity": "A06F8C5B1659DA5C3923BB7D773676FEE2AB6A78944F5A98252E684FF80ABC22"
176176
},
177177
{
178178
"id": "OmniSharp",
179179
"description": "OmniSharp for Linux (x86)",
180-
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/e98ac03c455ed07c02df937f873c4647/omnisharp-linux-x86-1.37.12.zip",
181-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-linux-x86-1.37.12.zip",
182-
"installPath": ".omnisharp/1.37.12",
180+
"url": "https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/b312e31eb66167dcda0e1bd87cd9458d/omnisharp-linux-x86-1.37.14.zip",
181+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.14/omnisharp-linux-x86-1.37.14.zip",
182+
"installPath": ".omnisharp/1.37.14",
183183
"platforms": [
184184
"linux"
185185
],
@@ -191,16 +191,16 @@
191191
"./mono.linux-x86",
192192
"./run"
193193
],
194-
"installTestPath": "./.omnisharp/1.37.12/run",
194+
"installTestPath": "./.omnisharp/1.37.14/run",
195195
"platformId": "linux-x86",
196-
"integrity": "FF894406DC3518877F3E00CD13DBD61AAC745E9425AD404F297FC5C512D49799"
196+
"integrity": "154C7AAB23383DEAF7F7EEF89C842E73EDAB046A7BB716C175E3732976441909"
197197
},
198198
{
199199
"id": "OmniSharp",
200200
"description": "OmniSharp for Linux (x64)",
201-
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/3c4f351cd57f4ee47da8fe4c0f8c1ec2/omnisharp-linux-x64-1.37.12.zip",
202-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-linux-x64-1.37.12.zip",
203-
"installPath": ".omnisharp/1.37.12",
201+
"url": "https://download.visualstudio.microsoft.com/download/pr/5dc8cd5b-fe44-4cd1-a25b-d97e42c1b09d/e145d76552fb4969f272a142374e5675/omnisharp-linux-x64-1.37.14.zip",
202+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.14/omnisharp-linux-x64-1.37.14.zip",
203+
"installPath": ".omnisharp/1.37.14",
204204
"platforms": [
205205
"linux"
206206
],
@@ -211,9 +211,9 @@
211211
"./mono.linux-x86_64",
212212
"./run"
213213
],
214-
"installTestPath": "./.omnisharp/1.37.12/run",
214+
"installTestPath": "./.omnisharp/1.37.14/run",
215215
"platformId": "linux-x64",
216-
"integrity": "FB468802F7B7CEC76CEFFA306C1995F70819FC9A20AE2498196B38B68E607917"
216+
"integrity": "8B963FC3E368E53441B5953934327B7A22D70C35668478992DB963956DE9F4A4"
217217
},
218218
{
219219
"id": "Debugger",
@@ -322,7 +322,7 @@
322322
}
323323
],
324324
"engines": {
325-
"vscode": "^1.57.0"
325+
"vscode": "^1.58.0"
326326
},
327327
"activationEvents": [
328328
"onDebugInitialConfigurations",
@@ -652,7 +652,6 @@
652652
"omnisharp.useGlobalMono": {
653653
"type": "string",
654654
"default": "auto",
655-
"scope": "machine",
656655
"enum": [
657656
"auto",
658657
"always",
@@ -3668,4 +3667,4 @@
36683667
]
36693668
}
36703669
}
3671-
}
3670+
}

‎src/coreclr-debug/activate.ts‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export async function activate(thisExtension: vscode.Extension<CSharpExtensionEx
2121
_debugUtil = new CoreClrDebugUtil(context.extensionPath);
2222

2323
if (!CoreClrDebugUtil.existsSync(_debugUtil.debugAdapterDir())) {
24-
let isInvalidArchitecture: boolean = await checkForInvalidArchitecture(platformInformation, eventStream);
25-
if (!isInvalidArchitecture) {
24+
let isValidArchitecture: boolean = await checkIsValidArchitecture(platformInformation, eventStream);
25+
if (!isValidArchitecture) {
2626
eventStream.post(new DebuggerPrerequisiteFailure("[ERROR]: C# Extension failed to install the debugger package."));
2727
showInstallErrorMessage(eventStream);
2828
}
@@ -37,41 +37,47 @@ export async function activate(thisExtension: vscode.Extension<CSharpExtensionEx
3737
context.subscriptions.push(vscode.debug.registerDebugAdapterDescriptorFactory('clr', factory));
3838
}
3939

40-
async function checkForInvalidArchitecture(platformInformation: PlatformInformation, eventStream: EventStream): Promise<boolean> {
40+
async function checkIsValidArchitecture(platformInformation: PlatformInformation, eventStream: EventStream): Promise<boolean> {
4141
if (platformInformation) {
4242
if (platformInformation.isMacOS()) {
4343
if (platformInformation.architecture === "arm64") {
4444
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.`));
45-
return false;
45+
return true;
4646
}
4747

4848
// Validate we are on compatiable macOS version if we are x86_64
4949
if ((platformInformation.architecture !== "x86_64") ||
5050
(platformInformation.architecture === "x86_64" && !CoreClrDebugUtil.isMacOSSupported())) {
5151
eventStream.post(new DebuggerPrerequisiteFailure("[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer."));
52-
return true;
52+
return false;
5353
}
54+
55+
return true;
5456
}
55-
else if (platformInformation.architecture !== "x86_64") {
56-
if (platformInformation.isWindows() && platformInformation.architecture === "x86") {
57+
else if (platformInformation.isWindows()) {
58+
if (platformInformation.architecture === "x86") {
5759
eventStream.post(new DebuggerPrerequisiteWarning(`[WARNING]: x86 Windows is not currently supported by the .NET Core debugger. Debugging will not be available.`));
58-
} else {
59-
eventStream.post(new DebuggerPrerequisiteWarning(`[WARNING]: Processor architecture '${platformInformation.architecture}' is not currently supported by the .NET Core debugger. Debugging will not be available.`));
60+
return false;
6061
}
62+
63+
return true;
64+
}
65+
else if (platformInformation.isLinux()) {
6166
return true;
6267
}
6368
}
6469

70+
eventStream.post(new DebuggerPrerequisiteFailure("[ERROR] The debugger cannot be installed. Unknown platform."));
6571
return false;
6672
}
6773

6874
async function completeDebuggerInstall(platformInformation: PlatformInformation, eventStream: EventStream): Promise<boolean> {
6975
return _debugUtil.checkDotNetCli()
7076
.then(async (dotnetInfo: DotnetInfo) => {
7177

72-
let isInvalidArchitecture: boolean = await checkForInvalidArchitecture(platformInformation, eventStream);
78+
let isValidArchitecture: boolean = await checkIsValidArchitecture(platformInformation, eventStream);
7379

74-
if (isInvalidArchitecture) {
80+
if (!isValidArchitecture) {
7581
eventStream.post(new DebuggerNotInstalledFailure());
7682
vscode.window.showErrorMessage('Failed to complete the installation of the C# extension. Please see the error in the output window below.');
7783
return false;

‎src/features/commands.ts‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { OmniSharpServer } from '../omnisharp/server';
77
import * as serverUtils from '../omnisharp/utils';
8-
import { findLaunchTargets } from '../omnisharp/launcher';
8+
import { findLaunchTargets, LaunchTarget } from '../omnisharp/launcher';
99
import * as cp from 'child_process';
1010
import * as fs from 'fs';
1111
import * as path from 'path';
@@ -92,14 +92,18 @@ async function pickProjectAndStart(server: OmniSharpServer, optionProvider: Opti
9292
}
9393
}
9494

95-
return vscode.window.showQuickPick(targets, {
96-
matchOnDescription: true,
97-
placeHolder: `Select 1 of ${targets.length} projects`
98-
}).then(async launchTarget => {
99-
if (launchTarget) {
100-
return server.restart(launchTarget);
101-
}
102-
});
95+
return showProjectSelector(server, targets);
96+
});
97+
}
98+
99+
export async function showProjectSelector(server: OmniSharpServer, targets: LaunchTarget[]): Promise<void> {
100+
return vscode.window.showQuickPick(targets, {
101+
matchOnDescription: true,
102+
placeHolder: `Select 1 of ${targets.length} projects`
103+
}).then(async launchTarget => {
104+
if (launchTarget) {
105+
return server.restart(launchTarget);
106+
}
103107
});
104108
}
105109

‎src/observers/ProjectStatusBarObserver.ts‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { basename } from 'path';
6+
import { basename, join } from 'path';
77
import { BaseEvent, WorkspaceInformationUpdated } from "../omnisharp/loggingEvents";
88
import { BaseStatusBarItemObserver } from './BaseStatusBarItemObserver';
99
import { EventType } from '../omnisharp/EventType';
@@ -25,9 +25,24 @@ export class ProjectStatusBarObserver extends BaseStatusBarItemObserver {
2525

2626
private handleWorkspaceInformationUpdated(event: WorkspaceInformationUpdated) {
2727
let label: string;
28-
let info = event.info;
29-
if (info.MsBuild && info.MsBuild.SolutionPath) {
30-
label = basename(info.MsBuild.SolutionPath); //workspace.getRelativePath(info.MsBuild.SolutionPath);
28+
let msbuild = event.info.MsBuild;
29+
if (msbuild && msbuild.SolutionPath) {
30+
if (msbuild.SolutionPath.endsWith(".sln")) {
31+
label = basename(msbuild.SolutionPath);
32+
}
33+
else {
34+
// a project file was open, determine which project
35+
for (const project of msbuild.Projects) {
36+
// Get the project name.
37+
label = basename(project.Path);
38+
39+
// The solution path is the folder containing the open project. Combine it with the
40+
// project name and see if it matches the project's path.
41+
if (join(msbuild.SolutionPath, label) === project.Path) {
42+
break;
43+
}
44+
}
45+
}
3146
this.SetAndShowStatusBar('$(file-directory) ' + label, 'o.pickProjectAndStart');
3247
}
3348
else {

0 commit comments

Comments
 (0)