Skip to content

Commit

Permalink
Merge Azure Data Studio branding changes (microsoft#2689)
Browse files Browse the repository at this point in the history 
* Bump Electron to 2.0.8 and SQL Ops to 0.33.3 (microsoft#2466)

* Merged PR 328: Initial "Azure Data Studio" branding changes

* Alanren/icon overwrite issue (microsoft#2484)

* fix the error icon too large issue

* formatting

* add logic to hide and add grid panel based on size (microsoft#2481)

* add grid styles (microsoft#2483)

* Add check for potential failure in handling drag (microsoft#2499)

* add check for potential failure in handling drag

* move check to avoid ui glitches

* Reorder Connection Name field in Connection Dialog (microsoft#2498)

* change cursor in message panel to default (microsoft#2494)

* add select all handler to grid (microsoft#2496)

* Fix macOS titlebar branding

* add animation when button is clicked and fix title in button (microsoft#2488)

* add animation similar to toolbar in vscode and fix title in button

* remove bur method in button

* Disable the User Setup prompt (microsoft#2501)

* fixes a rendering problem in splitview (microsoft#2512)

* add listener to change action bar on maximize change (microsoft#2505)

* fix the save and save all for untitled file (microsoft#2526)

* add check for selection model in edit data (microsoft#2517)

* add min size for row num column (microsoft#2518)

* expand messages panel on error (microsoft#2519)

* Selection in grid context (microsoft#2527)

* update action context on selection change

* correctly add ranges rather than a new range for every row

* add required functions to typings

* Fixes microsoft#2523 (microsoft#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 - microsoft#2524 is tracking this.

* Fix grid gaps (microsoft#2531)

* modifying grid gaps

* reduce gaps and increase gap for action bar

* fix grid action bar not updating (microsoft#2532)

* Turn-off Git missing prompt (microsoft#2533)

* Reduce message panel min size to 0 (microsoft#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 (microsoft#2536)

* fix bug around debounced event not being flushed in time

* add comment

* Fix build break in Git extension (microsoft#2538)

* Update SQL Ops to 0.33.4

* Fix sizing error when switching windows (microsoft#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 (microsoft#2545)

* fix the account not found error when creating firewall rules (microsoft#2543)

* Support isDirty flag for model view editors and begin plumb through of save support (microsoft#2547)

* Add dirty and save support to model view

* Add issue # for a TODO

* add divcontainer in modelview (microsoft#2559)

* add divcontainer in modelview

* address comment

* Bug/extension contribution (microsoft#2560)

* revert 4ab5d84

* 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 (microsoft#2561)

* Update SQL Ops to 0.33.5

* Disabled connection name input when connecting to a server. (microsoft#2566)

* Disabled connection name input when connecting to a server.
microsoft#2557

* Fixed reset state of connection inputs

* added context to chart buttons so they work (microsoft#2575)

* accessibility setting based select database dropdown (microsoft#2579)

* Maintain Query State (microsoft#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 (microsoft#2584)

* Add OE node refresh API method (microsoft#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 (microsoft#2594)

* edit data issue with column index handling (microsoft#2595)

* fixed insights crash (microsoft#2596)

* Changed the "Configure" link to "Learn How To Configure The Dashboard". (microsoft#2599)

* Changed the "Configure" link to "Learn How To Configure the Dashboard".
This inlcudes the command as well as the tile label
microsoft#1227

* Capitalizing first character in each word

* The "New Query" context menu is now only available from the server & db (microsoft#2598)

microsoft#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 (microsoft#2608)

* Use version 2.0.9 of electron (microsoft#2606)

* fixes scrolling in query plan (microsoft#2609)

* Dashboard: Fixed all insight bugs (microsoft#2612)

* fixed all insight bugs

* removed unused imports

* added comment

* add view area options to pick up chart background fix (microsoft#2613)

* Respect message settings (microsoft#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 (microsoft#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 (microsoft#2597)

* Added text underline CSS for DB NULL values when editing / showing data
microsoft#217

* Changed db nulls styling to italic

* Bug/oetimeout Fix - When timeout happens while fetching node children, the node becomes unusable (microsoft#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 (microsoft#2620)

* Bump SQL Tools Service to 1.5.0-alpha.34 (microsoft#2621)

* Feat/add dom component (microsoft#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 (microsoft#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 (microsoft#2644)

* Fix broken 'Clear Token Cache' command (microsoft#2643)

* fixed right click context menu bug in jobs view (microsoft#2632)

* fix css issue (microsoft#2650)

* reload the chart types when we actually need it (microsoft#2651)

* Bump Azure Data Studio to 1.0.0

* Fix chart error that caused query editor to close (microsoft#2652)

* Bump Agent, Import and Profiler extension versions
  • Loading branch information
@kburtram
kburtram authored Sep 24, 2018
1 parent 1474bab commit bb5d52d
Show file tree
Hide file tree
Showing 78 changed files with 227 additions and 225 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ about: Create a report to help us improve
<!-- Also please test using the latest insiders build to make sure your issue has not already been fixed. -->

<!-- Use Help > Report Issue to prefill these. -->
- SQL Operations Studio Version:
- Azure Data Studio Version:

Steps to Reproduce:

Expand Down
16 changes: 8 additions & 8 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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",
Expand Down Expand Up @@ -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"
]
},
Expand Down
14 changes: 7 additions & 7 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)
Expand Down
22 changes: 11 additions & 11 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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).
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ThirdPartyNotices.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MICROSOFT SQL OPERATIONS STUDIO
MICROSOFT Azure Data Studio

THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
Do Not Translate or Localize
Expand Down
19 changes: 10 additions & 9 deletions build/gulpfile.vscode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down Expand Up @@ -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 () => {
Expand Down Expand Up @@ -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 }));

Expand Down Expand Up @@ -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'));
Expand Down
6 changes: 3 additions & 3 deletions build/gulpfile.vscode.linux.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 () {
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion build/gulpfile.vscode.win32.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`);
Expand Down
2 changes: 1 addition & 1 deletion build/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "sqlops-oss-dev-build",
"name": "azuredatastudio-oss-dev-build",
"version": "1.0.0",
"devDependencies": {
"@types/azure": "0.9.19",
Expand Down
14 changes: 7 additions & 7 deletions build/win32/code.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}'))
Expand Down
2 changes: 1 addition & 1 deletion extensions/account-provider-azure/src/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function getAppDataPath() {
}

export function getDefaultLogLocation() {
return path.join(getAppDataPath(), 'sqlops');
return path.join(getAppDataPath(), 'azuredatastudio');
}

// EXTENSION ACTIVATION ////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions extensions/agent/README.md
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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).
6 changes: 3 additions & 3 deletions extensions/agent/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extensions/git/src/autofetch.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion extensions/git/src/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export async function activate(context: ExtensionContext): Promise<API> {
async function checkGitVersion(info: IGit): Promise<void> {

// {{SQL CARBON EDIT}}
// remove Git version check for sqlops
// remove Git version check for azuredatastudio

return;

Expand Down
Loading

0 comments on commit bb5d52d

Please sign in to comment.