mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-13 17:22:15 -05:00
Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 * Fixes and cleanup * Distro * Fix hygiene yarn * delete no yarn lock changes file * Fix hygiene * Fix layer check * Fix CI * Skip lib checks * Remove tests deleted in vs code * Fix tests * Distro * Fix tests and add removed extension point * Skip failing notebook tests for now * Disable broken tests and cleanup build folder * Update yarn.lock and fix smoke tests * Bump sqlite * fix contributed actions and file spacing * Fix user data path * Update yarn.locks Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
@@ -3,7 +3,7 @@ setlocal
|
||||
|
||||
title VSCode Dev
|
||||
|
||||
pushd %~dp0\..
|
||||
pushd %~dp0..
|
||||
|
||||
:: Get electron, compile, built-in extensions
|
||||
if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.js
|
||||
@@ -14,7 +14,7 @@ set NAMESHORT=%NAMESHORT:"=%.exe
|
||||
set CODE=".build\electron\%NAMESHORT%"
|
||||
|
||||
:: Manage built-in extensions
|
||||
if "%1"=="--builtin" goto builtin
|
||||
if "%~1"=="--builtin" goto builtin
|
||||
|
||||
:: Configuration
|
||||
set ELECTRON_RUN_AS_NODE=1
|
||||
@@ -24,7 +24,7 @@ set ELECTRON_ENABLE_LOGGING=1
|
||||
set ELECTRON_ENABLE_STACK_DUMPING=1
|
||||
|
||||
:: Launch Code
|
||||
%CODE% --inspect=5874 out\cli.js . %*
|
||||
%CODE% --inspect=5874 out\cli.js %~dp0.. %*
|
||||
goto end
|
||||
|
||||
:builtin
|
||||
|
||||
@@ -14,7 +14,7 @@ set NAMESHORT=%NAMESHORT:"=%.exe
|
||||
set CODE=".build\electron\%NAMESHORT%"
|
||||
|
||||
:: Manage built-in extensions
|
||||
if "%1"=="--builtin" goto builtin
|
||||
if "%~1"=="--builtin" goto builtin
|
||||
|
||||
:: Configuration
|
||||
set NODE_ENV=development
|
||||
|
||||
@@ -8,13 +8,13 @@ fi
|
||||
|
||||
header="// Type definitions for Visual Studio Code ${1}
|
||||
// Project: https://github.com/microsoft/vscode
|
||||
// Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
|
||||
// Definitions by: Visual Studio Code Team, Microsoft <https://github.com/microsoft>
|
||||
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
|
||||
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License.
|
||||
* See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.
|
||||
* See https://github.com/microsoft/vscode/blob/main/LICENSE.txt for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
/**
|
||||
@@ -28,4 +28,4 @@ if [ -f ./src/vs/vscode.d.ts ]; then
|
||||
echo "Generated index.d.ts for version ${1}."
|
||||
else
|
||||
echo "Can't find ./src/vs/vscode.d.ts. Run this script at vscode root."
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -17,14 +17,15 @@ const extensionList = [
|
||||
'azurecore',
|
||||
'cms',
|
||||
'dacpac',
|
||||
'data-workspace',
|
||||
'import',
|
||||
'schema-compare',
|
||||
//'mssql',
|
||||
'notebook',
|
||||
'resource-deployment',
|
||||
'machine-learning',
|
||||
'resource-deployment',
|
||||
'schema-compare',
|
||||
'sql-database-projects',
|
||||
'data-workspace'
|
||||
|
||||
];
|
||||
|
||||
let argv = require('yargs')
|
||||
|
||||
@@ -32,6 +32,7 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
|
||||
:: compile-extension:css-language-features-server^
|
||||
:: compile-extension:html-language-features-server^
|
||||
:: compile-extension:json-language-features-server^
|
||||
:: compile-extension-media
|
||||
|
||||
:: Configuration for more verbose output
|
||||
set VSCODE_CLI=1
|
||||
|
||||
@@ -39,6 +39,7 @@ else
|
||||
# compile-extension:css-language-features-server \
|
||||
# compile-extension:html-language-features-server \
|
||||
# compile-extension:json-language-features-server \
|
||||
# compile-extension-media
|
||||
|
||||
|
||||
# Configuration for more verbose output
|
||||
|
||||
Reference in New Issue
Block a user