Skip to content

Commit ccb5b78

Browse files
muhammadsammymuhammadsammy
committed
Merge v1.23.15
2 parents 5035a14 + 46dc774 commit ccb5b78

File tree

11 files changed

+106
-56
lines changed

11 files changed

+106
-56
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/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"
191+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/b96375395e639233d546a4937be3bd32/omnisharp-linux-x64-1.37.15.zip,https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/a58d94b65bbe08b47c772514ce8f31e6/omnisharp-linux-x86-1.37.15.zip,https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/bc6ac844afef87eedaab5191f11dc374/omnisharp-osx-1.37.15.zip,https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/5b2da7f5be18cab4fa055879cba02d13/omnisharp-win-x64-1.37.15.zip,https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/91377167ee803c9c0ac4af282aae0d5c/omnisharp-win-x86-1.37.15.zip",
192+
"NEW_DEPS_VERSION": "1.37.15"
193193
},
194194
"cwd": "${workspaceFolder}"
195195
}

‎CHANGELOG.md‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Known Issues in 1.23.14
1+
## Known Issues in 1.23.15
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,6 +11,21 @@
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.15 (Not yet released)
15+
* Restore launch target for workspace root when no solution present ([#4691](https://github.com/OmniSharp/omnisharp-vscode/issues/4691), PR: [#4695](https://github.com/OmniSharp/omnisharp-vscode/pull/4695))
16+
* Don't create launch.json for no select process ([omnisharp-roslyn#4696](https://github.com/OmniSharp/omnisharp-roslyn/issues/4696), PR: [#4699](https://github.com/OmniSharp/omnisharp-vscode/pull/4699))
17+
* Support nserting outside code when texts are selected (PR: [#4715](https://github.com/OmniSharp/omnisharp-vscode/pull/4715))
18+
* Fix autoFix on save ([#4401](https://github.com/OmniSharp/omnisharp-roslyn/issues/4401) ,PR: [#4717](https://github.com/OmniSharp/omnisharp-vscode/pull/4717))
19+
20+
Update OmniSharp version to 1.37.15:
21+
* Update Roslyn to 4.0.0-4.21427.11 (PR: [omnisharp-roslyn#2220](https://github.com/OmniSharp/omnisharp-roslyn/pull/2220))
22+
* Update NuGet to 5.10.0 ([omnisharp-roslyn#2027](https://github.com/OmniSharp/omnisharp-roslyn/issues/2027), PR: [omnisharp-roslyn#2034](https://github.com/OmniSharp/omnisharp-roslyn/pull/2034))
23+
* Remove .NET Core 2.1 (PR: [omnisharp-roslyn#2219](https://github.com/OmniSharp/omnisharp-roslyn/pull/2219))
24+
* Update versions to match .NET SDK 6 RC1 (PR: [omnisharp-roslyn#2217](https://github.com/OmniSharp/omnisharp-roslyn/pull/2217))
25+
* Use FullPaths for Locations that are returned with relative paths. ([omnisharp-roslyn#2215](https://github.com/OmniSharp/omnisharp-roslyn/issues/2215), PR: [omnisharp-roslyn#2216](https://github.com/OmniSharp/omnisharp-roslyn/pull/2216))
26+
* Improved logging in project manager (PR: [omnisharp-roslyn#2203](https://github.com/OmniSharp/omnisharp-roslyn/pull/2203))
27+
* Log a warning when external features path has no assemblies ([omnisharp-roslyn#2201](https://github.com/OmniSharp/omnisharp-roslyn/issues/2201), PR: [omnisharp-roslyn#2202](https://github.com/OmniSharp/omnisharp-roslyn/pull/2202))
28+
1429
## 1.23.14 (July 28th, 2021)
1530
* Bump minimum required version of VS Code (PR: [#4664](https://github.com/OmniSharp/omnisharp-vscode/pull/4664))
1631
* Change useGlobalMono scope to default (window) (PR: [#4674](https://github.com/OmniSharp/omnisharp-vscode/pull/4674))
@@ -26,6 +41,7 @@
2641

2742
## 1.23.13 (July 13th, 2021)
2843
* Fixes Razor editing support (PR: [#4642](https://github.com/OmniSharp/omnisharp-vscode/pull/4642))
44+
* Show C# project files in the project selector ([#4633](https://github.com/OmniSharp/omnisharp-vscode/issues/4633), PR: [#4644](https://github.com/OmniSharp/omnisharp-vscode/pull/4644))
2945
* Use new CompletionItem label API ([#4640](https://github.com/OmniSharp/omnisharp-vscode/issues/4640), PR: [#4648](https://github.com/OmniSharp/omnisharp-vscode/pull/4648))
3046
* 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))
3147
* Add command 'listRemoteDockerProcess' and variable 'pickRemoteDockerProcess' ([#4607](https://github.com/OmniSharp/omnisharp-vscode/issues/4607), PR: [#4617](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4617))

‎package-lock.json‎

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 27 additions & 27 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.14",
4+
"version": "1.23.15",
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.14",
38+
"omniSharp": "1.37.15",
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/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",
130+
"url": "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/91377167ee803c9c0ac4af282aae0d5c/omnisharp-win-x86-1.37.15.zip",
131+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-win-x86-1.37.15.zip",
132+
"installPath": ".omnisharp/1.37.15",
133133
"platforms": [
134134
"win32"
135135
],
136136
"architectures": [
137137
"x86",
138138
"arm64"
139139
],
140-
"installTestPath": "./.omnisharp/1.37.14/OmniSharp.exe",
140+
"installTestPath": "./.omnisharp/1.37.15/OmniSharp.exe",
141141
"platformId": "win-x86",
142-
"integrity": "5BDD229934EB09EB54EB1C11CFA2284E1E4F3B6286E41E88763FAC72844911A2"
142+
"integrity": "6B5C2C57EC0326B770A067925B3D4AE04D278B05E327A8E492196AC8910E3CDD"
143143
},
144144
{
145145
"id": "OmniSharp",
146146
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
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",
147+
"url": "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/5b2da7f5be18cab4fa055879cba02d13/omnisharp-win-x64-1.37.15.zip",
148+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-win-x64-1.37.15.zip",
149+
"installPath": ".omnisharp/1.37.15",
150150
"platforms": [
151151
"win32"
152152
],
153153
"architectures": [
154154
"x86_64"
155155
],
156-
"installTestPath": "./.omnisharp/1.37.14/OmniSharp.exe",
156+
"installTestPath": "./.omnisharp/1.37.15/OmniSharp.exe",
157157
"platformId": "win-x64",
158-
"integrity": "DB5F0F1EC6ECE7F547B21953218AA18B829A0AEACF0E15032D9FBA7452E03DE9"
158+
"integrity": "7A14FC81F3349DDCE5AC38D01072FD7D4F17B98975E9841EA2593A65C3E96DD5"
159159
},
160160
{
161161
"id": "OmniSharp",
162162
"description": "OmniSharp for OSX",
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",
163+
"url": "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/bc6ac844afef87eedaab5191f11dc374/omnisharp-osx-1.37.15.zip",
164+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-osx-1.37.15.zip",
165+
"installPath": ".omnisharp/1.37.15",
166166
"platforms": [
167167
"darwin"
168168
],
169169
"binaries": [
170170
"./mono.osx",
171171
"./run"
172172
],
173-
"installTestPath": "./.omnisharp/1.37.14/run",
173+
"installTestPath": "./.omnisharp/1.37.15/run",
174174
"platformId": "osx",
175-
"integrity": "A06F8C5B1659DA5C3923BB7D773676FEE2AB6A78944F5A98252E684FF80ABC22"
175+
"integrity": "CF22CC5DA1D1B25D7825FF4B1F13329E406167D9F1A1A2EDA9B20B5AC1E9C30E"
176176
},
177177
{
178178
"id": "OmniSharp",
179179
"description": "OmniSharp for Linux (x86)",
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",
180+
"url": "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/a58d94b65bbe08b47c772514ce8f31e6/omnisharp-linux-x86-1.37.15.zip",
181+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-linux-x86-1.37.15.zip",
182+
"installPath": ".omnisharp/1.37.15",
183183
"platforms": [
184184
"linux"
185185
],
@@ -191,16 +191,16 @@
191191
"./mono.linux-x86",
192192
"./run"
193193
],
194-
"installTestPath": "./.omnisharp/1.37.14/run",
194+
"installTestPath": "./.omnisharp/1.37.15/run",
195195
"platformId": "linux-x86",
196-
"integrity": "154C7AAB23383DEAF7F7EEF89C842E73EDAB046A7BB716C175E3732976441909"
196+
"integrity": "FDFEF5B216362E71298F643DC5AC64A2783DAFB9C5EB98BBF6F70B681E29893D"
197197
},
198198
{
199199
"id": "OmniSharp",
200200
"description": "OmniSharp for Linux (x64)",
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",
201+
"url": "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/b96375395e639233d546a4937be3bd32/omnisharp-linux-x64-1.37.15.zip",
202+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-linux-x64-1.37.15.zip",
203+
"installPath": ".omnisharp/1.37.15",
204204
"platforms": [
205205
"linux"
206206
],
@@ -211,9 +211,9 @@
211211
"./mono.linux-x86_64",
212212
"./run"
213213
],
214-
"installTestPath": "./.omnisharp/1.37.14/run",
214+
"installTestPath": "./.omnisharp/1.37.15/run",
215215
"platformId": "linux-x64",
216-
"integrity": "8B963FC3E368E53441B5953934327B7A22D70C35668478992DB963956DE9F4A4"
216+
"integrity": "BA98001380A902B7A2FF882309A1A30B1557D92059E06722C0D122DF27F7905D"
217217
},
218218
{
219219
"id": "Debugger",

‎snippets/csharp.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"body": [
3535
"checked",
3636
"{",
37-
" $0",
37+
" ${TM_SELECTED_TEXT}$0",
3838
"}"
3939
],
4040
"description": "Checked block"
@@ -52,7 +52,7 @@
5252
"Console.WriteLine": {
5353
"prefix": "cw",
5454
"body": [
55-
"System.Console.WriteLine($0);"
55+
"System.Console.WriteLine(${TM_SELECTED_TEXT}$0);"
5656
],
5757
"description": "Console.WriteLine"
5858
},
@@ -61,7 +61,7 @@
6161
"body": [
6262
"do",
6363
"{",
64-
" $0",
64+
" ${TM_SELECTED_TEXT}$0",
6565
"} while (${1:true});"
6666
],
6767
"description": "do...while loop"
@@ -71,7 +71,7 @@
7171
"body": [
7272
"else",
7373
"{",
74-
" $0",
74+
" ${TM_SELECTED_TEXT}$0",
7575
"}"
7676
],
7777
"description": "Else statement"
@@ -140,7 +140,7 @@
140140
"body": [
141141
"foreach (${1:var} ${2:item} in ${3:collection})",
142142
"{",
143-
" $0",
143+
" ${TM_SELECTED_TEXT}$0",
144144
"}"
145145
],
146146
"description": "Foreach statement"
@@ -150,7 +150,7 @@
150150
"body": [
151151
"for (int ${1:i} = ${2:length} - 1; ${1:i} >= 0 ; ${1:i}--)",
152152
"{",
153-
" $0",
153+
" ${TM_SELECTED_TEXT}$0",
154154
"}"
155155
],
156156
"description": "Reverse for loop"
@@ -160,7 +160,7 @@
160160
"body": [
161161
"for (int ${1:i} = 0; ${1:i} < ${2:length}; ${1:i}++)",
162162
"{",
163-
" $0",
163+
" ${TM_SELECTED_TEXT}$0",
164164
"}"
165165
],
166166
"description": "for loop"
@@ -170,7 +170,7 @@
170170
"body": [
171171
"if (${1:true})",
172172
"{",
173-
" $0",
173+
" ${TM_SELECTED_TEXT}$0",
174174
"}"
175175
],
176176
"description": "if statement"
@@ -271,7 +271,7 @@
271271
"body": [
272272
"lock (${1:this})",
273273
"{",
274-
" $0",
274+
" ${TM_SELECTED_TEXT}$0",
275275
"}"
276276
],
277277
"description": "Lock statement"
@@ -297,7 +297,7 @@
297297
"prefix": "ifd",
298298
"body": [
299299
"#if ${1:true}",
300-
" $0",
300+
" ${TM_SELECTED_TEXT}$0",
301301
"#endif"
302302
],
303303
"description": "#if"
@@ -306,7 +306,7 @@
306306
"prefix": "region",
307307
"body": [
308308
"#region ${1:Name}",
309-
" $0",
309+
" ${TM_SELECTED_TEXT}$0",
310310
"#endregion"
311311
],
312312
"description": "#region"
@@ -385,7 +385,7 @@
385385
"body": [
386386
"try",
387387
"{",
388-
" $1",
388+
" ${TM_SELECTED_TEXT}$1",
389389
"}",
390390
"finally",
391391
"{",
@@ -399,7 +399,7 @@
399399
"body": [
400400
"try",
401401
"{",
402-
" $1",
402+
" ${TM_SELECTED_TEXT}$1",
403403
"}",
404404
"catch (${2:System.Exception})",
405405
"{",
@@ -414,7 +414,7 @@
414414
"body": [
415415
"unchecked",
416416
"{",
417-
" $0",
417+
" ${TM_SELECTED_TEXT}$0",
418418
"}"
419419
],
420420
"description": "Unchecked block"
@@ -424,7 +424,7 @@
424424
"body": [
425425
"unsafe",
426426
"{",
427-
" $0",
427+
" ${TM_SELECTED_TEXT}$0",
428428
"}"
429429
],
430430
"description": "Unsafe statement"
@@ -434,7 +434,7 @@
434434
"body": [
435435
"using (${1:resource})",
436436
"{",
437-
" $0",
437+
" ${TM_SELECTED_TEXT}$0",
438438
"}"
439439
],
440440
"description": "Using statement"
@@ -444,7 +444,7 @@
444444
"body": [
445445
"while (${1:true})",
446446
"{",
447-
" $0",
447+
" ${TM_SELECTED_TEXT}$0",
448448
"}"
449449
],
450450
"description": "While loop"

‎src/coreclr-debug/debugConfigurationProvider.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ export class DotnetDebugConfigurationProvider implements vscode.DebugConfigurati
5555
}
5656
else
5757
{
58-
throw new Error("No process was selected.");
58+
vscode.window.showErrorMessage("No process was selected.", { modal: true });
59+
return undefined;
5960
}
6061
}
6162

0 commit comments

Comments
 (0)