Skip to content

Commit

Permalink
Refresh master with initial release/0.24 snapshot (microsoft#332)
Browse files Browse the repository at this point in the history 
* Initial port of release/0.24 source code

* Fix additional headers

* Fix a typo in launch.json
  • Loading branch information
@kburtram
kburtram authored Dec 15, 2017
1 parent 271b3a0 commit 6ad0df0
Show file tree
Hide file tree
Showing 7,118 changed files with 106,204 additions and 54,671 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ trim_trailing_whitespace = true

# The indent size used in the `package.json` file cannot be changed
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
[{.travis.yml,npm-shrinkwrap.json,package.json}]
[{*.yml,*.yaml,npm-shrinkwrap.json,package.json}]
indent_style = space
indent_size = 2
8 changes: 6 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ os:
- linux
- osx

cache:
directories:
- $HOME/.npm

notifications:
email: false

Expand All @@ -27,8 +31,8 @@ before_install:
- git submodule update --init --recursive
- git clone --depth 1 https://github.com/creationix/nvm.git ./.nvm
- source ./.nvm/nvm.sh
- nvm install 7.4.0
- nvm use 7.4.0
- nvm install 7.9.0
- nvm use 7.9.0
- npm config set python `which python`
- npm install -g gulp
- if [ $TRAVIS_OS_NAME == "linux" ]; then
Expand Down
47 changes: 27 additions & 20 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"type": "node",
"request": "launch",
"name": "Gulp Build",
"program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
"stopOnEntry": true,
"args": [
"watch-extension:json-client"
],
"cwd": "${workspaceRoot}"
"cwd": "${workspaceFolder}"
},
{
"type": "node",
Expand All @@ -21,7 +21,7 @@
"port": 5870,
"restart": true,
"outFiles": [
"${workspaceRoot}/out/**/*.js"
"${workspaceFolder}/out/**/*.js"
]
},
{
Expand All @@ -31,17 +31,17 @@
"protocol": "inspector",
"port": 5871,
"outFiles": [
"${workspaceRoot}/out/**/*.js"
"${workspaceFolder}/out/**/*.js"
]
},
{
"type": "node",
"request": "attach",
"protocol": "inspector",
"name": "Attach to Search process",
"port": 7890,
"name": "Attach to Search Process",
"port": 5876,
"outFiles": [
"${workspaceRoot}/out/**/*.js"
"${workspaceFolder}/out/**/*.js"
]
},
{
Expand All @@ -51,7 +51,7 @@
"protocol": "inspector",
"port": 5874,
"outFiles": [
"${workspaceRoot}/out/**/*.js"
"${workspaceFolder}/out/**/*.js"
]
},
{
Expand All @@ -61,9 +61,9 @@
"protocol": "inspector",
"port": 5875,
"outFiles": [
"${workspaceRoot}/out/**/*.js"
"${workspaceFolder}/out/**/*.js"
]
},
},
{
"type": "chrome",
"request": "attach",
Expand All @@ -75,44 +75,44 @@
"request": "launch",
"name": "Launch sqlops",
"windows": {
"runtimeExecutable": "${workspaceRoot}/scripts/sql.bat"
"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat"
},
"osx": {
"runtimeExecutable": "${workspaceRoot}/scripts/sql.sh"
"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
},
"linux": {
"runtimeExecutable": "${workspaceRoot}/scripts/sql.sh"
"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
},
"urlFilter": "*index.html*",
"runtimeArgs": [
"--inspect=5875"
],
"webRoot": "${workspaceRoot}"
"webRoot": "${workspaceFolder}"
},
{
"type": "node",
"request": "launch",
"name": "Unit Tests",
"protocol": "inspector",
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
"runtimeExecutable": "${workspaceRoot}/.build/electron/sqlops.app/Contents/MacOS/Electron",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"runtimeExecutable": "${workspaceFolder}/.build/electron/sqlops.app/Contents/MacOS/Electron",
"windows": {
"runtimeExecutable": "${workspaceRoot}/.build/electron/sqlops.exe"
"runtimeExecutable": "${workspaceFolder}/.build/electron/sqlops.exe"
},
"linux": {
"runtimeExecutable": "${workspaceRoot}/.build/electron/sqlops"
"runtimeExecutable": "${workspaceFolder}/.build/electron/sqlops"
},
"stopOnEntry": false,
"args": [
"--timeout",
"2000"
],
"cwd": "${workspaceRoot}",
"cwd": "${workspaceFolder}",
"env": {
"ELECTRON_RUN_AS_NODE": "true"
},
"outFiles": [
"${workspaceRoot}/out/**/*.js"
"${workspaceFolder}/out/**/*.js"
]
}
],
Expand All @@ -123,6 +123,13 @@
"Launch sqlops",
"Attach to Main Process"
]
},
{
"name": "Search and Renderer processes",
"configurations": [
"Launch sqlops",
"Attach to Search Process"
]
}
]
}
11 changes: 7 additions & 4 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@
"**/node_modules": true,
"**/bower_components": true,
".build/**": true,
"out*/**": true,
"out/**": true,
"out-build/**": true,
"out-vscode/**": true,
"i18n/**": true,
"extensions/**/out/**": true
"extensions/**/out/**": true,
"test/smoke/out/**": true
},
"tslint.enable": true,
"lcov.path": [
Expand All @@ -26,9 +29,9 @@
"lcov.watch": [
{
"pattern": "**/*.test.js",
"command": "${workspaceRoot}/scripts/test.sh --coverage --run ${file}",
"command": "${workspaceFolder}/scripts/test.sh --coverage --run ${file}",
"windows": {
"command": "${workspaceRoot}\\scripts\\test.bat --coverage --run ${file}"
"command": "${workspaceFolder}\\scripts\\test.bat --coverage --run ${file}"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@
"problemMatcher": []
}
]
}
}
10 changes: 5 additions & 5 deletions LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ MICROSOFT SOFTWARE LICENSE TERMS

MICROSOFT SQL OPERATIONS STUDIO

Microsoft Corporation (“Microsoft”) grants you a nonexclusive, perpetual,
royalty-free right to use, copy, and modify the software code provided by us
Microsoft Corporation (�Microsoft�) grants you a nonexclusive, perpetual,
royalty-free right to use,�copy, and modify�the software code provided by us
("Software Code"). You may not sublicense the Software Code or any use of it
(except to your affiliates and to vendors to perform work on your behalf)
through distribution, network access, service agreement, lease, rental, or
otherwise. Unless applicable law gives you more rights, Microsoft reserves all
other rights not expressly granted herein, whether by implication, estoppel or
otherwise. 
 
THE SOFTWARE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
otherwise.�
�
THE SOFTWARE CODE IS PROVIDED �AS IS�, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL MICROSOFT OR ITS
LICENSORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
Expand Down
27 changes: 0 additions & 27 deletions ThirdPartyNotices.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ expressly granted herein, whether by implication, estoppel or otherwise.
pretty-data: https://github.com/vkiryukhin/pretty-data
primeng: https://github.com/primefaces/primeng
pty.js: https://github.com/chjj/pty.js
rangy: https://github.com/timdown/rangy
reflect-metadata: https://github.com/rbuckton/reflect-metadata
rxjs: https://github.com/ReactiveX/RxJS
semver: https://github.com/npm/node-semver
Expand Down Expand Up @@ -1395,32 +1394,6 @@ THE SOFTWARE.
=========================================
END OF pty.js NOTICES AND INFORMATION

%% rangy NOTICES AND INFORMATION BEGIN HERE
=========================================
The MIT License (MIT)

Copyright (c) 2014 Tim Down

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
=========================================
END OF rangy NOTICES AND INFORMATION

%% reflect-metadata NOTICES AND INFORMATION BEGIN HERE
=========================================
Apache License
Expand Down
8 changes: 5 additions & 3 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ environment:
ELECTRON_RUN_AS_NODE: 1
VSCODE_BUILD_VERBOSE: true

cache:
- '%APPDATA%\npm-cache'

install:
- ps: Install-Product node 7.4.0 x64
- ps: Install-Product node 7.9.0 x64
- npm install -g npm@4 --silent
- npm install -g gulp mocha --silent

build_script:
- .\scripts\npm.bat install
- gulp electron
- .\node_modules\.bin\gulp electron
- npm run compile

test_script:
Expand Down
11 changes: 7 additions & 4 deletions build/gulpfile.hygiene.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const gulptslint = require('gulp-tslint');
const gulpeslint = require('gulp-eslint');
const tsfmt = require('typescript-formatter');
const tslint = require('tslint');
const vfs = require('vinyl-fs');

/**
* Hygiene works by creating cascading subsets of all our files and
Expand Down Expand Up @@ -53,6 +54,7 @@ const indentationFilter = [
'!**/*.md',
'!**/*.ps1',
'!**/*.template',
'!**/*.yaml',
'!**/*.yml',
'!**/lib/**',
'!extensions/**/*.d.ts',
Expand Down Expand Up @@ -92,6 +94,7 @@ const copyrightFilter = [
'!**/*.opts',
'!**/*.disabled',
'!build/**/*.init',
'!resources/linux/snap/snapcraft.yaml',
'!resources/win32/bin/code.js',
'!extensions/markdown/media/tomorrow.css',
'!extensions/html/server/src/modes/typescript/*'
Expand Down Expand Up @@ -141,7 +144,7 @@ function reportFailures(failures) {
}

gulp.task('eslint', () => {
return gulp.src(all, { base: '.' })
return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
.pipe(filter(eslintFilter))
.pipe(gulpeslint('src/.eslintrc'))
.pipe(gulpeslint.formatEach('compact'))
Expand All @@ -151,7 +154,7 @@ gulp.task('eslint', () => {
gulp.task('tslint', () => {
const options = { summarizeFailureOutput: true };

return gulp.src(all, { base: '.' })
return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
.pipe(filter(tslintFilter))
.pipe(gulptslint({ rulesDirectory: 'build/lib/tslint' }))
.pipe(gulptslint.report(reportFailures, options));
Expand Down Expand Up @@ -232,7 +235,7 @@ const hygiene = exports.hygiene = (some, options) => {
this.emit('data', file);
});

const result = gulp.src(some || all, { base: '.' })
const result = vfs.src(some || all, { base: '.', follow: true, allowEmpty: true })
.pipe(filter(f => !f.stat.isDirectory()))
.pipe(filter(eolFilter))
// {{SQL CARBON EDIT}}
Expand Down Expand Up @@ -267,7 +270,7 @@ const hygiene = exports.hygiene = (some, options) => {
}));
};

gulp.task('hygiene', () => hygiene());
gulp.task('hygiene', () => hygiene(''));

// this allows us to run hygiene as a git pre-commit hook
if (require.main === module) {
Expand Down
1 change: 0 additions & 1 deletion build/gulpfile.sql.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ gulp.task('clean-client', util.rimraf('dataprotocol-node/client/node_modules'));
gulp.task('clean-jsonrpc', util.rimraf('dataprotocol-node/jsonrpc/node_modules'));
gulp.task('clean-server', util.rimraf('dataprotocol-node/server/node_modules'));
gulp.task('clean-types', util.rimraf('dataprotocol-node/types/node_modules'));
// {{SQL CARBON EDIT}}
gulp.task('clean-extensions-modules', util.rimraf('extensions-modules/node_modules'));
gulp.task('clean-protocol', ['clean-extensions-modules', 'clean-mssql-extension', 'clean-credentials-extension', 'clean-client', 'clean-jsonrpc', 'clean-server', 'clean-types']);

Expand Down
Loading

0 comments on commit 6ad0df0

Please sign in to comment.