Skip to content

Commit 1fc22c4

Browse files
muhammadsammymuhammadsammy
committed
1.23.16
2 parents 76e27ea + 3c11805 commit 1fc22c4

File tree

12 files changed

+177
-128
lines changed

12 files changed

+177
-128
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/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"
191+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9ae3ed99fc0c41c7139751dde6f2bc78/omnisharp-linux-x64-1.37.16.zip,https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/06bba46fa5450b4a2595e709fe59c131/omnisharp-linux-x86-1.37.16.zip,https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/0ea1ea1eae48552a1992ed6df782353a/omnisharp-osx-1.37.16.zip,https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/5c36b37a4b91460927fa42658f0271bb/omnisharp-win-x64-1.37.16.zip,https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9f47cd0a44db6e2d5bbdeb9e3e72aa8d/omnisharp-win-x86-1.37.16.zip",
192+
"NEW_DEPS_VERSION": "1.37.16"
193193
},
194194
"cwd": "${workspaceFolder}"
195195
}

‎CHANGELOG.md‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Known Issues in 1.23.15
1+
## Known Issues in 1.23.16
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,13 +11,26 @@
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)
14+
## 1.23.16 (Not released yet)
15+
* Show decompilation authorization once per install. ([#3982](https://github.com/OmniSharp/omnisharp-vscode/issues/3982), PR: [#4760](https://github.com/OmniSharp/omnisharp-vscode/pull/4760))
16+
* Launch with first Folder or Solution target found (PR: [#4780](https://github.com/OmniSharp/omnisharp-vscode/pull/4780))
17+
* Update Debugger Labels (PR: [#4798](https://github.com/OmniSharp/omnisharp-vscode/pull/4798))
18+
* Add Debug Welcome View (PR: [#4797](https://github.com/OmniSharp/omnisharp-vscode/pull/4797))
19+
* Update OmniSharp version to 1.37.16:
20+
* Update included Build Tools to match .NET SDK 6 (PR: [omnisharp-roslyn#2239](https://github.com/OmniSharp/omnisharp-roslyn/pull/2239))
21+
* Add Custom .NET CLI support to OmniSharp (PR: [omnisharp-roslyn#2227](https://github.com/OmniSharp/omnisharp-roslyn/pull/2227))
22+
* Handle .editorconfig changes without running a new design time build ([omnisharp-roslyn#2112](https://github.com/OmniSharp/omnisharp-roslyn/issues/2112) PR: [omnisharp-roslyn#2234](https://github.com/OmniSharp/omnisharp-roslyn/pull/2234))
23+
* Do not return nulls when getting documents by path ([omnisharp-roslyn#2125](https://github.com/OmniSharp/omnisharp-roslyn/issues/2125) PR: [omnisharp-roslyn#2233](https://github.com/OmniSharp/omnisharp-roslyn/pull/2233))
24+
* handle RecordStructName in semantic highlighting classification ([omnisharp-roslyn#2228](https://github.com/OmniSharp/omnisharp-roslyn/issues/2228) PR: [omnisharp-roslyn#2232](https://github.com/OmniSharp/omnisharp-roslyn/pull/2232))
25+
* Update CodeStructureService with FileScoped Namespace support ([omnisharp-roslyn#2225](https://github.com/OmniSharp/omnisharp-roslyn/issues/2225) PR: [omnisharp-roslyn#2226](https://github.com/OmniSharp/omnisharp-roslyn/pull/2226))
26+
27+
## 1.23.15 (Aug 31st, 2021)
1528
* 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))
1629
* 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))
1730
* 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))
31+
* Fix autoFix on save ([#4401](https://github.com/OmniSharp/omnisharp-roslyn/issues/4401), PR: [#4717](https://github.com/OmniSharp/omnisharp-vscode/pull/4717))
1932

20-
Update OmniSharp version to 1.37.15:
33+
* Update OmniSharp version to 1.37.15:
2134
* Update Roslyn to 4.0.0-4.21427.11 (PR: [omnisharp-roslyn#2220](https://github.com/OmniSharp/omnisharp-roslyn/pull/2220))
2235
* 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))
2336
* Remove .NET Core 2.1 (PR: [omnisharp-roslyn#2219](https://github.com/OmniSharp/omnisharp-roslyn/pull/2219))

‎package-lock.json‎

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

‎package.json‎

Lines changed: 37 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.15-PATCH",
4+
"version": "1.23.16",
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.15",
38+
"omniSharp": "1.37.16",
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/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",
130+
"url": "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9f47cd0a44db6e2d5bbdeb9e3e72aa8d/omnisharp-win-x86-1.37.16.zip",
131+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-win-x86-1.37.16.zip",
132+
"installPath": ".omnisharp/1.37.16",
133133
"platforms": [
134134
"win32"
135135
],
136136
"architectures": [
137137
"x86",
138138
"arm64"
139139
],
140-
"installTestPath": "./.omnisharp/1.37.15/OmniSharp.exe",
140+
"installTestPath": "./.omnisharp/1.37.16/OmniSharp.exe",
141141
"platformId": "win-x86",
142-
"integrity": "6B5C2C57EC0326B770A067925B3D4AE04D278B05E327A8E492196AC8910E3CDD"
142+
"integrity": "9299D1D2318929BC74BC158CDE73CF850C2768F832D89B6AD31ABC333A0F5002"
143143
},
144144
{
145145
"id": "OmniSharp",
146146
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
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",
147+
"url": "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/5c36b37a4b91460927fa42658f0271bb/omnisharp-win-x64-1.37.16.zip",
148+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-win-x64-1.37.16.zip",
149+
"installPath": ".omnisharp/1.37.16",
150150
"platforms": [
151151
"win32"
152152
],
153153
"architectures": [
154154
"x86_64"
155155
],
156-
"installTestPath": "./.omnisharp/1.37.15/OmniSharp.exe",
156+
"installTestPath": "./.omnisharp/1.37.16/OmniSharp.exe",
157157
"platformId": "win-x64",
158-
"integrity": "7A14FC81F3349DDCE5AC38D01072FD7D4F17B98975E9841EA2593A65C3E96DD5"
158+
"integrity": "64F97DCA98CB26A835EA2D9E5FF5105B7E33E150B0822BC76CD0C7BCF773AF7D"
159159
},
160160
{
161161
"id": "OmniSharp",
162162
"description": "OmniSharp for OSX",
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",
163+
"url": "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/0ea1ea1eae48552a1992ed6df782353a/omnisharp-osx-1.37.16.zip",
164+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-osx-1.37.16.zip",
165+
"installPath": ".omnisharp/1.37.16",
166166
"platforms": [
167167
"darwin"
168168
],
169169
"binaries": [
170170
"./mono.osx",
171171
"./run"
172172
],
173-
"installTestPath": "./.omnisharp/1.37.15/run",
173+
"installTestPath": "./.omnisharp/1.37.16/run",
174174
"platformId": "osx",
175-
"integrity": "CF22CC5DA1D1B25D7825FF4B1F13329E406167D9F1A1A2EDA9B20B5AC1E9C30E"
175+
"integrity": "37D20A032D491DC2460B6E7C4488B8BE047922A387253B2C943407FD4F770F42"
176176
},
177177
{
178178
"id": "OmniSharp",
179179
"description": "OmniSharp for Linux (x86)",
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",
180+
"url": "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/06bba46fa5450b4a2595e709fe59c131/omnisharp-linux-x86-1.37.16.zip",
181+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-linux-x86-1.37.16.zip",
182+
"installPath": ".omnisharp/1.37.16",
183183
"platforms": [
184184
"linux"
185185
],
@@ -191,16 +191,16 @@
191191
"./mono.linux-x86",
192192
"./run"
193193
],
194-
"installTestPath": "./.omnisharp/1.37.15/run",
194+
"installTestPath": "./.omnisharp/1.37.16/run",
195195
"platformId": "linux-x86",
196-
"integrity": "FDFEF5B216362E71298F643DC5AC64A2783DAFB9C5EB98BBF6F70B681E29893D"
196+
"integrity": "CB1D8578C0D9AF4A5EDF469DADA4CD9B7F3BCF71FC6BD5947EB500A2036A100A"
197197
},
198198
{
199199
"id": "OmniSharp",
200200
"description": "OmniSharp for Linux (x64)",
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",
201+
"url": "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9ae3ed99fc0c41c7139751dde6f2bc78/omnisharp-linux-x64-1.37.16.zip",
202+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-linux-x64-1.37.16.zip",
203+
"installPath": ".omnisharp/1.37.16",
204204
"platforms": [
205205
"linux"
206206
],
@@ -211,9 +211,9 @@
211211
"./mono.linux-x86_64",
212212
"./run"
213213
],
214-
"installTestPath": "./.omnisharp/1.37.15/run",
214+
"installTestPath": "./.omnisharp/1.37.16/run",
215215
"platformId": "linux-x64",
216-
"integrity": "BA98001380A902B7A2FF882309A1A30B1557D92059E06722C0D122DF27F7905D"
216+
"integrity": "712012B56AA8155B4B976C3F43C88882EB059C1BE9FFB4A57582F06698564B28"
217217
},
218218
{
219219
"id": "Debugger",
@@ -986,7 +986,7 @@
986986
"debuggers": [
987987
{
988988
"type": "coreclr",
989-
"label": ".NET Core",
989+
"label": ".NET 5+ and .NET Core",
990990
"languages": [
991991
"csharp",
992992
"razor",
@@ -2092,7 +2092,7 @@
20922092
},
20932093
{
20942094
"type": "clr",
2095-
"label": ".NET",
2095+
"label": ".NET Framework 4.x (Windows only)",
20962096
"languages": [
20972097
"csharp",
20982098
"razor",
@@ -3665,6 +3665,13 @@
36653665
"group": "2_dotnet@2"
36663666
}
36673667
]
3668-
}
3668+
},
3669+
"viewsWelcome": [
3670+
{
3671+
"view": "debug",
3672+
"contents": "[Generate C# Assets for Build and Debug](command:dotnet.generateAssets)\n\nTo learn more about launch.json, see [Configuring launch.json for C# debugging](https://aka.ms/VSCode-CS-LaunchJson).",
3673+
"when": "debugStartLanguage == csharp"
3674+
}
3675+
]
36693676
}
36703677
}

‎src/coreclr-debug/activate.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ export async function activate(thisExtension: vscode.Extension<CSharpExtensionEx
2222

2323
if (!CoreClrDebugUtil.existsSync(_debugUtil.debugAdapterDir())) {
2424
let isValidArchitecture: boolean = await checkIsValidArchitecture(platformInformation, eventStream);
25-
if (!isValidArchitecture) {
25+
// If this is a valid architecture, we should have had a debugger, so warn if we didn't, otherwise
26+
// a warning was already issued, so do nothing.
27+
if (isValidArchitecture) {
2628
eventStream.post(new DebuggerPrerequisiteFailure("[ERROR]: C# Extension failed to install the debugger package."));
2729
showInstallErrorMessage(eventStream);
2830
}
@@ -41,7 +43,7 @@ async function checkIsValidArchitecture(platformInformation: PlatformInformation
4143
if (platformInformation) {
4244
if (platformInformation.isMacOS()) {
4345
if (platformInformation.architecture === "arm64") {
44-
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.`));
46+
eventStream.post(new DebuggerPrerequisiteWarning(`[WARNING]: arm64 macOS is not officially supported by the .NET debugger. You may experience unexpected issues when running in this configuration.`));
4547
return true;
4648
}
4749

@@ -56,7 +58,7 @@ async function checkIsValidArchitecture(platformInformation: PlatformInformation
5658
}
5759
else if (platformInformation.isWindows()) {
5860
if (platformInformation.architecture === "x86") {
59-
eventStream.post(new DebuggerPrerequisiteWarning(`[WARNING]: x86 Windows is not currently supported by the .NET Core debugger. Debugging will not be available.`));
61+
eventStream.post(new DebuggerPrerequisiteWarning(`[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.`));
6062
return false;
6163
}
6264

@@ -85,7 +87,6 @@ async function completeDebuggerInstall(platformInformation: PlatformInformation,
8587

8688
// Write install.complete
8789
CoreClrDebugUtil.writeEmptyFile(_debugUtil.installCompleteFilePath());
88-
vscode.window.setStatusBarMessage('Successfully installed .NET Core Debugger.', 5000);
8990

9091
return true;
9192
}, (err) => {
@@ -100,14 +101,14 @@ async function completeDebuggerInstall(platformInformation: PlatformInformation,
100101

101102
function showInstallErrorMessage(eventStream: EventStream) {
102103
eventStream.post(new DebuggerNotInstalledFailure());
103-
vscode.window.showErrorMessage("An error occurred during installation of the .NET Core Debugger. The C# extension may need to be reinstalled.");
104+
vscode.window.showErrorMessage("An error occurred during installation of the .NET Debugger. The C# extension may need to be reinstalled.");
104105
}
105106

106107
function showDotnetToolsWarning(message: string): void {
107108
const config = vscode.workspace.getConfiguration('csharp');
108109
if (!config.get('suppressDotnetInstallWarning', false)) {
109-
const getDotNetMessage = 'Get the .NET Core SDK';
110-
const goToSettingsMessage = 'Disable this message in user settings';
110+
const getDotNetMessage = 'Get the SDK';
111+
const goToSettingsMessage = 'Disable message in settings';
111112
const helpMessage = 'Help';
112113
// Buttons are shown in right-to-left order, with a close button to the right of everything;
113114
// getDotNetMessage will be the first button, then goToSettingsMessage, then the close button.

‎src/features/commands.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import OptionProvider from '../observers/OptionProvider';
2121
import reportIssue from './reportIssue';
2222
import { IMonoResolver } from '../constants/IMonoResolver';
2323
import { getDotnetInfo } from '../utils/getDotnetInfo';
24-
import { getDecompilationAuthorization } from '../omnisharp/decompilationPrompt';
24+
import { getDecompilationAuthorization, resetDecompilationAuthorization } from '../omnisharp/decompilationPrompt';
2525

2626
export default function registerCommands(context: vscode.ExtensionContext, server: OmniSharpServer, platformInfo: PlatformInformation, eventStream: EventStream, optionProvider: OptionProvider, monoResolver: IMonoResolver, packageJSON: any, extensionPath: string): CompositeDisposable {
2727
let disposable = new CompositeDisposable();
@@ -62,13 +62,13 @@ export default function registerCommands(context: vscode.ExtensionContext, serve
6262

6363
async function showDecompilationTerms(context: vscode.ExtensionContext, server: OmniSharpServer, optionProvider: OptionProvider) {
6464
// Reset the decompilation authorization so the user will be prompted on restart.
65-
context.workspaceState.update("decompilationAuthorized", undefined);
65+
resetDecompilationAuthorization(context);
6666

6767
await restartOmniSharp(context, server, optionProvider);
6868
}
6969

7070
async function restartOmniSharp(context: vscode.ExtensionContext, server: OmniSharpServer, optionProvider: OptionProvider) {
71-
// Update decompilation authorization for this workspace.
71+
// Update decompilation authorization.
7272
server.decompilationAuthorized = await getDecompilationAuthorization(context, optionProvider);
7373

7474
if (server.isRunning()) {
@@ -81,7 +81,7 @@ async function restartOmniSharp(context: vscode.ExtensionContext, server: OmniSh
8181

8282
async function pickProjectAndStart(server: OmniSharpServer, optionProvider: OptionProvider): Promise<void> {
8383
let options = optionProvider.GetLatestOptions();
84-
return findLaunchTargets(options).then(targets => {
84+
return findLaunchTargets(options).then(async targets => {
8585

8686
let currentPath = server.getSolutionPathOrFolder();
8787
if (currentPath) {

0 commit comments

Comments
 (0)