mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 (#14883)
* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 * Bump distro * Upgrade GCC to 4.9 due to yarn install errors * Update build image * Fix bootstrap base url * Bump distro * Fix build errors * Update source map file * Disable checkbox for blocking migration issues (#15131) * disable checkbox for blocking issues * wip * disable checkbox fixes * fix strings * Remove duplicate tsec command * Default to off for tab color if settings not present * re-skip failing tests * Fix mocha error * Bump sqlite version & fix notebooks search view * Turn off esbuild warnings * Update esbuild log level * Fix overflowactionbar tests * Fix ts-ignore in dropdown tests * cleanup/fixes * Fix hygiene * Bundle in entire zone.js module * Remove extra constructor param * bump distro for web compile break * bump distro for web compile break v2 * Undo log level change * New distro * Fix integration test scripts * remove the "no yarn.lock changes" workflow * fix scripts v2 * Update unit test scripts * Ensure ads-kerberos2 updates in .vscodeignore * Try fix unit tests * Upload crash reports * remove nogpu * always upload crashes * Use bash script * Consolidate data/ext dir names * Create in tmp directory Co-authored-by: chlafreniere <hichise@gmail.com> Co-authored-by: Christopher Suh <chsuh@microsoft.com> Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
@@ -7,8 +7,8 @@ tsconfig.json
|
||||
yarn.lock
|
||||
|
||||
node_modules
|
||||
!node_modules/ads-kerberos/package.json
|
||||
!node_modules/ads-kerberos/LICENSE
|
||||
!node_modules/ads-kerberos/lib
|
||||
!node_modules/ads-kerberos/index.js
|
||||
!node_modules/ads-kerberos/build/Release/kerberos.node
|
||||
!node_modules/ads-kerberos2/package.json
|
||||
!node_modules/ads-kerberos2/LICENSE
|
||||
!node_modules/ads-kerberos2/lib
|
||||
!node_modules/ads-kerberos2/index.js
|
||||
!node_modules/ads-kerberos2/build/Release/kerberos.node
|
||||
|
||||
@@ -15,6 +15,6 @@ module.exports = withDefaults({
|
||||
extension: './src/extension.ts'
|
||||
},
|
||||
externals: {
|
||||
'ads-kerberos': 'commonjs ads-kerberos'
|
||||
'ads-kerberos2': 'commonjs ads-kerberos2'
|
||||
}
|
||||
});
|
||||
|
||||
@@ -350,7 +350,7 @@
|
||||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"ads-kerberos": "^1.1.3",
|
||||
"ads-kerberos2": "^1.1.3",
|
||||
"request": "^2.88.0",
|
||||
"vscode-nls": "^4.0.0"
|
||||
},
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as kerberos from 'ads-kerberos';
|
||||
import * as kerberos from 'ads-kerberos2';
|
||||
import * as vscode from 'vscode';
|
||||
|
||||
export async function authenticateKerberos(hostname: string): Promise<string> {
|
||||
|
||||
@@ -27,10 +27,10 @@
|
||||
resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.5.tgz#9da44ed75571999b65c37b60c9b2b88db54c585d"
|
||||
integrity sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==
|
||||
|
||||
ads-kerberos@^1.1.3:
|
||||
ads-kerberos2@^1.1.3:
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/ads-kerberos/-/ads-kerberos-1.1.3.tgz#e424253c6f0df2b258aa4a31804f9e38562d0301"
|
||||
integrity sha512-e6rLQ/ECDd+vo7FhcjbEZPxH3I9cDc/zBj0ih0CH//zZw/a4HI0g/buIuTzU7yRMC5FYEEH9azC82vO6OTbu8g==
|
||||
resolved "https://registry.yarnpkg.com/ads-kerberos2/-/ads-kerberos2-1.1.3.tgz#2f52c228579c45e7ea975c64070f33d2fdfafb58"
|
||||
integrity sha512-mSHGHcVuST50I7nekS2gPH9mDDkeoZQagP2mit8Ry2EhAFxXXw/px1wESPe+M60SzSHbXaJ+orV5izoB2Mee9w==
|
||||
dependencies:
|
||||
nan "^2.14.0"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user