Skip to content

Commit

Permalink
Merge pull request #2038 from OmniSharp/master
Browse files Browse the repository at this point in the history
Merge master to release
  • Loading branch information
DustinCampbell authored Feb 14, 2018
2 parents a6927e0 + 73e16a7 commit 1869976
Show file tree
Hide file tree
Showing 60 changed files with 13,488 additions and 517 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ install.*

obj/
bin/
test/**/.vscode
.logs/

\.DS_Store
13 changes: 11 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
language: node_js

node_js:
- "6"
- "8"

env:
- CODE_VERSION=1.18.0

before_install:
- if [ $TRAVIS_OS_NAME == "linux" ]; then
Expand Down Expand Up @@ -30,6 +33,12 @@ install:
script:
- npm test --silent

after_failure:
- ./.travis/printLogs.sh

after_success:
- ./.travis/printLogs.sh

deploy:
provider: releases
api_key:
Expand All @@ -39,4 +48,4 @@ deploy:
skip_cleanup: true
on:
repo: OmniSharp/omnisharp-vscode
tags: true
tags: true
25 changes: 25 additions & 0 deletions .travis/printLogs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

# ---------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

fold_start() {
echo -e "travis_fold:start:$1\033[33;1m$2\033[0m"
}

fold_end() {
echo -e "\ntravis_fold:end:$1\r"
}

fold_start testLogs "Test Logs"

for f in ./.logs/*.log
do
fold_start logFile $f
cat $f
fold_end logFile
done

fold_end testLogs
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
"csharp.suppressDotnetRestoreNotification": true,

"tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib",
"typescript.tsdk": "./node_modules/typescript/lib"
"typescript.tsdk": "./node_modules/typescript/lib",
"mocha.enabled": true
}
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"command": "echo",
"showOutput": "always",
"isShellCommand": true,
"args": ["Run tests in VS Code by launching the debugg with the 'Launch Tests' configuration."],
"args": ["Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."],
"isTestCommand": true
},
{
Expand Down
40 changes: 39 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,46 @@
## Known Issues in 1.13.0
## Known Issues in 1.14.0

* There currently is no completion support for package references in csproj files. ([#1156](https://github.com/OmniSharp/omnisharp-vscode/issues/1156))
* As an alternative, consider installing the [MSBuild Project Tools](https://marketplace.visualstudio.com/items?itemName=tintoy.msbuild-project-tools) extension by @tintoy.

## 1.14.0 (February 14, 2017)

#### C# Language Support

* Support for C# 7.2 (PR: [omnisharp-roslyn#1055](https://github.com/OmniSharp/omnisharp-roslyn/pull/1055)) _(Contributed by [@filipw](https://github.com/filipw))_

#### Debugger

* Fixes symbol loading while debugging apps running under .NET Core 2.1 (ex: netcoreapp 2.1) on Linux and macOS
* Fixes debug console message encoding issue on Windows ([#1775](https://github.com/OmniSharp/omnisharp-vscode/issues/1775)).
* Adds support for extracting source files embedded in PDBs. See the C# [EmbeddedFiles](https://github.com/dotnet/roslyn/issues/19127) feature for more information.
* Adds preliminary support for Linux ARM debugging

#### Editor

* Fix to allow signature help return results for attribute constructors. ([#1814](https://github.com/OmniSharp/omnisharp-vscode/issues/1814), PR: [omnisharp-roslyn#1007](https://github.com/OmniSharp/omnisharp-roslyn/pull/1007))
* Fix to return correct SymbolKinds from WorkspaceSymbolprovider ([#1907](https://github.com/OmniSharp/omnisharp-vscode/issues/1907), PR: [#1911](https://github.com/OmniSharp/omnisharp-vscode/pull/1911)) _(Contributed by [@craig006](https://github.com/craig006))_
* Improved newline formatting in hover info ([#1057](https://github.com/OmniSharp/omnisharp-vscode/issues/1057), PR: [#1918](https://github.com/OmniSharp/omnisharp-vscode/pull/1918))
* Disabled Go To Definition on property acessor keywords ([#1949](https://github.com/OmniSharp/omnisharp-vscode/issues/1949), PR: [omnisharp-roslyn#1086](https://github.com/OmniSharp/omnisharp-roslyn/pull/1086))
* Bug fixes to IntelliSense (completion, signature help): (([#1664](https://github.com/OmniSharp/omnisharp-vscode/issues/1664), [1440](https://github.com/OmniSharp/omnisharp-vscode/issues/1440), PR: [omnisharp-roslyn#1030](https://github.com/OmniSharp/omnisharp-roslyn/pull/1030)); ([#146](https://github.com/OmniSharp/omnisharp-vscode/issues/146) , PR: [#1776](https://github.com/OmniSharp/omnisharp-vscode/pull/1776)))
* Improved "Format Code" behavior: ([#214](https://github.com/OmniSharp/omnisharp-vscode/issues/214), PR: [omnisharp-roslyn#1043](https://github.com/OmniSharp/omnisharp-roslyn/pull/1043))
* Improved code action ordering: ([omnisharp-roslyn#758](https://github.com/OmniSharp/omnisharp-roslyn/issues/758), PR: [omnisharp-roslyn#1078](https://github.com/OmniSharp/omnisharp-roslyn/pull/1078))
* Fixed duplicate errors in error list ([#1830](https://github.com/OmniSharp/omnisharp-vscode/issues/1830), PR:[#1107](https://github.com/OmniSharp/omnisharp-roslyn/pull/1107))

#### Project System

* Addressed problems with projects not being refreshed by OmniSharp after a package restore. ([#1583](https://github.com/OmniSharp/omnisharp-vscode/issues/1583), [#1661](https://github.com/OmniSharp/omnisharp-vscode/issues/1661), [#1785](https://github.com/OmniSharp/omnisharp-vscode/issues/1785), PR: [omnisharp-roslyn#1003](https://github.com/OmniSharp/omnisharp-roslyn/pull/1003))
* Added option to disable warning about project.json deprecation ([1920](https://github.com/OmniSharp/omnisharp-vscode/issues/1920), PR: [#1926](https://github.com/OmniSharp/omnisharp-vscode/pull/1926))

#### Task Generation

* Updated task generator to match latest schema from VS Code (PR: [#1932](https://github.com/OmniSharp/omnisharp-vscode/pull/1923)) _(Contributed by [@natec425](https://github.com/natec425))_
* Fixed a typo in tasks.json (PR: [1945](https://github.com/OmniSharp/omnisharp-vscode/pull/1945)) _(Contributed by [@SebastianPfliegel](SebastianPfliegel))_

#### Misc

* Fixed offline packaging ([1912](https://github.com/OmniSharp/omnisharp-vscode/issues/1912), [1930](https://github.com/OmniSharp/omnisharp-vscode/issues/1930), PR: [#1931](https://github.com/OmniSharp/omnisharp-vscode/pull/1931))

## 1.13.1 (November 13, 2017)

* Addressed problem with Sdk-style projects not being loaded properly in certain cases. ([#1846](https://github.com/OmniSharp/omnisharp-vscode/issues/1846), [#1849](https://github.com/OmniSharp/omnisharp-vscode/issues/1849), PR: [omnisharp-roslyn#1021](https://github.com/OmniSharp/omnisharp-roslyn/pull/1021))
Expand Down
26 changes: 11 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,19 @@ The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnishar
### Get Started Writing C# in VS Code

* [Documentation](https://code.visualstudio.com/docs/languages/csharp)
* [Video Tutorial compiling with .NET Core](https://channel9.msdn.com/Blogs/dotnet/Get-started-with-VS-Code-using-CSharp-and-NET-Core)

### What's New in 1.13.0

* Support for Cake files. (https://cakebuild.net/)
* The language service now runs on Mono >= 5.2.0 when it is globally installed on macOS or Linux, resulting faster project load times.
* If debugging is started when a launch.json is not present, picking ".NET Core" generates a launch.json dynamically that can correctly launch a .NET Core app without any additional changes.
* Better reliability loading projects when Visual Studio 2017 (Windows) or Mono >= 5.2.0 (macOS/Linux) is installed.
* Fixed issues with non-C# projects (such as F#) being treated as C# projects.
* Addressed bugs when renaming files.
* New options for controlling the display of the references and test CodeLens:
* `csharp.referencesCodeLens.enabled`
* `csharp.testsCodeLens.enabled`
* Fixed problems with running/debugging xUnit 2.3.0 or NUnit tests.
* [Video Tutorial compiling with .NET Core](https://channel9.msdn.com/Blogs/dotnet/Get-started-VSCode-Csharp-NET-Core-Windows)

### What's New in 1.14.0

* Support for C# 7.2
* Debugger support for extracting source files embedded in PDBs
* Preliminary support for Linux ARM debugging
* Improved Symbol/Documentation text display
* Addressed problems with projects not being refreshed by OmniSharp after a package restore
* Added option to disable warning about project.json deprecation
* Many other bug fixes!

See our [change log](https://github.com/OmniSharp/omnisharp-vscode/blob/v1.13.0/CHANGELOG.md) for all of the updates.
See our [change log](https://github.com/OmniSharp/omnisharp-vscode/blob/v1.14.0/CHANGELOG.md) for all of the updates.

### Supported Operating Systems for Debugging

Expand Down
19 changes: 6 additions & 13 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const mocha = require('gulp-mocha');
const tslint = require('gulp-tslint');
const vsce = require('vsce');
const debugUtil = require('./out/src/coreclr-debug/util');
const debugInstall = require('./out/src/coreclr-debug/install');
const packages = require('./out/src/packages');
const logger = require('./out/src/logger');
const platform = require('./out/src/platform');
Expand All @@ -29,7 +28,7 @@ const PlatformInformation = platform.PlatformInformation;

function cleanSync(deleteVsix) {
del.sync('install.*');
del.sync('.omnisharp-*');
del.sync('.omnisharp*');
del.sync('.debugger');

if (deleteVsix) {
Expand All @@ -54,7 +53,6 @@ function install(platformInfo, packageJSON) {
const packageManager = new PackageManager(platformInfo, packageJSON);
const logger = new Logger(message => process.stdout.write(message));
const debuggerUtil = new debugUtil.CoreClrDebugUtil(path.resolve('.'), logger);
const debugInstaller = new debugInstall.DebugInstaller(debuggerUtil);

return packageManager.DownloadPackages(logger)
.then(() => {
Expand All @@ -64,7 +62,7 @@ function install(platformInfo, packageJSON) {
return util.touchInstallFile(util.InstallFileType.Lock)
})
.then(() => {
return debugInstaller.finishInstall();
return debugUtil.CoreClrDebugUtil.writeEmptyFile(debuggerUtil.installCompleteFilePath());
});
}

Expand Down Expand Up @@ -103,7 +101,7 @@ function doOfflinePackage(platformInfo, packageName, packageJSON) {
cleanSync(false);
return install(platformInfo, packageJSON)
.then(() => {
doPackageSync(packageName + '-' + platformInfo.runtimeId + '.vsix');
doPackageSync(packageName + '-' + platformInfo.platform + '-' + platformInfo.architecture + '.vsix');
});
}

Expand All @@ -130,13 +128,7 @@ gulp.task('package:offline', ['clean'], () => {
var packages = [];
packages.push(new PlatformInformation('win32', 'x86_64'));
packages.push(new PlatformInformation('darwin', 'x86_64'));
packages.push(new PlatformInformation('linux', 'x86_64', new LinuxDistribution('centos', '7')));
packages.push(new PlatformInformation('linux', 'x86_64', new LinuxDistribution('debian', '8')));
packages.push(new PlatformInformation('linux', 'x86_64', new LinuxDistribution('fedora', '23')));
packages.push(new PlatformInformation('linux', 'x86_64', new LinuxDistribution('opensuse', '13.2')));
packages.push(new PlatformInformation('linux', 'x86_64', new LinuxDistribution('rhel', '7.2')));
packages.push(new PlatformInformation('linux', 'x86_64', new LinuxDistribution('ubuntu', '14.04')));
packages.push(new PlatformInformation('linux', 'x86_64', new LinuxDistribution('ubuntu', '16.04')));
packages.push(new PlatformInformation('linux', 'x86_64'));

var promise = Promise.resolve();

Expand Down Expand Up @@ -169,7 +161,8 @@ const lintReporter = (output, file, options) => {
gulp.task('tslint', () => {
gulp.src(allTypeScript)
.pipe(tslint({
rulesDirectory: "node_modules/tslint-microsoft-contrib"
program: require('tslint').Linter.createProgram("./tsconfig.json"),
configuration: "./tslint.json"
}))
.pipe(tslint.report(lintReporter, {
summarizeFailureOutput: false,
Expand Down
Loading

0 comments on commit 1869976

Please sign in to comment.