Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement report issue command for prerelease extension #5837

Merged
merged 10 commits into from
Jun 27, 2023
Merged

Implement report issue command for prerelease extension #5837

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
40c292a
Implement report issue command for prerelease extension
dibarbet Jun 19, 2023
2d8dadc
Merge remote-tracking branch 'upstream/main' into report_issue
dibarbet Jun 20, 2023
06460ea
review feedback
dibarbet Jun 21, 2023
d5362bf
use vscode-uri
dibarbet Jun 21, 2023
b8d485e
Fix options schema
dibarbet Jun 22, 2023
9a2ff73
Explicitly throw if runtimeId is missing
dibarbet Jun 22, 2023
153f19c
Use real looking runtimeId in fake
dibarbet Jun 22, 2023
0bc35c0
Use issue reporter command
dibarbet Jun 22, 2023
5050d46
Add server path as an option to allow Razor to re-use the runtime res…
dibarbet Jun 23, 2023
949bbc9
Fix brace
dibarbet Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 21 additions & 21 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"typescript": "4.6.3",
"unzipper": "0.10.11",
"vsce": "2.9.2",
"vscode-uri": "^3.0.7",
"webpack": "5.76.0",
"webpack-cli": "4.6.0"
},
Expand Down Expand Up @@ -856,17 +857,17 @@
"items": {
"type": "string"
},
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"description": "Array of symbol server URLs (example: http​://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
WardenGnaw marked this conversation as resolved.
Show resolved Hide resolved
"default": []
},
"searchMicrosoftSymbolServer": {
"type": "boolean",
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the Microsoft Symbol server (https​://msdl.microsoft.com​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"searchNuGetOrgSymbolServer": {
"type": "boolean",
"description": "If 'true' the NuGet.org symbol server (https\u200b://symbols.nuget.org\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the NuGet.org symbol server (https​://symbols.nuget.org​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"cachePath": {
Expand Down Expand Up @@ -1498,17 +1499,17 @@
"items": {
"type": "string"
},
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"description": "Array of symbol server URLs (example: http​://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"default": []
},
"csharp.debug.symbolOptions.searchMicrosoftSymbolServer": {
"type": "boolean",
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the Microsoft Symbol server (https​://msdl.microsoft.com​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"csharp.debug.symbolOptions.searchNuGetOrgSymbolServer": {
"type": "boolean",
"description": "If 'true' the NuGet.org symbol server (https\u200b://symbols.nuget.org\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the NuGet.org symbol server (https​://symbols.nuget.org​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"csharp.debug.symbolOptions.cachePath": {
Expand Down Expand Up @@ -1677,8 +1678,7 @@
{
"command": "csharp.reportIssue",
"title": "Report an issue",
"category": "CSharp",
"enablement": "config.dotnet.server.useOmnisharp"
"category": "CSharp"
},
{
"command": "csharp.showDecompilationTerms",
Expand Down Expand Up @@ -2251,17 +2251,17 @@
"items": {
"type": "string"
},
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"description": "Array of symbol server URLs (example: http​://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"default": []
},
"searchMicrosoftSymbolServer": {
"type": "boolean",
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the Microsoft Symbol server (https​://msdl.microsoft.com​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"searchNuGetOrgSymbolServer": {
"type": "boolean",
"description": "If 'true' the NuGet.org symbol server (https\u200b://symbols.nuget.org\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the NuGet.org symbol server (https​://symbols.nuget.org​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"cachePath": {
Expand Down Expand Up @@ -2691,17 +2691,17 @@
"items": {
"type": "string"
},
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"description": "Array of symbol server URLs (example: http​://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"default": []
},
"searchMicrosoftSymbolServer": {
"type": "boolean",
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the Microsoft Symbol server (https​://msdl.microsoft.com​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"searchNuGetOrgSymbolServer": {
"type": "boolean",
"description": "If 'true' the NuGet.org symbol server (https\u200b://symbols.nuget.org\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the NuGet.org symbol server (https​://symbols.nuget.org​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"cachePath": {
Expand Down Expand Up @@ -3405,17 +3405,17 @@
"items": {
"type": "string"
},
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"description": "Array of symbol server URLs (example: http​://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"default": []
},
"searchMicrosoftSymbolServer": {
"type": "boolean",
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the Microsoft Symbol server (https​://msdl.microsoft.com​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"searchNuGetOrgSymbolServer": {
"type": "boolean",
"description": "If 'true' the NuGet.org symbol server (https\u200b://symbols.nuget.org\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the NuGet.org symbol server (https​://symbols.nuget.org​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"cachePath": {
Expand Down Expand Up @@ -3845,17 +3845,17 @@
"items": {
"type": "string"
},
"description": "Array of symbol server URLs (example: http\u200b://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"description": "Array of symbol server URLs (example: http​://MyExampleSymbolServer) or directories (example: /build/symbols) to search for .pdb files. These directories will be searched in addition to the default locations -- next to the module and the path where the pdb was originally dropped to.",
"default": []
},
"searchMicrosoftSymbolServer": {
"type": "boolean",
"description": "If 'true' the Microsoft Symbol server (https\u200b://msdl.microsoft.com\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the Microsoft Symbol server (https​://msdl.microsoft.com​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"searchNuGetOrgSymbolServer": {
"type": "boolean",
"description": "If 'true' the NuGet.org symbol server (https\u200b://symbols.nuget.org\u200b/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"description": "If 'true' the NuGet.org symbol server (https​://symbols.nuget.org​/download/symbols) is added to the symbols search path. If unspecified, this option defaults to 'false'.",
"default": false
},
"cachePath": {
Expand Down Expand Up @@ -4858,4 +4858,4 @@
}
]
}
}
}
10 changes: 0 additions & 10 deletions src/constants/IGetDotnetInfo.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/coreclr-debug/activate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { PlatformInformation } from '../shared/platform';
import { DebuggerPrerequisiteWarning, DebuggerPrerequisiteFailure, DebuggerNotInstalledFailure } from '../omnisharp/loggingEvents';
import { EventStream } from '../EventStream';
import { getRuntimeDependencyPackageWithId } from '../tools/RuntimeDependencyPackageUtils';
import { getDotnetInfo } from '../utils/getDotnetInfo';
import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
import { Options } from '../shared/options';
import { RemoteAttachPicker } from '../features/processPicker';
import CompositeDisposable from '../CompositeDisposable';
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr-debug/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as fs from 'fs';
import * as semver from 'semver';
import * as os from 'os';
import { PlatformInformation } from '../shared/platform';
import { getDotnetInfo, DotnetInfo } from '../utils/getDotnetInfo';
import { getDotnetInfo, DotnetInfo } from '../shared/utils/getDotnetInfo';

const MINIMUM_SUPPORTED_DOTNET_CLI: string = '1.0.0';

Expand Down Expand Up @@ -127,11 +127,11 @@ export function getTargetArchitecture(platformInfo: PlatformInformation, launchJ
}

// Otherwise, look at the runtime ID.
if (dotnetInfo.RuntimeId.includes('arm64'))
if (dotnetInfo.RuntimeId?.includes('arm64'))
dibarbet marked this conversation as resolved.
Show resolved Hide resolved
{
return 'arm64';
}
else if (dotnetInfo.RuntimeId.includes('x64'))
else if (dotnetInfo.RuntimeId?.includes('x64'))
{
return 'x86_64';
}
Expand Down
6 changes: 3 additions & 3 deletions src/features/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import { EventStream } from '../EventStream';
import { PlatformInformation } from '../shared/platform';
import CompositeDisposable from '../CompositeDisposable';
import OptionProvider from '../shared/observers/OptionProvider';
import reportIssue from './reportIssue';
import reportIssue from '../shared/reportIssue';
import { IHostExecutableResolver } from '../shared/constants/IHostExecutableResolver';
import { getDotnetInfo } from '../utils/getDotnetInfo';
import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
import { getDecompilationAuthorization, resetDecompilationAuthorization } from '../omnisharp/decompilationPrompt';
import { IWorkspaceDebugInformationProvider } from '../shared/IWorkspaceDebugInformationProvider';

Expand All @@ -47,7 +47,7 @@ export default function registerCommands(
// Register command for generating tasks.json and launch.json assets.
disposable.add(vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex) => generateAssets(workspaceInformationProvider, selectedIndex)));

disposable.add(vscode.commands.registerCommand('csharp.reportIssue', async () => reportIssue(vscode, context.extension.packageJSON.version, eventStream, getDotnetInfo, platformInfo.isValidPlatformForMono(), optionProvider.GetLatestOptions(), dotnetResolver, monoResolver)));
disposable.add(vscode.commands.registerCommand('csharp.reportIssue', async () => reportIssue(vscode, context.extension.packageJSON.version, getDotnetInfo, platformInfo.isValidPlatformForMono(), optionProvider.GetLatestOptions(), dotnetResolver, monoResolver)));

disposable.add(vscode.commands.registerCommand('csharp.showDecompilationTerms', async () => showDecompilationTerms(context, server, optionProvider)));

Expand Down
Loading