ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove some more small differences (#6791)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-19 12:38:59 -07:00
committed by GitHub
parent 7f6839d38e
commit ed264aae81
4 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulpfile.js
View File

@@ -13,7 +13,7 @@ const util = require('./build/lib/util');
const task = require('./build/lib/task'); const task = require('./build/lib/task');
const path = require('path'); const path = require('path');
const compilation = require('./build/lib/compilation'); const compilation = require('./build/lib/compilation');
/*const { monacoTypecheckTask , monacoTypecheckWatchTask } = require('./build/gulpfile.editor');*/ const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./build/gulpfile.editor');
const { compileExtensionsTask, watchExtensionsTask } = require('./build/gulpfile.extensions'); const { compileExtensionsTask, watchExtensionsTask } = require('./build/gulpfile.extensions');
// Fast compile for development time // Fast compile for development time
@@ -24,7 +24,7 @@ const watchClientTask = task.define('watch-client', task.series(util.rimraf('out
gulp.task(watchClientTask); gulp.task(watchClientTask);
// All // All
const compileTask = task.define('compile', task.parallel(/*monacoTypecheckTask, */compileClientTask, compileExtensionsTask)); const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask));
gulp.task(compileTask); gulp.task(compileTask);
gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask))); gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));

27
jsconfig.json
View File

@@ -1,27 +0,0 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=759670
// for the documentation about the jsconfig.json format
"compilerOptions": {
"target": "es6",
"module": "commonjs",
"allowSyntheticDefaultImports": true
},
"exclude": [
"src",
"extensions",
"test",
"i18n",
"out",
"out-build",
"out-vscode",
"out-vscode-min",
"out-editor",
"out-editor-min",
"out-monaco-editor-core",
"resources",
"scripts",
".build",
"node_modules",
"build/monaco/node_modules"
]
}

6
src/vs/platform/telemetry/node/commonProperties.ts
View File

@@ -17,13 +17,11 @@ export async function resolveCommonProperties(commit: string | undefined, versio
// {{SQL CARBON EDIT}} // {{SQL CARBON EDIT}}
// __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" } // __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
// result['common.machineId'] = machineId;
result['common.machineId'] = ''; result['common.machineId'] = '';
// // __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } // __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
// result['sessionID'] = uuid.generateUuid() + Date.now();
result['sessionID'] = ''; result['sessionID'] = '';
// __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } // __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
result['commitHash'] = ''; result['commitHash'] = '';
// __GDPR__COMMON__ "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } // __GDPR__COMMON__ "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
result['version'] = version; result['version'] = version;

2
src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
View File

@@ -262,7 +262,7 @@ export class SettingsEditor2 extends BaseEditor {
} }
private _setOptions(options: SettingsEditorOptions): void { private _setOptions(options: SettingsEditorOptions): void {
// {{SQL CARBON EDIT}} - return if options is undefined to avoid nullref // {{SQL CARBON EDIT}} - return if options is undefined to avoid nullref @todo anthonydresser 8/17/19 investigate
if (!options) { if (!options) {
return; return;
} }