From bb5d52d72cd78c15a06480ef0a1b4fb771e70074 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Mon, 24 Sep 2018 15:39:19 -0700 Subject: [PATCH] Merge Azure Data Studio branding changes (#2689) * Bump Electron to 2.0.8 and SQL Ops to 0.33.3 (#2466) * Merged PR 328: Initial "Azure Data Studio" branding changes * Alanren/icon overwrite issue (#2484) * fix the error icon too large issue * formatting * add logic to hide and add grid panel based on size (#2481) * add grid styles (#2483) * Add check for potential failure in handling drag (#2499) * add check for potential failure in handling drag * move check to avoid ui glitches * Reorder Connection Name field in Connection Dialog (#2498) * change cursor in message panel to default (#2494) * add select all handler to grid (#2496) * Fix macOS titlebar branding * add animation when button is clicked and fix title in button (#2488) * add animation similar to toolbar in vscode and fix title in button * remove bur method in button * Disable the User Setup prompt (#2501) * fixes a rendering problem in splitview (#2512) * add listener to change action bar on maximize change (#2505) * fix the save and save all for untitled file (#2526) * add check for selection model in edit data (#2517) * add min size for row num column (#2518) * expand messages panel on error (#2519) * Selection in grid context (#2527) * update action context on selection change * correctly add ranges rather than a new range for every row * add required functions to typings * Fixes #2523 (#2528) The IdGenerator was recreated each time and had a high likelihood of conflicts. Invitably after adding dozens or hundreds of icons you'll start seeing the CSS class replaced and overridden. The solution is to do like elsewhere: have 1 const that is loaded on first import of the file and keeps a global track. Side note is that it'd be a good idea to cache CSS rules with the same iconPath so we don't create lots of additional rules unnecessarily. If we reuse the same icon a bunch we should cache them - #2524 is tracking this. * Fix grid gaps (#2531) * modifying grid gaps * reduce gaps and increase gap for action bar * fix grid action bar not updating (#2532) * Turn-off Git missing prompt (#2533) * Reduce message panel min size to 0 (#2534) * reduce message panel minimum size to 0; attempt to restore panel sizing on requery sizes; default grid panel size to 80% * formatting * Fix bug around debounced event not being flushed in time (#2536) * fix bug around debounced event not being flushed in time * add comment * Fix build break in Git extension (#2538) * Update SQL Ops to 0.33.4 * Fix sizing error when switching windows (#2544) * add work around for when we need to resize while we don't have a dimension to resize off of * formatting * change active cell during change to fix focus shift (#2545) * fix the account not found error when creating firewall rules (#2543) * Support isDirty flag for model view editors and begin plumb through of save support (#2547) * Add dirty and save support to model view * Add issue # for a TODO * add divcontainer in modelview (#2559) * add divcontainer in modelview * address comment * Bug/extension contribution (#2560) * revert 4ab5d84b9431b4a9cc23687fb2d9ecfc839f41c1 * fixed extensions * Merged PR 352: Switch settings folder back to .sqlops Switch settings folder back to .sqlops * fix the connection issue when opening new query after connection (#2561) * Update SQL Ops to 0.33.5 * Disabled connection name input when connecting to a server. (#2566) * Disabled connection name input when connecting to a server. #2557 * Fixed reset state of connection inputs * added context to chart buttons so they work (#2575) * accessibility setting based select database dropdown (#2579) * Maintain Query State (#2571) * add results view stating * working through the bugs * handle various resizing bugs * gnale resizing better * fix tests by adding missing node module * formatting * refactor interfaces out to get around testing restrictions * more refactoring of importants to avoid loading errors * use latest slickgrid library (#2584) * Add OE node refresh API method (#2578) * Initial working commit for refreshing OE node via API * Add test and fix up code * Run tsfmt * Fix test * Merged PR 356: Fix getDefaultLogLocation to use 'Azure Data Studio' Update getDefaultLogLocation to use 'Azure Data Studio' to fix Azure Account creation on macOS. * Update SQL Ops to 0.33.6 * Fix crash when reverting in edit data with no changes (#2594) * edit data issue with column index handling (#2595) * fixed insights crash (#2596) * Changed the "Configure" link to "Learn How To Configure The Dashboard". (#2599) * Changed the "Configure" link to "Learn How To Configure the Dashboard". This inlcudes the command as well as the tile label #1227 * Capitalizing first character in each word * The "New Query" context menu is now only available from the server & db (#2598) #1890 * Merged PR 366: Revert to using 'sqlops' so settings are maintained during upgraded Revert to using 'sqlops' so settings are maintained during upgraded * Merged PR 371: Fix casing for AZURE DATA STUDIO in EULA Fix casing for AZURE DATA STUDIO in EULA * Merged PR 375: Create new appid Create new appid * Merged PR 376: Update settings path back to 'azuredatastudio' Update settings path back to 'azuredatastudio' * Fix/bump dependency versions (#2608) * Use version 2.0.9 of electron (#2606) * fixes scrolling in query plan (#2609) * Dashboard: Fixed all insight bugs (#2612) * fixed all insight bugs * removed unused imports * added comment * add view area options to pick up chart background fix (#2613) * Respect message settings (#2614) * add results view stating * working through the bugs * handle various resizing bugs * gnale resizing better * add configuration to state * address comments * Fix stating for scrolls (#2615) * nearly working * add accounting for the downsides to slickgrid * Update SQL Ops to 0.33.7 * Added text underline CSS for DB NULL values when editing / showing data (#2597) * Added text underline CSS for DB NULL values when editing / showing data #217 * Changed db nulls styling to italic * Bug/oetimeout Fix - When timeout happens while fetching node children, the node becomes unusable (#2616) This commit fixes issue when multiple OE nodes are expanded simultaneously. While the error was getting displayed the node was left in incorrect state which was leading to the node being unusable in future. This commit repairs this defect. * fixed actual show plan command (#2620) * Bump SQL Tools Service to 1.5.0-alpha.34 (#2621) * Feat/add dom component (#2622) * add dom component for model view * formatting * make css style hardcoded in dom.component * comment out the unused CSS * address comments * address comment * Hide tabs on reexecute (#2624) * add logic to hide tabs when a query rerun is executed * remove double entry in the map * Bump Azure Data Studio to 1.0.0 * Bump Azure Data Studio to 0.33.8 * Scroll query editor when clicking batch links (#2644) * Fix broken 'Clear Token Cache' command (#2643) * fixed right click context menu bug in jobs view (#2632) * fix css issue (#2650) * reload the chart types when we actually need it (#2651) * Bump Azure Data Studio to 1.0.0 * Fix chart error that caused query editor to close (#2652) * Bump Agent, Import and Profiler extension versions --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .vscode/launch.json | 16 +++---- CHANGELOG.md | 14 +++--- CONTRIBUTING.md | 22 +++++----- LICENSE.txt | 2 +- ThirdPartyNotices.txt | 2 +- build/gulpfile.vscode.js | 19 ++++---- build/gulpfile.vscode.linux.js | 6 +-- build/gulpfile.vscode.win32.js | 2 +- build/package.json | 2 +- build/win32/code.iss | 14 +++--- extensions/account-provider-azure/src/main.ts | 2 +- extensions/agent/README.md | 6 +-- extensions/agent/package.json | 6 +-- extensions/git/src/autofetch.ts | 2 +- extensions/git/src/main.ts | 2 +- extensions/import/README.md | 10 ++--- extensions/import/package.json | 8 ++-- extensions/import/src/constants.ts | 2 +- .../import/src/services/serviceUtils.ts | 2 +- extensions/merge-conflict/README.md | 2 +- extensions/mssql/src/constants.ts | 2 +- extensions/mssql/src/utils.ts | 2 +- extensions/profiler/README.md | 16 +++---- extensions/profiler/package.json | 8 ++-- extensions/theme-carbon/package.json | 12 ++--- .../theme-carbon/themes/dark_carbon.json | 2 +- .../theme-carbon/themes/light_carbon.json | 2 +- issue_template.md | 2 +- package.json | 8 ++-- product.json | 44 +++++++++---------- resources/linux/bin/code.sh | 2 +- resources/linux/code.appdata.xml | 6 +-- resources/linux/code.desktop | 2 +- resources/linux/debian/control.template | 6 +-- resources/xlf/sqlops-core/sql.xlf | 2 +- samples/extensionSamples/.vscodeignore | 2 +- samples/extensionSamples/LICENSE.txt | 2 +- samples/extensionSamples/package.json | 2 +- samples/extensionSamples/tasks/buildtasks.js | 8 ++-- samples/serverReports/.vscode/launch.json | 16 +++---- samples/serverReports/.vscodeignore | 2 +- samples/serverReports/LICENSE.txt | 2 +- samples/serverReports/README.md | 12 ++--- samples/serverReports/package.json | 2 +- samples/serverReports/tasks/buildtasks.js | 8 ++-- samples/sp_whoIsActive/.vscode/launch.json | 14 +++--- samples/sp_whoIsActive/.vscodeignore | 2 +- samples/sp_whoIsActive/LICENSE.txt | 2 +- samples/sp_whoIsActive/README.md | 20 ++++----- samples/sp_whoIsActive/package.json | 4 +- samples/sp_whoIsActive/tasks/buildtasks.js | 8 ++-- samples/sqlservices/.vscode/launch.json | 12 ++--- samples/sqlservices/package.json | 2 +- samples/sqlservices/sql/query.sql | 2 +- samples/sqlservices/tasks/buildtasks.js | 10 ++--- src/paths.js | 3 +- .../firewallRuleDialog/firewallRuleDialog.ts | 2 +- .../common/registeredServer.contribution.ts | 2 +- .../dialog/profilerColumnEditorDialog.ts | 4 +- .../modules/angular2-slickgrid/typings.json | 2 +- .../issue/issueReporterModel.ts | 2 +- .../issue/issueReporterPage.ts | 2 +- .../issue/test/testReporterModel.test.ts | 4 +- .../node/extensionManagementService.ts | 2 +- .../electron-main/updateService.win32.ts | 2 +- .../browser/parts/editor/editorStatus.ts | 4 +- .../electron-browser/extensionTipsService.ts | 4 +- .../node/extensionsWorkbenchService.ts | 2 +- .../electron-browser/feedbackStatusbarItem.ts | 4 +- .../electron-browser/localizationsActions.ts | 4 +- .../parts/preferences/common/preferences.ts | 2 +- .../electron-browser/telemetryOptOut.ts | 4 +- .../configuration/common/configuration.ts | 2 +- .../configurationEditingService.test.ts | 2 +- .../configurationService.test.ts | 2 +- .../textfile/common/textFileEditorModel.ts | 4 +- .../electron-browser/workbenchThemeService.ts | 2 +- 78 files changed, 227 insertions(+), 225 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f0dda317de..9e8bfc04a3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,7 +7,7 @@ about: Create a report to help us improve -- SQL Operations Studio Version: +- Azure Data Studio Version: Steps to Reproduce: diff --git a/.vscode/launch.json b/.vscode/launch.json index 9a4c86bff1..d3e8009964 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -66,13 +66,13 @@ { "type": "chrome", "request": "attach", - "name": "Attach to sqlops", + "name": "Attach to azuredatastudio", "port": 9222 }, { "type": "chrome", "request": "launch", - "name": "Launch sqlops", + "name": "Launch azuredatastudio", "windows": { "runtimeExecutable": "${workspaceFolder}/scripts/sql.bat" }, @@ -98,12 +98,12 @@ "name": "Unit Tests", "protocol": "inspector", "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha", - "runtimeExecutable": "${workspaceFolder}/.build/electron/SQL Operations Studio.app/Contents/MacOS/Electron", + "runtimeExecutable": "${workspaceFolder}/.build/electron/Azure Data Studio.app/Contents/MacOS/Electron", "windows": { - "runtimeExecutable": "${workspaceFolder}/.build/electron/sqlops.exe" + "runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio.exe" }, "linux": { - "runtimeExecutable": "${workspaceFolder}/.build/electron/sqlops" + "runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio" }, "stopOnEntry": false, "outputCapture": "std", @@ -132,16 +132,16 @@ ], "compounds": [ { - "name": "Debug sqlops Main and Renderer", + "name": "Debug azuredatastudio Main and Renderer", "configurations": [ - "Launch sqlops", + "Launch azuredatastudio", "Attach to Main Process" ] }, { "name": "Search and Renderer processes", "configurations": [ - "Launch sqlops", + "Launch azuredatastudio", "Attach to Search Process" ] }, diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ee4106f3b..76c2b13e94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,13 +53,13 @@ We would like to thank all our users who raised issues, and in particular the fo * Release status: Public Preview ## What's new in this version -* SQL Server Agent for SQL Operations Studio extension improvements +* SQL Server Agent for Azure Data Studio extension improvements * Added view of Alerts, Operators, and Proxies and icons on left pane * Added dialogs for New Job, New Job Step, New Alert, and New Operator * Added Delete Job, Delete Alert, and Delete Operator (right-click) * Added Previous Runs visualization * Added Filters for each column name -* SQL Server Profiler for SQL Operations Studio extension improvements +* SQL Server Profiler for Azure Data Studio extension improvements * Added Hotkeys to quickly launch and start/stop Profiler * Added 5 Default Templates to view Extended Events * Added Server/Database connection name @@ -74,10 +74,10 @@ We would like to thank all our users who raised issues, and in particular the fo * Release status: Public Preview ## What's new in this version -* **SQL Server Profiler for SQL Operations Studio *Preview*** extension initial release +* **SQL Server Profiler for Azure Data Studio *Preview*** extension initial release * The new **SQL Data Warehouse** extension includes rich customizable dashboard widgets surfacing insights to your data warehouse. This unlocks key scenarios around managing and tuning your data warehouse to ensure it is optimized for consistent performance. * **Edit Data "Filtering and Sorting"** support -* **SQL Server Agent for SQL Operations Studio *Preview*** extension enhancements for Jobs and Job History views +* **SQL Server Agent for Azure Data Studio *Preview*** extension enhancements for Jobs and Job History views * Improved **Wizard & Dialog UI Builder Framework** extensibility APIs * Update VS Code Platform source code integrating [March 2018 (1.22)](https://code.visualstudio.com/updates/v1_22) and [April 2018 (1.23)](https://code.visualstudio.com/updates/v1_23) releases * Fix GitHub Issues @@ -91,7 +91,7 @@ The May release is focused on stabilization and bug fixes leading up to the Buil * Announcing **Redgate SQL Search** extension available in Extension Manager * Community Localization available for 10 languages: **German, Spanish, French, Italian, Japanese, Korean, Portuguese, Russian, Simplified Chinese and Traditional Chinese!** -* Reduced telemetry collection, improved [opt-out](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement) +* Reduced telemetry collection, improved [opt-out](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement) * Extension Manager has improved Marketplace experience to easily discover community extensions * SQL Agent extension Jobs and Job History view improvement * Updates for **whoisactive** and **Server Reports** extensions @@ -117,8 +117,8 @@ The April Public Preview release contains some of the following highlights. * Release status: Public Preview ## What's new in this version -The March Public Preview release enables some key aspects of the SQL Operations -Studio extensibility story. Here are some highlights in this release. +The March Public Preview release enables some key aspects of the Azure Data Studio +extensibility story. Here are some highlights in this release. * Enhance the Manage Dashboard extensibility model to support tabbed Insights and Configuration panes * Dashboard Insights extensions for `sp_whoisactive` from [whoisactive.com](http://whoisactive.com) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9d7d569d7f..df1ec0efa4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ ## Contributing Issues ### Before Submitting an Issue -First, please do a search in [open issues](https://github.com/Microsoft/sqlopsstudio/issues) to see if the issue or feature request has already been filed. Use this [query](https://github.com/Microsoft/sqlopsstudio/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc) to search for the most popular feature requests. +First, please do a search in [open issues](https://github.com/Microsoft/azuredatastudio/issues) to see if the issue or feature request has already been filed. Use this [query](https://github.com/Microsoft/azuredatastudio/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc) to search for the most popular feature requests. If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment. @@ -18,29 +18,29 @@ File a single issue per problem and feature request. * Do not enumerate multiple bugs or feature requests in the same issue. * Do not add your issue as a comment to an existing issue unless it's for the identical input. Many issues look similar, but have different causes. -The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix. +The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix. -Please include the following with each issue. +Please include the following with each issue. * Version of SQL Ops Studio -> **Tip:** You can easily create an issue using `Report Issues` from SQL Operations Studio Help menu. +> **Tip:** You can easily create an issue using `Report Issues` from Azure Data Studio Help menu. -* Reproducible steps (1... 2... 3...) and what you expected versus what you actually saw. -* Images, animations, or a link to a video. -* A code snippet that demonstrates the issue or a link to a code repository we can easily pull down onto our machine to recreate the issue. +* Reproducible steps (1... 2... 3...) and what you expected versus what you actually saw. +* Images, animations, or a link to a video. +* A code snippet that demonstrates the issue or a link to a code repository we can easily pull down onto our machine to recreate the issue. -> **Note:** Because we need to copy and paste the code snippet, including a code snippet as a media file (i.e. .gif) is not sufficient. +> **Note:** Because we need to copy and paste the code snippet, including a code snippet as a media file (i.e. .gif) is not sufficient. * Errors in the Dev Tools Console (Help | Toggle Developer Tools) Please remember to do the following: -* Search the issue repository to see if there exists a duplicate. -* Simplify your scripts around the issue so we can better isolate the problem. +* Search the issue repository to see if there exists a duplicate. +* Simplify your scripts around the issue so we can better isolate the problem. Don't feel bad if we can't reproduce the issue and ask for more information! ## Contributing Fixes If you are interested in fixing issues and contributing directly to the code base, -please see the document [How to Contribute](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute). +please see the document [How to Contribute](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Contribute). diff --git a/LICENSE.txt b/LICENSE.txt index 45c3fa304a..ca9b88151f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ MICROSOFT SOFTWARE LICENSE TERMS -MICROSOFT SQL OPERATIONS STUDIO +MICROSOFT AZURE DATA STUDIO Microsoft Corporation ("Microsoft") grants you a nonexclusive, perpetual, royalty-free right to use, copy, and modify the software code provided by us diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index a9c3981bdf..7b4d414763 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -1,4 +1,4 @@ -MICROSOFT SQL OPERATIONS STUDIO +MICROSOFT Azure Data Studio THIRD-PARTY SOFTWARE NOTICES AND INFORMATION Do Not Translate or Localize diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index ef754bdc2c..51422b2a29 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -208,7 +208,7 @@ function getElectron(arch) { }); return gulp.src('package.json') - .pipe(json({ name: product.nameShort })) + .pipe(json({ name: product.nameShort })) .pipe(electron(electronOpts)) .pipe(filter(['**', '!**/app/package.json'])) .pipe(vfs.dest('.build/electron')); @@ -280,7 +280,7 @@ function packageTask(platform, arch, opts) { opts = opts || {}; // {{SQL CARBON EDIT}} - const destination = path.join(path.dirname(root), 'sqlops') + (platform ? '-' + platform : '') + (arch ? '-' + arch : ''); + const destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : ''); platform = platform || process.platform; return () => { @@ -338,7 +338,8 @@ function packageTask(platform, arch, opts) { version += '-' + quality; } - const name = product.nameShort; + // {{SQL CARBON EDIT}} + const name = (platform === 'darwin') ? 'Azure Data Studio' : product.nameShort; const packageJsonStream = gulp.src(['package.json'], { base: '.' }) .pipe(json({ name, version })); @@ -460,12 +461,12 @@ function packageTask(platform, arch, opts) { const buildRoot = path.dirname(root); // {{SQL CARBON EDIT}} -gulp.task('clean-vscode-win32-ia32', util.rimraf(path.join(buildRoot, 'sqlops-win32-ia32'))); -gulp.task('clean-vscode-win32-x64', util.rimraf(path.join(buildRoot, 'sqlops-win32-x64'))); -gulp.task('clean-vscode-darwin', util.rimraf(path.join(buildRoot, 'sqlops-darwin'))); -gulp.task('clean-vscode-linux-ia32', util.rimraf(path.join(buildRoot, 'sqlops-linux-ia32'))); -gulp.task('clean-vscode-linux-x64', util.rimraf(path.join(buildRoot, 'sqlops-linux-x64'))); -gulp.task('clean-vscode-linux-arm', util.rimraf(path.join(buildRoot, 'sqlops-linux-arm'))); +gulp.task('clean-vscode-win32-ia32', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-ia32'))); +gulp.task('clean-vscode-win32-x64', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-x64'))); +gulp.task('clean-vscode-darwin', util.rimraf(path.join(buildRoot, 'azuredatastudio-darwin'))); +gulp.task('clean-vscode-linux-ia32', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-ia32'))); +gulp.task('clean-vscode-linux-x64', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-x64'))); +gulp.task('clean-vscode-linux-arm', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-arm'))); gulp.task('vscode-win32-ia32', ['optimize-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32')); gulp.task('vscode-win32-x64', ['optimize-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64')); diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js index 2f5961207b..9db1b79b0c 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js @@ -24,7 +24,7 @@ function getDebPackageArch(arch) { function prepareDebPackage(arch) { // {{SQL CARBON EDIT}} - const binaryDir = '../sqlops-linux-' + arch; + const binaryDir = '../azuredatastudio-linux-' + arch; const debArch = getDebPackageArch(arch); const destination = '.build/linux/deb/' + debArch + '/' + product.applicationName + '-' + debArch; @@ -104,7 +104,7 @@ function getRpmPackageArch(arch) { function prepareRpmPackage(arch) { // {{SQL CARBON EDIT}} - const binaryDir = '../sqlops-linux-' + arch; + const binaryDir = '../azuredatastudio-linux-' + arch; const rpmArch = getRpmPackageArch(arch); return function () { @@ -213,7 +213,7 @@ function getFlatpakArch(arch) { function prepareFlatpak(arch) { // {{SQL CARBON EDIT}} - const binaryDir = '../sqlops-linux-' + arch; + const binaryDir = '../azuredatastudio-linux-' + arch; const flatpakArch = getFlatpakArch(arch); const destination = '.build/linux/flatpak/' + flatpakArch; diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js index d2442abf91..4f11053156 100644 --- a/build/gulpfile.vscode.win32.js +++ b/build/gulpfile.vscode.win32.js @@ -19,7 +19,7 @@ const mkdirp = require('mkdirp'); const repoPath = path.dirname(__dirname); // {{SQL CARBON EDIT}} -const buildPath = arch => path.join(path.dirname(repoPath), `sqlops-win32-${arch}`); +const buildPath = arch => path.join(path.dirname(repoPath), `azuredatastudio-win32-${arch}`); const zipDir = arch => path.join(repoPath, '.build', `win32-${arch}`, 'archive'); const zipPath = arch => path.join(zipDir(arch), `VSCode-win32-${arch}.zip`); const setupDir = (arch, target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`); diff --git a/build/package.json b/build/package.json index de340731cf..4042420fe1 100644 --- a/build/package.json +++ b/build/package.json @@ -1,5 +1,5 @@ { - "name": "sqlops-oss-dev-build", + "name": "azuredatastudio-oss-dev-build", "version": "1.0.0", "devDependencies": { "@types/azure": "0.9.19", diff --git a/build/win32/code.iss b/build/win32/code.iss index 2219d8fe8e..ceab15a7f7 100644 --- a/build/win32/code.iss +++ b/build/win32/code.iss @@ -8,14 +8,14 @@ AppId={#AppId} AppName={#NameLong} AppVerName={#NameVersion} AppPublisher=Microsoft Corporation -AppPublisherURL=https://github.com/Microsoft/sqlopsstudio -AppSupportURL=https://github.com/Microsoft/sqlopsstudio -AppUpdatesURL=https://github.com/Microsoft/sqlopsstudio +AppPublisherURL=https://github.com/Microsoft/azuredatastudio +AppSupportURL=https://github.com/Microsoft/azuredatastudio +AppUpdatesURL=https://github.com/Microsoft/azuredatastudio DefaultGroupName={#NameLong} AllowNoIcons=yes OutputDir={#OutputDir} -OutputBaseFilename=SqlOpsStudioSetup +OutputBaseFilename=AzureDataStudioSetup Compression=lzma SolidCompression=yes AppMutex={code:GetAppMutex} @@ -180,9 +180,9 @@ begin Result := not IsBackgroundUpdate(); end; -// SqlOps will create a flag file before the update starts (/update=C:\foo\bar) -// - if the file exists at this point, the user quit SqlOps before the update finished, so don't start SqlOps after update -// - otherwise, the user has accepted to apply the update and SqlOps should start +// AzureDataStudio will create a flag file before the update starts (/update=C:\foo\bar) +// - if the file exists at this point, the user quit AzureDataStudio before the update finished, so don't start AzureDataStudio after update +// - otherwise, the user has accepted to apply the update and AzureDataStudio should start function LockFileExists(): Boolean; begin Result := FileExists(ExpandConstant('{param:update}')) diff --git a/extensions/account-provider-azure/src/main.ts b/extensions/account-provider-azure/src/main.ts index ddbffff2f0..d20abf8d41 100644 --- a/extensions/account-provider-azure/src/main.ts +++ b/extensions/account-provider-azure/src/main.ts @@ -26,7 +26,7 @@ export function getAppDataPath() { } export function getDefaultLogLocation() { - return path.join(getAppDataPath(), 'sqlops'); + return path.join(getAppDataPath(), 'azuredatastudio'); } // EXTENSION ACTIVATION //////////////////////////////////////////////////// diff --git a/extensions/agent/README.md b/extensions/agent/README.md index 412aeec3e7..c633af2354 100644 --- a/extensions/agent/README.md +++ b/extensions/agent/README.md @@ -1,6 +1,6 @@ -# Microsoft SQL Server Agent for SQL Operations Studio +# Microsoft SQL Server Agent for Azure Data Studio -Welcome to Microsoft SQL Server Agent for SQL Operations Studio! An extension for managing and troubleshooting +Welcome to Microsoft SQL Server Agent for Azure Data Studio! An extension for managing and troubleshooting SQL Server Agent jobs and configuration. The current is an early release of this extension that provides basic functionality for the following. @@ -22,4 +22,4 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt). +Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt). diff --git a/extensions/agent/package.json b/extensions/agent/package.json index 331ddd715b..fbbb9541d7 100644 --- a/extensions/agent/package.json +++ b/extensions/agent/package.json @@ -2,10 +2,10 @@ "name": "agent", "displayName": "SQL Server Agent", "description": "Manage and troubleshoot SQL Server Agent jobs", - "version": "0.32.7", + "version": "0.33.0", "publisher": "Microsoft", "preview": true, - "license": "https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt", + "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", "icon": "images/sqlserver.png", "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "engines": { @@ -17,7 +17,7 @@ "main": "./out/main", "repository": { "type": "git", - "url": "https://github.com/Microsoft/sqlopsstudio.git" + "url": "https://github.com/Microsoft/azuredatastudio.git" }, "extensionDependencies": [ "Microsoft.mssql" diff --git a/extensions/git/src/autofetch.ts b/extensions/git/src/autofetch.ts index 01692a531b..bf47a3132f 100644 --- a/extensions/git/src/autofetch.ts +++ b/extensions/git/src/autofetch.ts @@ -57,7 +57,7 @@ export class AutoFetcher { const no: MessageItem = { isCloseAffordance: true, title: localize('no', "No") }; const askLater: MessageItem = { title: localize('not now', "Ask Me Later") }; // {{SQL CARBON EDIT}} - const result = await window.showInformationMessage(localize('suggest auto fetch', "Would you like SQL Operations Studio to [periodically run 'git fetch']({0})?", 'https://go.microsoft.com/fwlink/?linkid=865294'), yes, no, askLater); + const result = await window.showInformationMessage(localize('suggest auto fetch', "Would you like Azure Data Studio to [periodically run 'git fetch']({0})?", 'https://go.microsoft.com/fwlink/?linkid=865294'), yes, no, askLater); if (result === askLater) { return; diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts index a1cd0e236e..df40436081 100644 --- a/extensions/git/src/main.ts +++ b/extensions/git/src/main.ts @@ -129,7 +129,7 @@ export async function activate(context: ExtensionContext): Promise { async function checkGitVersion(info: IGit): Promise { // {{SQL CARBON EDIT}} - // remove Git version check for sqlops + // remove Git version check for azuredatastudio return; diff --git a/extensions/import/README.md b/extensions/import/README.md index 8315a9f7c1..641f75dc73 100644 --- a/extensions/import/README.md +++ b/extensions/import/README.md @@ -1,6 +1,6 @@ -# Microsoft SQL Server Import for SQL Operations Studio +# Microsoft SQL Server Import for Azure Data Studio -Microsoft SQL Server Import for SQL Operations Studio is a simple way to copy data from a flat file (.csv, .txt, .json) to a SQL Server table. Checkout below the reasons for using the Import Flat File wizard, how to find this wizard, and a simple example. +Microsoft SQL Server Import for Azure Data Studio is a simple way to copy data from a flat file (.csv, .txt, .json) to a SQL Server table. Checkout below the reasons for using the Import Flat File wizard, how to find this wizard, and a simple example. @@ -8,9 +8,9 @@ Microsoft SQL Server Import for SQL Operations Studio is a simple way to copy da Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the [MICROSOFT SQL SERVER IMPORT EXTENSION EULA](https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx). +Licensed under the [MICROSOFT SQL SERVER IMPORT EXTENSION EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx). -> Note: Microsoft SQL Server Import for SQL Operations Studio extension contains the Microsoft SQL Tools Import Flat File component which is also licensed under the above EULA. +> Note: Microsoft SQL Server Import for Azure Data Studio extension contains the Microsoft SQL Tools Import Flat File component which is also licensed under the above EULA. ## Requirements * This wizard requires an active connection to a SQL Server instance to start. @@ -25,7 +25,7 @@ Licensed under the [MICROSOFT SQL SERVER IMPORT EXTENSION EULA](https://raw.gith PROSE analyzes data patterns in your input file to infer column names, types, delimiters, and more. This framework learns the structure of the file and does all of the hard work so users don't have to. - Please note that the PROSE binary components used by this extension are licensed under the [MICROSOFT SQL TOOLS IMPORT FLAT FILE EULA](https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx). + Please note that the PROSE binary components used by this extension are licensed under the [MICROSOFT SQL TOOLS IMPORT FLAT FILE EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx). ## Code of Conduct diff --git a/extensions/import/package.json b/extensions/import/package.json index 1bb2264c85..833a016b14 100644 --- a/extensions/import/package.json +++ b/extensions/import/package.json @@ -1,15 +1,15 @@ { "name": "import", "displayName": "SQL Server Import", - "description": "SQL Server Import for SQL Operations Studio supports importing CSV or JSON files into SQL Server.", - "version": "0.1.0", + "description": "SQL Server Import for Azure Data Studio supports importing CSV or JSON files into SQL Server.", + "version": "0.2.0", "publisher": "Microsoft", "preview": true, "engines": { "vscode": "^1.25.0", "sqlops": "*" }, - "license": "https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx", + "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx", "icon": "images/sqlserver.png", "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "activationEvents": [ @@ -18,7 +18,7 @@ "main": "./out/main", "repository": { "type": "git", - "url": "https://github.com/Microsoft/sqlopsstudio.git" + "url": "https://github.com/Microsoft/azuredatastudio.git" }, "extensionDependencies": [ "Microsoft.mssql" diff --git a/extensions/import/src/constants.ts b/extensions/import/src/constants.ts index 481a4dec1c..463edd136a 100644 --- a/extensions/import/src/constants.ts +++ b/extensions/import/src/constants.ts @@ -10,5 +10,5 @@ export const providerId = 'FlatFileImport'; export const configLogDebugInfo = 'logDebugInfo'; export const sqlConfigSectionName = 'sql'; -export const serviceCrashLink = 'https://github.com/Microsoft/sqlopsstudio/issues/2090'; +export const serviceCrashLink = 'https://github.com/Microsoft/azuredatastudio/issues/2090'; diff --git a/extensions/import/src/services/serviceUtils.ts b/extensions/import/src/services/serviceUtils.ts index efe740c2e1..1c1d642fe4 100644 --- a/extensions/import/src/services/serviceUtils.ts +++ b/extensions/import/src/services/serviceUtils.ts @@ -23,7 +23,7 @@ export function getAppDataPath(): string { } export function getDefaultLogLocation(): string { - return path.join(getAppDataPath(), 'sqlops'); + return path.join(getAppDataPath(), 'azuredatastudio'); } export function ensure(target: object, key: string): any { diff --git a/extensions/merge-conflict/README.md b/extensions/merge-conflict/README.md index 1fa82d7b0c..10acdcde54 100644 --- a/extensions/merge-conflict/README.md +++ b/extensions/merge-conflict/README.md @@ -1,6 +1,6 @@ # Merge Conflict -**Notice:** This extension is bundled with SQL Operations Stuido. It can be disabled but not uninstalled. +**Notice:** This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled. ## Features diff --git a/extensions/mssql/src/constants.ts b/extensions/mssql/src/constants.ts index 154deca05d..0503be5bf1 100644 --- a/extensions/mssql/src/constants.ts +++ b/extensions/mssql/src/constants.ts @@ -6,7 +6,7 @@ export const serviceName = 'SqlToolsService'; export const providerId = 'MSSQL'; -export const serviceCrashMessage = 'SQL Tools Service component exited unexpectedly. Please restart SQL Operations Studio.'; +export const serviceCrashMessage = 'SQL Tools Service component exited unexpectedly. Please restart Azure Data Studio.'; export const serviceCrashButton = 'View Known Issues'; export const serviceCrashLink = 'https://github.com/Microsoft/vscode-mssql/wiki/SqlToolsService-Known-Issues'; export const configLogDebugInfo = 'logDebugInfo'; diff --git a/extensions/mssql/src/utils.ts b/extensions/mssql/src/utils.ts index 5cba569b5d..0f4f8b932c 100644 --- a/extensions/mssql/src/utils.ts +++ b/extensions/mssql/src/utils.ts @@ -21,7 +21,7 @@ export function getAppDataPath() { } export function getDefaultLogLocation() { - return path.join(getAppDataPath(), 'sqlops'); + return path.join(getAppDataPath(), 'azuredatastudio'); } export function ensure(target: object, key: string): any { diff --git a/extensions/profiler/README.md b/extensions/profiler/README.md index a326ccfdab..8833db884e 100644 --- a/extensions/profiler/README.md +++ b/extensions/profiler/README.md @@ -1,6 +1,6 @@ -# SQL Server Profiler for SQL Operations Studio +# SQL Server Profiler for Azure Data Studio -Welcome to the SQL Server Profiler for SQL Operations Studio! The SQL Server Profiler extension provides a simple SQL Server tracing solution similar to SSMS Profiler except built using XEvents. SSMS Profiler is very easy to use and has good default values for the most common tracing configurations. The UX is optimized for browsing through events and viewing the associated T-SQL text. The SQL Server Profiler for SQL Operations Studio also assumes good default values for collecting T-SQL execution activities with an easy to use UX. +Welcome to the SQL Server Profiler for Azure Data Studio! The SQL Server Profiler extension provides a simple SQL Server tracing solution similar to SSMS Profiler except built using XEvents. SSMS Profiler is very easy to use and has good default values for the most common tracing configurations. The UX is optimized for browsing through events and viewing the associated T-SQL text. The SQL Server Profiler for Azure Data Studio also assumes good default values for collecting T-SQL execution activities with an easy to use UX. Common SQL Profiler use-cases taken from https://docs.microsoft.com/en-us/sql/tools/sql-server-profiler/sql-server-profiler. @@ -12,17 +12,17 @@ Common SQL Profiler use-cases taken from https://docs.microsoft.com/en-us/sql/to ## Getting Started: To launch SQL Server Profiler, you have to first make a connection to a server. - + Open Profiler by pressing **Alt+P** on Windows, and **Ctrl+Alt+P** on macOS. - + To Start/Stop Profiler, click the Start button or press **Alt+S** on Windows, or **Ctrl+Alt+S** on macOS. - + Otherwise, open the command palette and type 'Profiler.' - + For more info, [check out our documentation.](https://docs.microsoft.com/en-us/sql/sql-operations-studio/sql-server-profiler-extension?view=sql-server-2017) ## SQL Server Profiler 0.1.1 Release -The SQL Server Profiler for SQL Operations Studio *Preview* extension is now available. This is the initial preview release for a new lightweight XEvent-based profiler. The SQL Server Profiler extension tries to make it simple to quickly trace server activity for troubleshooting and monitoring. +The SQL Server Profiler for Azure Data Studio *Preview* extension is now available. This is the initial preview release for a new lightweight XEvent-based profiler. The SQL Server Profiler extension tries to make it simple to quickly trace server activity for troubleshooting and monitoring. We'll continue to enhance this extension over the next couple releases. Take a look at the below screenshot to see what's currently available. @@ -40,4 +40,4 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt). +Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt). diff --git a/extensions/profiler/package.json b/extensions/profiler/package.json index 9db7e8ef44..3924d69b70 100644 --- a/extensions/profiler/package.json +++ b/extensions/profiler/package.json @@ -1,11 +1,11 @@ { "name": "profiler", "displayName": "SQL Server Profiler", - "description": "SQL Server Profiler for SQL Operations Studio", - "version": "0.1.5", + "description": "SQL Server Profiler for Azure Data Studio", + "version": "0.2.0", "publisher": "Microsoft", "preview": true, - "license": "https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt", + "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", "icon": "images/sqlserver.png", "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "engines": { @@ -20,7 +20,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/Microsoft/sqlopsstudio.git" + "url": "https://github.com/Microsoft/azuredatastudio.git" }, "extensionDependencies": [ "Microsoft.mssql" diff --git a/extensions/theme-carbon/package.json b/extensions/theme-carbon/package.json index 3792355e9e..bb675ff369 100644 --- a/extensions/theme-carbon/package.json +++ b/extensions/theme-carbon/package.json @@ -1,7 +1,7 @@ { "name": "theme-carbon", - "displayName": "SQL Operations Studio Themes", - "description": "The light and dark themes for SQL Operations Studio", + "displayName": "Azure Data Studio Themes", + "description": "The light and dark themes for Azure Data Studio", "version": "0.1.0", "publisher": "sql", "engines": { @@ -13,14 +13,14 @@ "contributes": { "themes": [ { - "id": "Default Light SQL Operations Studio", - "label": "Light SQL Operations Studio (default light)", + "id": "Default Light Azure Data Studio", + "label": "Light Azure Data Studio (default light)", "uiTheme": "vs", "path": "./themes/light_carbon.json" }, { - "id": "Default Dark SQL Operations Studio", - "label": "Dark SQL Operations Studio (default dark)", + "id": "Default Dark Azure Data Studio", + "label": "Dark Azure Data Studio (default dark)", "uiTheme": "vs-dark", "path": "./themes/dark_carbon.json" } diff --git a/extensions/theme-carbon/themes/dark_carbon.json b/extensions/theme-carbon/themes/dark_carbon.json index 4067cfd766..1f0285cc14 100644 --- a/extensions/theme-carbon/themes/dark_carbon.json +++ b/extensions/theme-carbon/themes/dark_carbon.json @@ -1,6 +1,6 @@ { "$schema": "vscode://schemas/color-theme", - "name": "SQL Operations Studio-dark-theme", + "name": "Azure Data Studio-dark-theme", "type": "dark", "colors": { diff --git a/extensions/theme-carbon/themes/light_carbon.json b/extensions/theme-carbon/themes/light_carbon.json index 34b52b5cec..fa2dc6183c 100644 --- a/extensions/theme-carbon/themes/light_carbon.json +++ b/extensions/theme-carbon/themes/light_carbon.json @@ -1,6 +1,6 @@ { "$schema": "vscode://schemas/color-theme", - "name": "SQL Operations Studio-light-theme", + "name": "Azure Data Studio-light-theme", "type": "light", "colors": { // base diff --git a/issue_template.md b/issue_template.md index c36276665a..0c1d84fc3b 100644 --- a/issue_template.md +++ b/issue_template.md @@ -1,4 +1,4 @@ -- SQL Operations Studio Version: +- Azure Data Studio Version: Steps to Reproduce: diff --git a/package.json b/package.json index b2ad676108..a7d09bde9a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "sqlops", - "version": "0.33.7", + "name": "azuredatastudio", + "version": "1.0.0", "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee", "author": { "name": "Microsoft Corporation" @@ -158,10 +158,10 @@ }, "repository": { "type": "git", - "url": "https://github.com/Microsoft/sqlopsstudio.git" + "url": "https://github.com/Microsoft/azuredatastudio.git" }, "bugs": { - "url": "https://github.com/Microsoft/sqlopsstudio/issues" + "url": "https://github.com/Microsoft/azuredatastudio/issues" }, "optionalDependencies": { "windows-foreground-love": "0.1.0", diff --git a/product.json b/product.json index 51d773b62f..2aab58a012 100644 --- a/product.json +++ b/product.json @@ -1,33 +1,33 @@ { - "nameShort": "sqlops", - "nameLong": "SQL Operations Studio", - "applicationName": "sqlops", - "dataFolderName": ".sqlops", - "win32MutexName": "sqlopsstudio", + "nameShort": "azuredatastudio", + "nameLong": "Azure Data Studio", + "applicationName": "azuredatastudio", + "dataFolderName": ".azuredatastudio", + "win32MutexName": "azuredatastudio", "licenseName": "Microsoft EULA", - "licenseUrl": "https://github.com/Microsoft/sqlopsstudio/blob/master/LICENSE.txt", - "win32DirName": "SQL Operations Studio", - "win32NameVersion": "SQL Operations Studio", - "win32RegValueName": "sqlops", - "win32AppId": "{{E34003BB-9E10-4501-8C11-1234AA83F23F}", - "win32x64AppId": "{{EA457B21-9E10-494C-ACAB-1234DE069978}", - "win32UserAppId": "{{C6065F05-9603-4FC4-8101-B9781A25D88E}", - "win32x64UserAppId": "{{C6065F05-9603-4FC4-8101-B9781A25D88E}", - "win32AppUserModelId": "Microsoft.sqlops", - "win32ShellNameShort": "SQL Operations Studio", - "darwinBundleIdentifier": "com.sqlopsstudio.oss", - "reportIssueUrl": "https://github.com/Microsoft/sqlopsstudio/issues/new?labels=customer%20reported%20issue", - "requestFeatureUrl": "https://github.com/Microsoft/sqlopsstudio/issues/new?labels=feature-request", + "licenseUrl": "https://github.com/Microsoft/azuredatastudio/blob/master/LICENSE.txt", + "win32DirName": "Azure Data Studio", + "win32NameVersion": "Azure Data Studio", + "win32RegValueName": "azuredatastudio", + "win32AppId": "{{760C8610-682F-4E9B-9C9C-4E1120308DF2}", + "win32x64AppId": "{{6591F69E-6588-4980-81ED-C8FCBD7EC4B8}", + "win32UserAppId": "{{EA2AB3AA-446D-450F-9948-AE5768C1161A}", + "win32x64UserAppId": "{{1F0FD1CE-9703-4734-8F50-5B5CEEDAE6B9}", + "win32AppUserModelId": "Microsoft.azuredatastudio", + "win32ShellNameShort": "Azure Data Studio", + "darwinBundleIdentifier": "com.azuredatastudio.oss", + "reportIssueUrl": "https://github.com/Microsoft/azuredatastudio/issues/new?labels=customer%20reported%20issue", + "requestFeatureUrl": "https://github.com/Microsoft/azuredatastudio/issues/new?labels=feature-request", "privacyStatementUrl": "https://privacy.microsoft.com/en-us/privacystatement", - "telemetryOptOutUrl": "https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Disable-Telemetry-Reporting", - "urlProtocol": "sqlops", + "telemetryOptOutUrl": "https://github.com/Microsoft/azuredatastudio/wiki/How-to-Disable-Telemetry-Reporting", + "urlProtocol": "azuredatastudio", "enableTelemetry": true, "aiConfig": { "asimovKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412" }, "sendASmile": { - "reportIssueUrl": "https://github.com/Microsoft/sqlopsstudio/issues/new?labels=customer%20reported%20issue", - "requestFeatureUrl": "https://github.com/Microsoft/sqlopsstudio/issues/new?labels=feature-request" + "reportIssueUrl": "https://github.com/Microsoft/azuredatastudio/issues/new?labels=customer%20reported%20issue", + "requestFeatureUrl": "https://github.com/Microsoft/azuredatastudio/issues/new?labels=feature-request" }, "gettingStartedUrl": "https://go.microsoft.com/fwlink/?linkid=862039", "releaseNotesUrl": "https://go.microsoft.com/fwlink/?linkid=875578", diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh index ba704649ff..47ea0587cc 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh @@ -12,7 +12,7 @@ if [ "$(id -u)" = "0" ]; then fi done if [ -z $CAN_LAUNCH_AS_ROOT ]; then - echo "You are trying to start SQL Operations Studio as a super user which is not recommended. If you really want to, you must specify an alternate user data directory using the --user-data-dir argument." 1>&2 + echo "You are trying to start Azure Data Studio as a super user which is not recommended. If you really want to, you must specify an alternate user data directory using the --user-data-dir argument." 1>&2 exit 1 fi fi diff --git a/resources/linux/code.appdata.xml b/resources/linux/code.appdata.xml index cd51e0f6d8..ab389a93d8 100644 --- a/resources/linux/code.appdata.xml +++ b/resources/linux/code.appdata.xml @@ -4,9 +4,9 @@ @@LICENSE@@ @@LICENSE@@ @@NAME_LONG@@ - https://github.com/microsoft/sqlopsstudio - SQL Operations Studio + https://github.com/microsoft/azuredatastudio + Azure Data Studio -

SQL Operations Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB, and SQL DW from Linux. See https://docs.microsoft.com/en-us/sql/sql-operations-studio/what-is for documentation.

+

Azure Data Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB, and SQL DW from Linux. See https://docs.microsoft.com/en-us/sql/sql-operations-studio/what-is for documentation.

 diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop index 389aacd45e..929171b0c6 100644 --- a/resources/linux/code.desktop +++ b/resources/linux/code.desktop @@ -10,7 +10,7 @@ StartupWMClass=@@NAME_SHORT@@ Categories=Utility;TextEditor;Development;IDE; MimeType=text/plain;inode/directory; Actions=new-empty-window; -Keywords=sqlops; +Keywords=azuredatastudio; [Desktop Action new-empty-window] Name=New Empty Window diff --git a/resources/linux/debian/control.template b/resources/linux/debian/control.template index 25ec0093f3..7d39cbbb6d 100644 --- a/resources/linux/debian/control.template +++ b/resources/linux/debian/control.template @@ -5,10 +5,10 @@ Depends: libnotify4, libnss3 (>= 2:3.26), gnupg, apt, libxkbfile1, libgconf-2-4, Priority: optional Architecture: @@ARCHITECTURE@@ Maintainer: Microsoft Corporation -Homepage: https://github.com/microsoft/sqlopsstudio +Homepage: https://github.com/microsoft/azuredatastudio Installed-Size: @@INSTALLEDSIZE@@ Provides: @@NAME@@ Conflicts: @@NAME@@ Replaces: @@NAME@@ -Description: SQL Operations Studio - SQL Operations Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB, and SQL DW from Linux. See https://docs.microsoft.com/en-us/sql/sql-operations-studio/what-is for documentation. +Description: Azure Data Studio + Azure Data Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB, and SQL DW from Linux. See https://docs.microsoft.com/en-us/sql/sql-operations-studio/what-is for documentation. diff --git a/resources/xlf/sqlops-core/sql.xlf b/resources/xlf/sqlops-core/sql.xlf index 17c819bfd8..da0ecd7c64 100644 --- a/resources/xlf/sqlops-core/sql.xlf +++ b/resources/xlf/sqlops-core/sql.xlf @@ -40,7 +40,7 @@ Startup Configuration - True for the Servers view to be shown on launch of SQL Operations Studio default; false if the last opened view should be shown + True for the Servers view to be shown on launch of Azure Data Studio default; false if the last opened view should be shown diff --git a/samples/extensionSamples/.vscodeignore b/samples/extensionSamples/.vscodeignore index d5d80b8d44..fc5246ef05 100644 --- a/samples/extensionSamples/.vscodeignore +++ b/samples/extensionSamples/.vscodeignore @@ -17,7 +17,7 @@ tsconfig.json .vscode/** .vscode-test/** .idea/** -.sqlops/** +.azuredatastudio/** # Reference files **/*.ts diff --git a/samples/extensionSamples/LICENSE.txt b/samples/extensionSamples/LICENSE.txt index 45c3fa304a..c2b9fcad0f 100644 --- a/samples/extensionSamples/LICENSE.txt +++ b/samples/extensionSamples/LICENSE.txt @@ -1,6 +1,6 @@ MICROSOFT SOFTWARE LICENSE TERMS -MICROSOFT SQL OPERATIONS STUDIO +MICROSOFT Azure Data Studio Microsoft Corporation ("Microsoft") grants you a nonexclusive, perpetual, royalty-free right to use, copy, and modify the software code provided by us diff --git a/samples/extensionSamples/package.json b/samples/extensionSamples/package.json index fb536970ab..8f4a2ecd4a 100644 --- a/samples/extensionSamples/package.json +++ b/samples/extensionSamples/package.json @@ -9,7 +9,7 @@ "sqlops": "*" }, "license": "SEE LICENSE IN LICENSE.txt", - "repository": "https://github.com/Microsoft/sqlopsstudio", + "repository": "https://github.com/Microsoft/azuredatastudio", "categories": [ "Other" ], diff --git a/samples/extensionSamples/tasks/buildtasks.js b/samples/extensionSamples/tasks/buildtasks.js index 794623fdb1..d1723c4d5e 100644 --- a/samples/extensionSamples/tasks/buildtasks.js +++ b/samples/extensionSamples/tasks/buildtasks.js @@ -99,14 +99,14 @@ gulp.task('test', (done) => { } process.env.JUNIT_REPORT_PATH = workspace + '/test-reports/ext_xunit.xml'; - let sqlopsPath = 'sqlops'; + let azuredatastudioPath = 'azuredatastudio'; if (process.env['SQLOPS_DEV']) { let suffix = os.platform === 'win32' ? 'bat' : 'sh'; - sqlopsPath = `${process.env['SQLOPS_DEV']}/scripts/sql-cli.${suffix}`; + azuredatastudioPath = `${process.env['SQLOPS_DEV']}/scripts/sql-cli.${suffix}`; } - console.log(`Using SQLOPS Path of ${sqlopsPath}`); + console.log(`Using SQLOPS Path of ${azuredatastudioPath}`); - cproc.exec(`${sqlopsPath} --extensionDevelopmentPath="${workspace}" --extensionTestsPath="${workspace}/out/test" --verbose`, (error, stdout, stderr) => { + cproc.exec(`${azuredatastudioPath} --extensionDevelopmentPath="${workspace}" --extensionTestsPath="${workspace}/out/test" --verbose`, (error, stdout, stderr) => { if (error) { console.error(`exec error: ${error}`); process.exit(1); diff --git a/samples/serverReports/.vscode/launch.json b/samples/serverReports/.vscode/launch.json index b94a4b988c..595d38d9c4 100644 --- a/samples/serverReports/.vscode/launch.json +++ b/samples/serverReports/.vscode/launch.json @@ -4,19 +4,19 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // To debug the extension: -// 1. please install the "SQL Operations Studio Debug" extension into VSCode -// 2. Ensure sqlops is added to your path: -// - open SQL Operations Studio -// - run the command "Install 'sqlops' command in PATH" +// 1. please install the "Azure Data Studio Debug" extension into VSCode +// 2. Ensure azuredatastudio is added to your path: +// - open Azure Data Studio +// - run the command "Install 'azuredatastudio' command in PATH" { "version": "0.2.0", "configurations": [ { - "name": "Debug in SqlOps install", - "type": "sqlopsExtensionHost", + "name": "Debug in AzureDataStudio install", + "type": "azuredatastudioExtensionHost", "request": "launch", - "runtimeExecutable": "sqlops", + "runtimeExecutable": "azuredatastudio", "args": [ "--extensionDevelopmentPath=${workspaceFolder}" ] @@ -37,7 +37,7 @@ }, { "name": "Debug in enlistment", - "type": "sqlopsExtensionHost", + "type": "azuredatastudioExtensionHost", "request": "launch", "windows": { "runtimeExecutable": "${workspaceFolder}/../../scripts/sql.bat" diff --git a/samples/serverReports/.vscodeignore b/samples/serverReports/.vscodeignore index d5d80b8d44..fc5246ef05 100644 --- a/samples/serverReports/.vscodeignore +++ b/samples/serverReports/.vscodeignore @@ -17,7 +17,7 @@ tsconfig.json .vscode/** .vscode-test/** .idea/** -.sqlops/** +.azuredatastudio/** # Reference files **/*.ts diff --git a/samples/serverReports/LICENSE.txt b/samples/serverReports/LICENSE.txt index 45c3fa304a..c2b9fcad0f 100644 --- a/samples/serverReports/LICENSE.txt +++ b/samples/serverReports/LICENSE.txt @@ -1,6 +1,6 @@ MICROSOFT SOFTWARE LICENSE TERMS -MICROSOFT SQL OPERATIONS STUDIO +MICROSOFT Azure Data Studio Microsoft Corporation ("Microsoft") grants you a nonexclusive, perpetual, royalty-free right to use, copy, and modify the software code provided by us diff --git a/samples/serverReports/README.md b/samples/serverReports/README.md index 31610759ce..019e8a14e6 100644 --- a/samples/serverReports/README.md +++ b/samples/serverReports/README.md @@ -1,6 +1,6 @@ -# Server Reports for SQL Operations Studio +# Server Reports for Azure Data Studio -Welcome to **Server Reports** for SQL Operations Studio! Server Reports give useful insights about the server related to performance. These can be used to see current activity as well as historical activity. Here is a list of some of the available reports. +Welcome to **Server Reports** for Azure Data Studio! Server Reports give useful insights about the server related to performance. These can be used to see current activity as well as historical activity. Here is a list of some of the available reports. * DB Space Usage * DB Buffer Usage @@ -8,17 +8,17 @@ Welcome to **Server Reports** for SQL Operations Studio! Server Reports give use * Backup Growth Trend * Wait counts -Server Reports +Server Reports This extension is inspired by SQL Server Management Studio (SSMS)'s reports. We will continually add more useful server insights and tasks. ## Building your own reports This extension is also useful as a sample dashboard extension. It demonstrates building a dedicated dashboard extension with a set of insights built in. You can get started building your own reports by following the [extension authoring guide]. -See the [Server Reports Extension Project] in the SQL Operations Studio repository on Github for the extension source code. +See the [Server Reports Extension Project] in the Azure Data Studio repository on Github for the extension source code. -[Server Reports Extension Project]:https://github.com/Microsoft/sqlopsstudio/tree/master/samples/serverReports -[extension authoring guide]:https://github.com/Microsoft/sqlopsstudio/wiki/Getting-started-with-Extensibility +[Server Reports Extension Project]:https://github.com/Microsoft/azuredatastudio/tree/master/samples/serverReports +[extension authoring guide]:https://github.com/Microsoft/azuredatastudio/wiki/Getting-started-with-Extensibility ## Contributions and "thank you" diff --git a/samples/serverReports/package.json b/samples/serverReports/package.json index 7ca9e7fc9b..918ff2400d 100644 --- a/samples/serverReports/package.json +++ b/samples/serverReports/package.json @@ -11,7 +11,7 @@ }, "icon": "images/sqlserver.png", "license": "SEE LICENSE IN LICENSE.txt", - "repository": "https://github.com/Microsoft/sqlopsstudio", + "repository": "https://github.com/Microsoft/azuredatastudio", "categories": [ "Other" ], diff --git a/samples/serverReports/tasks/buildtasks.js b/samples/serverReports/tasks/buildtasks.js index 794623fdb1..d1723c4d5e 100644 --- a/samples/serverReports/tasks/buildtasks.js +++ b/samples/serverReports/tasks/buildtasks.js @@ -99,14 +99,14 @@ gulp.task('test', (done) => { } process.env.JUNIT_REPORT_PATH = workspace + '/test-reports/ext_xunit.xml'; - let sqlopsPath = 'sqlops'; + let azuredatastudioPath = 'azuredatastudio'; if (process.env['SQLOPS_DEV']) { let suffix = os.platform === 'win32' ? 'bat' : 'sh'; - sqlopsPath = `${process.env['SQLOPS_DEV']}/scripts/sql-cli.${suffix}`; + azuredatastudioPath = `${process.env['SQLOPS_DEV']}/scripts/sql-cli.${suffix}`; } - console.log(`Using SQLOPS Path of ${sqlopsPath}`); + console.log(`Using SQLOPS Path of ${azuredatastudioPath}`); - cproc.exec(`${sqlopsPath} --extensionDevelopmentPath="${workspace}" --extensionTestsPath="${workspace}/out/test" --verbose`, (error, stdout, stderr) => { + cproc.exec(`${azuredatastudioPath} --extensionDevelopmentPath="${workspace}" --extensionTestsPath="${workspace}/out/test" --verbose`, (error, stdout, stderr) => { if (error) { console.error(`exec error: ${error}`); process.exit(1); diff --git a/samples/sp_whoIsActive/.vscode/launch.json b/samples/sp_whoIsActive/.vscode/launch.json index b94a4b988c..0952615fa9 100644 --- a/samples/sp_whoIsActive/.vscode/launch.json +++ b/samples/sp_whoIsActive/.vscode/launch.json @@ -4,19 +4,19 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // To debug the extension: -// 1. please install the "SQL Operations Studio Debug" extension into VSCode -// 2. Ensure sqlops is added to your path: -// - open SQL Operations Studio -// - run the command "Install 'sqlops' command in PATH" +// 1. please install the "Azure Data Studio Debug" extension into VSCode +// 2. Ensure azuredatastudio is added to your path: +// - open Azure Data Studio +// - run the command "Install 'azuredatastudio' command in PATH" { "version": "0.2.0", "configurations": [ { - "name": "Debug in SqlOps install", - "type": "sqlopsExtensionHost", + "name": "Debug in AzureDataStudio install", + "type": "azuredatastudioExtensionHost", "request": "launch", - "runtimeExecutable": "sqlops", + "runtimeExecutable": "azuredatastudio", "args": [ "--extensionDevelopmentPath=${workspaceFolder}" ] diff --git a/samples/sp_whoIsActive/.vscodeignore b/samples/sp_whoIsActive/.vscodeignore index d5d80b8d44..fc5246ef05 100644 --- a/samples/sp_whoIsActive/.vscodeignore +++ b/samples/sp_whoIsActive/.vscodeignore @@ -17,7 +17,7 @@ tsconfig.json .vscode/** .vscode-test/** .idea/** -.sqlops/** +.azuredatastudio/** # Reference files **/*.ts diff --git a/samples/sp_whoIsActive/LICENSE.txt b/samples/sp_whoIsActive/LICENSE.txt index 45c3fa304a..c2b9fcad0f 100644 --- a/samples/sp_whoIsActive/LICENSE.txt +++ b/samples/sp_whoIsActive/LICENSE.txt @@ -1,6 +1,6 @@ MICROSOFT SOFTWARE LICENSE TERMS -MICROSOFT SQL OPERATIONS STUDIO +MICROSOFT Azure Data Studio Microsoft Corporation ("Microsoft") grants you a nonexclusive, perpetual, royalty-free right to use, copy, and modify the software code provided by us diff --git a/samples/sp_whoIsActive/README.md b/samples/sp_whoIsActive/README.md index b6a995e0b4..50312d0b93 100644 --- a/samples/sp_whoIsActive/README.md +++ b/samples/sp_whoIsActive/README.md @@ -1,14 +1,14 @@ -# sp_whoisactive for SQL Operations Studio +# sp_whoisactive for Azure Data Studio -Welcome to **sp_whoisactive** for SQL Operations Studio! Sp_whoisactive is a procedure written by Adam Machanic, a Microsoft MVP for SQL Server. It is a very useful tool for activity monitoring and troubleshooting. This extension provides the insights provided by this tool as graphs and tasks inside a SQL Operations Studio dashboard extension. +Welcome to **sp_whoisactive** for Azure Data Studio! Sp_whoisactive is a procedure written by Adam Machanic, a Microsoft MVP for SQL Server. It is a very useful tool for activity monitoring and troubleshooting. This extension provides the insights provided by this tool as graphs and tasks inside a Azure Data Studio dashboard extension. ## Tasks and insights: -insights +insights Details: -insights +insights ## Why use sp_whoisactive? @@ -19,23 +19,23 @@ Here are some quick facts on Who is Active from [Adam Machanic’s blog]: * Who is Active was **designed with performance in mind** at every step; users report that under normal conditions response times are generally subsecond, with slightly longer response times on servers that are extremely taxed * Who is Active is **compatible with all versions of SQL Server after SQL Server 2005 RTM**. It does require that the host database (generally master) is not set for SQL Server 2000 compatibility mode -## Documentation: -If you haven't installed sp_whoisactive in your server, you can use the "Install sp_whoisactive" task to create the procedure. +## Documentation: +If you haven't installed sp_whoisactive in your server, you can use the "Install sp_whoisactive" task to create the procedure. See [sp_whoisactive Documentation] for more infomation. ## Building your own insights and tasks This extension is also useful as a sample dashboard extension. It demonstrates building a dedicated dashboard extension with a set of insights and tasks built in. You can get started building your own extension by following the [extension authoring guide]. -See [sp_whoisactive extension project] in the SQL Operations Studio for the extension source code. +See [sp_whoisactive extension project] in the Azure Data Studio for the extension source code. [Adam Machanic’s blog]:http://sqlblog.com/blogs/adam_machanic/default.aspx [sp_whoisactive Documentation]:http://whoisactive.com/ -[sp_whoisactive extension project]:https://github.com/Microsoft/sqlopsstudio/tree/master/samples/sp_whoIsActive -[extension authoring guide]:https://github.com/Microsoft/sqlopsstudio/wiki/Getting-started-with-Extensibility +[sp_whoisactive extension project]:https://github.com/Microsoft/azuredatastudio/tree/master/samples/sp_whoIsActive +[extension authoring guide]:https://github.com/Microsoft/azuredatastudio/wiki/Getting-started-with-Extensibility ## Contributions and "thank you" -Special thank to Adam Machanic for partnering with us and make this sp_whoisactive extension possible. +Special thank to Adam Machanic for partnering with us and make this sp_whoisactive extension possible. ## What's new in Server Reports v1.1? * Changed CPU usage, CPU delta, memory usage, memory delta to show only top 10 data diff --git a/samples/sp_whoIsActive/package.json b/samples/sp_whoIsActive/package.json index c571aa8ef7..bb7b014dc6 100644 --- a/samples/sp_whoIsActive/package.json +++ b/samples/sp_whoIsActive/package.json @@ -1,7 +1,7 @@ { "name": "whoisactive", "displayName": "whoisactive", - "description": "sp_whoisactive for SQL Operations Studio", + "description": "sp_whoisactive for Azure Data Studio", "version": "0.1.1", "publisher": "Microsoft", "preview": true, @@ -11,7 +11,7 @@ }, "icon": "images/sqlserver.png", "license": "SEE LICENSE IN LICENSE.txt", - "repository": "https://github.com/Microsoft/sqlopsstudio", + "repository": "https://github.com/Microsoft/azuredatastudio", "categories": [ "Other" ], diff --git a/samples/sp_whoIsActive/tasks/buildtasks.js b/samples/sp_whoIsActive/tasks/buildtasks.js index 6ccf0a80c8..c7ae904715 100644 --- a/samples/sp_whoIsActive/tasks/buildtasks.js +++ b/samples/sp_whoIsActive/tasks/buildtasks.js @@ -99,14 +99,14 @@ gulp.task('test', (done) => { } process.env.JUNIT_REPORT_PATH = workspace + '/test-reports/ext_xunit.xml'; - let sqlopsPath = 'sqlops'; + let azuredatastudioPath = 'azuredatastudio'; if (process.env['SQLOPS_DEV']) { let suffix = os.platform === 'win32' ? 'bat' : 'sh'; - sqlopsPath = `${process.env['SQLOPS_DEV']}/scripts/sql-cli.${suffix}`; + azuredatastudioPath = `${process.env['SQLOPS_DEV']}/scripts/sql-cli.${suffix}`; } - console.log(`Using SQLOPS Path of ${sqlopsPath}`); + console.log(`Using SQLOPS Path of ${azuredatastudioPath}`); - cproc.exec(`${sqlopsPath} --extensionDevelopmentPath="${workspace}" --extensionTestsPath="${workspace}/out/test" --verbose`, (error, stdout, stderr) => { + cproc.exec(`${azuredatastudioPath} --extensionDevelopmentPath="${workspace}" --extensionTestsPath="${workspace}/out/test" --verbose`, (error, stdout, stderr) => { if (error) { console.error(`exec error: ${error}`); process.exit(1); diff --git a/samples/sqlservices/.vscode/launch.json b/samples/sqlservices/.vscode/launch.json index b94a4b988c..278c5daaeb 100644 --- a/samples/sqlservices/.vscode/launch.json +++ b/samples/sqlservices/.vscode/launch.json @@ -4,19 +4,19 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // To debug the extension: -// 1. please install the "SQL Operations Studio Debug" extension into VSCode -// 2. Ensure sqlops is added to your path: -// - open SQL Operations Studio -// - run the command "Install 'sqlops' command in PATH" +// 1. please install the "Azure Data Studio Debug" extension into VSCode +// 2. Ensure azuredatastudio is added to your path: +// - open Azure Data Studio +// - run the command "Install 'azuredatastudio' command in PATH" { "version": "0.2.0", "configurations": [ { - "name": "Debug in SqlOps install", + "name": "Debug in AzureDataStudio install", "type": "sqlopsExtensionHost", "request": "launch", - "runtimeExecutable": "sqlops", + "runtimeExecutable": "azuredatastudio", "args": [ "--extensionDevelopmentPath=${workspaceFolder}" ] diff --git a/samples/sqlservices/package.json b/samples/sqlservices/package.json index 2e772b293b..3300b56853 100644 --- a/samples/sqlservices/package.json +++ b/samples/sqlservices/package.json @@ -110,6 +110,6 @@ }, "repository": { "type": "git", - "url": "https://github.com/Microsoft/sqlopsstudio/tree/master/samples/sqlservices" + "url": "https://github.com/Microsoft/azuredatastudio/tree/master/samples/sqlservices" } } diff --git a/samples/sqlservices/sql/query.sql b/samples/sqlservices/sql/query.sql index ddd406a151..9ad71f747a 100644 --- a/samples/sqlservices/sql/query.sql +++ b/samples/sqlservices/sql/query.sql @@ -1,7 +1,7 @@ /* * This file should contain SQL code that returns a result set - * To get started, build your own queries in SQL Operations Studio and click the + * To get started, build your own queries in Azure Data Studio and click the * "View as Chart" button to get the correct chart format. Then choose "Create Insight" * and update the package.json with the JSON contents, and this file with the query * used to generate the chart. diff --git a/samples/sqlservices/tasks/buildtasks.js b/samples/sqlservices/tasks/buildtasks.js index 0d8c9f512c..f219c2de18 100644 --- a/samples/sqlservices/tasks/buildtasks.js +++ b/samples/sqlservices/tasks/buildtasks.js @@ -56,7 +56,7 @@ gulp.task('compile:src', function(done) { } }) .pipe(srcmap.write('.', { - sourceRoot: function(file) { + sourceRoot: function(file) { return file.cwd + '/src'; } })) @@ -100,14 +100,14 @@ gulp.task('test', (done) => { } process.env.JUNIT_REPORT_PATH = workspace + '/test-reports/ext_xunit.xml'; - let sqlopsPath = 'sqlops'; + let azuredatastudioPath = 'azuredatastudio'; if (process.env['SQLOPS_DEV']) { let suffix = os.platform === 'win32' ? 'bat' : 'sh'; - sqlopsPath = `${process.env['SQLOPS_DEV']}/scripts/sql-cli.${suffix}`; + azuredatastudioPath = `${process.env['SQLOPS_DEV']}/scripts/sql-cli.${suffix}`; } - console.log(`Using SQLOPS Path of ${sqlopsPath}`); + console.log(`Using SQLOPS Path of ${azuredatastudioPath}`); - cproc.exec(`${sqlopsPath} --extensionDevelopmentPath="${workspace}" --extensionTestsPath="${workspace}/out/test" --verbose`, (error, stdout, stderr) => { + cproc.exec(`${azuredatastudioPath} --extensionDevelopmentPath="${workspace}" --extensionTestsPath="${workspace}/out/test" --verbose`, (error, stdout, stderr) => { if (error) { console.error(`exec error: ${error}`); process.exit(1); diff --git a/src/paths.js b/src/paths.js index bcdaed30f6..a6a59a8177 100644 --- a/src/paths.js +++ b/src/paths.js @@ -17,7 +17,8 @@ function getAppDataPath(platform) { } function getDefaultUserDataPath(platform) { - return path.join(getAppDataPath(platform), pkg.name); + // {{SQL CARBON EDIT}} hard-code Azure Data Studio + return path.join(getAppDataPath(platform), 'azuredatastudio'); } exports.getAppDataPath = getAppDataPath; diff --git a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts index 632a04cee7..4dd6e9f500 100644 --- a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts +++ b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts @@ -30,7 +30,7 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { IAccountPickerService } from 'sql/parts/accountManagement/common/interfaces'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; -// TODO: Make the help link 1) extensible (01/08/2018, https://github.com/Microsoft/sqlopsstudio/issues/450) +// TODO: Make the help link 1) extensible (01/08/2018, https://github.com/Microsoft/azuredatastudio/issues/450) // in case that other non-Azure sign in is to be used const firewallHelpUri = 'https://aka.ms/sqlopsfirewallhelp'; diff --git a/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts b/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts index 32e13a29cb..6be4c2ce88 100644 --- a/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts +++ b/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts @@ -80,7 +80,7 @@ configurationRegistry.registerConfiguration({ 'properties': { 'startup.alwaysShowServersView': { 'type': 'boolean', - 'description': localize('startup.alwaysShowServersView', 'True for the Servers view to be shown on launch of SQL Operations Studio default; false if the last opened view should be shown'), + 'description': localize('startup.alwaysShowServersView', 'True for the Servers view to be shown on launch of Azure Data Studio default; false if the last opened view should be shown'), 'default': true } } diff --git a/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts b/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts index 2027170208..7198e05538 100644 --- a/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts +++ b/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts @@ -361,7 +361,7 @@ export class ProfilerColumnEditorDialog extends Modal { } // currently not used, this dialog is a work in progress - // tracked in issue #1545 https://github.com/Microsoft/sqlopsstudio/issues/1545 + // tracked in issue #1545 https://github.com/Microsoft/azuredatastudio/issues/1545 private _updateInput(): void { /* this._element.getUnsortedChildren().forEach(e => { @@ -394,7 +394,7 @@ export class ProfilerColumnEditorDialog extends Modal { } // currently not used, this dialog is a work in progress - // tracked in issue #1545 https://github.com/Microsoft/sqlopsstudio/issues/1545 + // tracked in issue #1545 https://github.com/Microsoft/azuredatastudio/issues/1545 private _updateList(): void { /* this._element = new SessionItem(this._input.sessionTemplate.name, this._selectedValue === 0 ? 'event' : 'column'); diff --git a/src/typings/modules/angular2-slickgrid/typings.json b/src/typings/modules/angular2-slickgrid/typings.json index cbe481d151..2bc7c9495b 100644 --- a/src/typings/modules/angular2-slickgrid/typings.json +++ b/src/typings/modules/angular2-slickgrid/typings.json @@ -1,7 +1,7 @@ { "resolution": "main", "tree": { - "src": "D:\\code\\sqlopsstudio\\node_modules\\angular2-slickgrid\\package.json", + "src": "D:\\code\\azuredatastudio\\node_modules\\angular2-slickgrid\\package.json", "raw": "npm:angular2-slickgrid", "main": "out/index.js", "version": "1.4.1", diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts index 5a5130f809..846c267f85 100644 --- a/src/vs/code/electron-browser/issue/issueReporterModel.ts +++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts @@ -67,7 +67,7 @@ Issue Type: ${this.getIssueTypeTitle()} ${this._data.issueDescription} -SQL Operations Studio version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} +Azure Data Studio version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} OS version: ${this._data.versionInfo && this._data.versionInfo.os} ${this.getInfos()} diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts index b08bcd9ec2..0113dc5ce4 100644 --- a/src/vs/code/electron-browser/issue/issueReporterPage.ts +++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts @@ -23,7 +23,7 @@ export default (): string => `
${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}. If the problem only reproduces when extensions are active, it is likely an issue with an extension.")) diff --git a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts index 4b8ada7768..1bc85ac694 100644 --- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts +++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts @@ -33,7 +33,7 @@ Issue Type: Feature Request undefined -SQL Operations Studio version: undefined +Azure Data Studio version: undefined OS version: undefined @@ -57,7 +57,7 @@ Issue Type: Bug undefined -SQL Operations Studio version: undefined +Azure Data Studio version: undefined OS version: undefined
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 540a755f73..493dd96a5a 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -187,7 +187,7 @@ export class ExtensionManagementService extends Disposable implements IExtension } return null; }), - e => TPromise.wrapError(new Error(nls.localize('restartCode', "Please restart SQL Operations Studio before reinstalling {0}.", manifest.displayName || manifest.name)))); + e => TPromise.wrapError(new Error(nls.localize('restartCode', "Please restart Azure Data Studio before reinstalling {0}.", manifest.displayName || manifest.name)))); }); } diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts index a409618305..a2b75e503a 100644 --- a/src/vs/platform/update/electron-main/updateService.win32.ts +++ b/src/vs/platform/update/electron-main/updateService.win32.ts @@ -194,7 +194,7 @@ export class Win32UpdateService extends AbstractUpdateService { private getUpdatePackagePath(version: string): TPromise { // {{SQL CARBON EDIT}} - return this.cachePath.then(cachePath => path.join(cachePath, `SqlOpsStudioSetup-${product.quality}-${version}.exe`)); + return this.cachePath.then(cachePath => path.join(cachePath, `AzureDataStudioSetup-${product.quality}-${version}.exe`)); } private cleanup(exceptVersion: string = null): Promise { diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 19fcdd10e6..18f5de3ba1 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -1358,7 +1358,7 @@ class ScreenReaderDetectedExplanation extends Themable { this.container.appendChild(closeBtn); // {{SQL CARBON EDIT}} - const question = $('p.question', {}, nls.localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate SQL Operations Studio?")); + const question = $('p.question', {}, nls.localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate Azure Data Studio?")); this.container.appendChild(question); const buttonContainer = $('div.buttons'); @@ -1391,7 +1391,7 @@ class ScreenReaderDetectedExplanation extends Themable { this.container.appendChild(this.hrElement); // {{SQL CARBON EDIT}} - const explanation1 = $('p.body1', {}, nls.localize('screenReaderDetectedExplanation.body1', "SQL Operations Studio is now optimized for usage with a screen reader.")); + const explanation1 = $('p.body1', {}, nls.localize('screenReaderDetectedExplanation.body1', "Azure Data Studio is now optimized for usage with a screen reader.")); this.container.appendChild(explanation1); const explanation2 = $('p.body2', {}, nls.localize('screenReaderDetectedExplanation.body2', "Some editor features will have different behaviour: e.g. word wrapping, folding, etc.")); diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts index 67c1d9f544..fc1ed106be 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts @@ -229,7 +229,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe // {{SQL CARBON EDIT}} this._recommendations.forEach(x => output[x.toLowerCase()] = { reasonId: ExtensionRecommendationReason.Executable, - reasonText: localize('defaultRecommendations', "This extension is recommended by SQL Operations Studio.") + reasonText: localize('defaultRecommendations', "This extension is recommended by Azure Data Studio.") }); for (const id of this._allIgnoredRecommendations) { @@ -319,7 +319,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe private resolveWorkspaceFolderExtensionConfig(workspaceFolder: IWorkspaceFolder): TPromise { // {{SQL CARBON EDIT}} - const extensionsJsonUri = workspaceFolder.toResource(paths.join('.sqlops', 'extensions.json')); + const extensionsJsonUri = workspaceFolder.toResource(paths.join('.azuredatastudio', 'extensions.json')); return this.fileService.resolveFile(extensionsJsonUri) .then(() => this.fileService.resolveContent(extensionsJsonUri)) diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index 88178912b6..8395c53ebb 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -267,7 +267,7 @@ class Extension implements IExtension { if (this.type === LocalExtensionType.System) { // {{SQL CARBON EDIT}} return TPromise.as(`# ${this.displayName || this.name} -**Notice** This is a an extension that is bundled with SQL Operations Studio. +**Notice** This is a an extension that is bundled with Azure Data Studio. ## Features ${this.description} `); diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts index d23b4af6c6..1172a5db57 100644 --- a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts +++ b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts @@ -25,8 +25,8 @@ import { Action } from 'vs/base/common/actions'; class TwitterFeedbackService implements IFeedbackService { private static TWITTER_URL: string = 'https://twitter.com/intent/tweet'; - private static VIA_NAME: string = 'sqlopsstudio'; // {{SQL CARBON EDIT}} - private static HASHTAGS: string[] = ['HappySqlOps']; // {{SQL CARBON EDIT}} + private static VIA_NAME: string = 'azuredatastudio'; // {{SQL CARBON EDIT}} + private static HASHTAGS: string[] = ['HappyAzureDataStudio']; // {{SQL CARBON EDIT}} private combineHashTagsAsString(): string { return TwitterFeedbackService.HASHTAGS.join(','); diff --git a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts index 503ecd497c..de4236af64 100644 --- a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts +++ b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts @@ -22,10 +22,10 @@ export class ConfigureLocaleAction extends Action { // {{SQL CARBON EDIT}} private static DEFAULT_CONTENT: string = [ '{', - `\t// ${localize('displayLanguage', 'Defines SQL Operations Studio\'s display language.')}`, + `\t// ${localize('displayLanguage', 'Defines Azure Data Studio\'s display language.')}`, `\t// ${localize('doc', 'See {0} for a list of supported languages.', 'https://go.microsoft.com/fwlink/?LinkId=761051')}`, `\t`, - `\t// ${localize('restart', 'Changing the value requires restarting SQL Operations Studio.')}`, + `\t// ${localize('restart', 'Changing the value requires restarting Azure Data Studio.')}`, '}' ].join('\n'); diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts index 511fad62ab..52f920ff61 100644 --- a/src/vs/workbench/parts/preferences/common/preferences.ts +++ b/src/vs/workbench/parts/preferences/common/preferences.ts @@ -91,5 +91,5 @@ export const KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS = 'keybindings.editor.s export const KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS = 'keybindings.editor.showUserKeybindings'; // {{SQL CARBON EDIT}} -export const FOLDER_SETTINGS_PATH = join('.sqlops', 'settings.json'); +export const FOLDER_SETTINGS_PATH = join('.azuredatastudio', 'settings.json'); export const DEFAULT_SETTINGS_EDITOR_SETTING = 'workbench.settings.openDefaultSettings'; diff --git a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts index 7064b78388..92413aee19 100644 --- a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts +++ b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts @@ -60,8 +60,8 @@ export class TelemetryOptOut implements IWorkbenchContribution { } // {{SQL CARBON EDIT}} - const optOutNotice = localize('telemetryOptOut.optOutNotice', "Help improve SQL Operations Studio by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt out]({1}).", this.privacyUrl, this.optOutUrl); - const optInNotice = localize('telemetryOptOut.optInNotice', "Help improve SQL Operations Studio by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt in]({1}).", this.privacyUrl, this.optOutUrl); + const optOutNotice = localize('telemetryOptOut.optOutNotice', "Help improve Azure Data Studio by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt out]({1}).", this.privacyUrl, this.optOutUrl); + const optInNotice = localize('telemetryOptOut.optInNotice', "Help improve Azure Data Studio by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt in]({1}).", this.privacyUrl, this.optOutUrl); notificationService.prompt( Severity.Info, diff --git a/src/vs/workbench/services/configuration/common/configuration.ts b/src/vs/workbench/services/configuration/common/configuration.ts index de9ce19f14..5938178b26 100644 --- a/src/vs/workbench/services/configuration/common/configuration.ts +++ b/src/vs/workbench/services/configuration/common/configuration.ts @@ -7,7 +7,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; // {{SQL CARBON EDIT}} -export const FOLDER_CONFIG_FOLDER_NAME = '.sqlops'; +export const FOLDER_CONFIG_FOLDER_NAME = '.azuredatastudio'; export const FOLDER_SETTINGS_NAME = 'settings'; export const FOLDER_SETTINGS_PATH = `${FOLDER_CONFIG_FOLDER_NAME}/${FOLDER_SETTINGS_NAME}.json`; diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts index 6172413b08..86f8aa3590 100644 --- a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts +++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts @@ -91,7 +91,7 @@ suite('ConfigurationEditingService', () => { workspaceDir = path.join(parentDir, 'workspaceconfig', id); globalSettingsFile = path.join(workspaceDir, 'config.json'); // {{SQL CARBON EDIT}} - workspaceSettingsDir = path.join(workspaceDir, '.sqlops'); + workspaceSettingsDir = path.join(workspaceDir, '.azuredatastudio'); return mkdirp(workspaceSettingsDir, 493); } diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts index 4adb45f640..f0abca64b8 100644 --- a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts +++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts @@ -54,7 +54,7 @@ function setUpFolderWorkspace(folderName: string): TPromise<{ parentDir: string, function setUpFolder(folderName: string, parentDir: string): TPromise { const folderDir = path.join(parentDir, folderName); // {{SQL CARBON EDIT}} - const workspaceSettingsDir = path.join(folderDir, '.sqlops'); + const workspaceSettingsDir = path.join(folderDir, '.azuredatastudio'); return pfs.mkdirp(workspaceSettingsDir, 493).then(() => folderDir); } diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index f8c47517cc..40870c2c86 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -803,11 +803,11 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil const folders = this.contextService.getWorkspace().folders; for (let i = 0; i < folders.length; i++) { // {{SQL CARBON EDIT}} - if (isEqualOrParent(this.resource, folders[i].toResource('.sqlops'), hasToIgnoreCase(this.resource))) { + if (isEqualOrParent(this.resource, folders[i].toResource('.azuredatastudio'), hasToIgnoreCase(this.resource))) { const filename = path.basename(this.resource.fsPath); if (TextFileEditorModel.WHITELIST_WORKSPACE_JSON.indexOf(filename) > -1) { // {{SQL CARBON EDIT}} - return `.sqlops/${filename}`; + return `.azuredatastudio/${filename}`; } } } diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts index 4563533444..75240ba191 100644 --- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts @@ -36,7 +36,7 @@ import { IFileService } from 'vs/platform/files/common/files'; // implementation // {{SQL CARBON EDIT}} const DEFAULT_THEME_ID = 'vs sql-theme-carbon-themes-light_carbon-json'; -const DEFAULT_THEME_SETTING_VALUE = 'Default Light SQL Operations Studio'; +const DEFAULT_THEME_SETTING_VALUE = 'Default Light Azure Data Studio'; const PERSISTED_THEME_STORAGE_KEY = 'colorThemeData'; const PERSISTED_ICON_THEME_STORAGE_KEY = 'iconThemeData';