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

Added toggle option for project.json warning #1926

Merged
merged 11 commits into from
Dec 18, 2017
Merged

Added toggle option for project.json warning #1926

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e5c266f
Added toggle option for project.json
akshita31 Dec 15, 2017
6f4fea4
code clean up (#1917)
colombod Dec 11, 2017
f0136d2
upgrade node on travis
colombod Dec 11, 2017
ff7cce6
reset end line
colombod Dec 13, 2017
d8e16ea
reset file travis.yml
colombod Dec 13, 2017
955033a
Revert "upgrade node on travis"
colombod Dec 13, 2017
cbd0e99
force build
colombod Dec 13, 2017
44287db
Corrected Indent
akshita31 Dec 15, 2017
8e87ca9
Merge branch 'master' into toggle_json
akshita31 Dec 15, 2017
7a84612
Changed Name
akshita31 Dec 18, 2017
6821e60
Merge branch 'toggle_json' of https://github.com/akshita31/omnisharp-…
akshita31 Dec 18, 2017
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
5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,11 @@
"default": false,
"description": "Suppress the notification window to perform a 'dotnet restore' when dependencies can't be resolved."
},
"csharp.suppressProjectDotJsonWarning": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably don't need the 'Dot' in the option name.

"type": "boolean",
"default": false,
"description": "Suppress the warning that project.json is no longer a supported project format for .NET Core applications"
},
"csharp.suppressHiddenDiagnostics": {
"type": "boolean",
"default": true,
Expand Down
36 changes: 19 additions & 17 deletions src/omnisharp/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,25 @@ export function activate(context: vscode.ExtensionContext, reporter: TelemetryRe
}

// After server is started (and projects are loaded), check to see if there are
// any project.json projects. If so, notify the user about migration.
disposables.push(server.onServerStart(() => {
utils.requestWorkspaceInformation(server)
.then(workspaceInfo => {
if (workspaceInfo.DotNet && workspaceInfo.DotNet.Projects.length > 0) {
const shortMessage = 'project.json is no longer a supported project format for .NET Core applications.';
const detailedMessage = "Warning: project.json is no longer a supported project format for .NET Core applications. Update to the latest version of .NET Core (https://aka.ms/netcoredownload) and use 'dotnet migrate' to upgrade your project (see https://aka.ms/netcoremigrate for details).";
const moreDetailItem: vscode.MessageItem = { title: 'More Detail' };

vscode.window.showWarningMessage(shortMessage, moreDetailItem)
.then(item => {
channel.appendLine(detailedMessage);
channel.show();
});
}
});
}));
// any project.json projects if the suppress option is not set. If so, notify the user about migration.
let csharpConfig = vscode.workspace.getConfiguration('csharp');
if (!csharpConfig.get<boolean>('suppressProjectDotJsonWarning')) {
disposables.push(server.onServerStart(() => {
utils.requestWorkspaceInformation(server)
.then(workspaceInfo => {
if (workspaceInfo.DotNet && workspaceInfo.DotNet.Projects.length > 0) {
const shortMessage = 'project.json is no longer a supported project format for .NET Core applications.';
const detailedMessage = "Warning: project.json is no longer a supported project format for .NET Core applications. Update to the latest version of .NET Core (https://aka.ms/netcoredownload) and use 'dotnet migrate' to upgrade your project (see https://aka.ms/netcoremigrate for details).";
const moreDetailItem: vscode.MessageItem = { title: 'More Detail' };
vscode.window.showWarningMessage(shortMessage, moreDetailItem)
.then(item => {
channel.appendLine(detailedMessage);
channel.show();
});
}
});
}));
}

// Send telemetry about the sorts of projects the server was started on.
disposables.push(server.onServerStart(() => {
Expand Down