update sqltoolsService version for a sqltoolsservice and a dacfx fix (#11764)

* fix importing new project from server dashboard

* also fix not showing list of dbs if the connection from connection dialog already specified the db

.devcontainer/Dockerfile

@@ -0,0 +1,121 @@
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-12
+
+ARG TARGET_DISPLAY=":1"
+
+# VNC options
+ARG MAX_VNC_RESOLUTION=1920x1080x16
+ARG TARGET_VNC_RESOLUTION=1920x1080
+ARG TARGET_VNC_DPI=72
+ARG TARGET_VNC_PORT=5901
+ARG VNC_PASSWORD="vscode"
+
+# noVNC (VNC web client) options
+ARG INSTALL_NOVNC="true"
+ARG NOVNC_VERSION=1.1.0
+ARG TARGET_NOVNC_PORT=6080
+ARG WEBSOCKETIFY_VERSION=0.9.0
+
+# Firefox is useful for testing things like browser launch events, but optional
+ARG INSTALL_FIREFOX="false"
+
+# Expected non-root username from base image
+ARG USERNAME=node
+
+# Core environment variables for X11, VNC, and fluxbox
+ENV DBUS_SESSION_BUS_ADDRESS="autolaunch:" \
+	MAX_VNC_RESOLUTION="${MAX_VNC_RESOLUTION}" \
+	VNC_RESOLUTION="${TARGET_VNC_RESOLUTION}" \
+	VNC_DPI="${TARGET_VNC_DPI}" \
+	VNC_PORT="${TARGET_VNC_PORT}" \
+	NOVNC_PORT="${TARGET_NOVNC_PORT}" \
+	DISPLAY="${TARGET_DISPLAY}" \
+	LANG="en_US.UTF-8" \
+	LANGUAGE="en_US.UTF-8" \
+	VISUAL="nano" \
+	EDITOR="nano"
+
+# Configure apt and install packages
+RUN apt-get update \
+	&& export DEBIAN_FRONTEND=noninteractive \
+	#
+	# Install the Cascadia Code fonts - https://github.com/microsoft/cascadia-code
+	&& curl -sSL https://github.com/microsoft/cascadia-code/releases/download/v2004.30/CascadiaCode_2004.30.zip -o /tmp/cascadia-fonts.zip \
+	&& unzip /tmp/cascadia-fonts.zip -d /tmp/cascadia-fonts \
+	&& mkdir -p /usr/share/fonts/truetype/cascadia \
+	&& mv /tmp/cascadia-fonts/ttf/* /usr/share/fonts/truetype/cascadia/ \
+	&& rm -rf /tmp/cascadia-fonts.zip /tmp/cascadia-fonts \
+	#
+	# Install X11, fluxbox and VS Code dependencies
+	&& apt-get -y install --no-install-recommends \
+		xvfb \
+		x11vnc \
+		fluxbox \
+		dbus-x11 \
+		x11-utils \
+		x11-xserver-utils \
+		xdg-utils \
+		fbautostart \
+		xterm \
+		eterm \
+		gnome-terminal \
+		gnome-keyring \
+		seahorse \
+		nautilus \
+		libx11-dev \
+		libxkbfile-dev \
+		libsecret-1-dev \
+		libnotify4 \
+		libnss3 \
+		libxss1 \
+		libasound2 \
+		xfonts-base \
+		xfonts-terminus \
+		fonts-noto \
+		fonts-wqy-microhei \
+		fonts-droid-fallback \
+		vim-tiny \
+		nano \
+	#
+	# [Optional] Install noVNC
+	&& if [ "${INSTALL_NOVNC}" = "true" ]; then \
+		mkdir -p /usr/local/novnc \
+		&& curl -sSL https://github.com/novnc/noVNC/archive/v${NOVNC_VERSION}.zip -o /tmp/novnc-install.zip \
+		&& unzip /tmp/novnc-install.zip -d /usr/local/novnc \
+		&& cp /usr/local/novnc/noVNC-${NOVNC_VERSION}/vnc_lite.html /usr/local/novnc/noVNC-${NOVNC_VERSION}/index.html \
+		&& rm /tmp/novnc-install.zip \
+		&& curl -sSL https://github.com/novnc/websockify/archive/v${WEBSOCKETIFY_VERSION}.zip -o /tmp/websockify-install.zip \
+		&& unzip /tmp/websockify-install.zip -d /usr/local/novnc \
+		&& apt-get -y install --no-install-recommends python-numpy \
+		&& ln -s /usr/local/novnc/websockify-${WEBSOCKETIFY_VERSION} /usr/local/novnc/noVNC-${NOVNC_VERSION}/utils/websockify \
+		&& rm /tmp/websockify-install.zip; \
+	fi \
+	#
+	# [Optional] Install Firefox
+	&& if [ "${INSTALL_FIREFOX}" = "true" ]; then \
+		apt-get -y install --no-install-recommends firefox-esr; \
+	fi \
+	#
+	# Clean up
+	&& apt-get autoremove -y \
+	&& apt-get clean -y \
+	&& rm -rf /var/lib/apt/lists/*
+
+COPY bin/init-dev-container.sh /usr/local/share/
+COPY bin/set-resolution /usr/local/bin/
+COPY fluxbox/* /root/.fluxbox/
+COPY fluxbox/* /home/${USERNAME}/.fluxbox/
+
+# Update privs, owners of config files
+RUN mkdir -p /var/run/dbus /root/.vnc /home/${USERNAME}/.vnc \
+	&& touch /root/.Xmodmap /home/${USERNAME}/.Xmodmap \
+	&& echo "${VNC_PASSWORD}" | tee /root/.vnc/passwd > /home/${USERNAME}/.vnc/passwd \
+	&& chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.Xmodmap /home/${USERNAME}/.fluxbox /home/${USERNAME}/.vnc \
+	&& chmod +x /usr/local/share/init-dev-container.sh /usr/local/bin/set-resolution
+
+ENTRYPOINT ["/usr/local/share/init-dev-container.sh"]
+CMD ["sleep", "infinity"]

.devcontainer/README.md

@@ -0,0 +1,82 @@
+# Code - OSS Development Container
+
+This repository includes configuration for a development container for working with Code - OSS in an isolated local container or using [Visual Studio Codespaces](https://aka.ms/vso).
+
+> **Tip:** The default VNC password is `vscode`. The VNC server runs on port `5901` with a web client at `6080`. For better performance, we recommend using a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Applications like the macOS Screen Sharing app will not perform as well. [Chicken](https://sourceforge.net/projects/chicken/) is a good macOS alternative.
+
+## Quick start - local
+
+1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
+
+2. **Important**: Docker needs at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run full build. If you on macOS, or using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item, going to **Preferences/Settings > Resources > Advanced**.
+
+    > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
+
+3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Remote - Containers](https://aka.ms/vscode-remote/download/containers) extension.
+
+    ![Image of Remote - Containers extension](https://microsoft.github.io/vscode-remote-release/images/remote-containers-extn.png)
+
+    > Note that the Remote - Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
+
+4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **Remote - Containers: Open Repository in Container...**.
+
+    > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or using the Hyper-V engine on Windows. We recommend the "open repository" approach instead since it uses "named volume" rather than the local filesystem.
+
+5. Type `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box and press <kbd>Enter</kbd>.
+
+6. After the container is running, open a web browser and go to [http://localhost:6080](http://localhost:6080) or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+
+Anything you start in VS Code or the integrated terminal will appear here.
+
+Next: **[Try it out!](#try-it)**
+
+## Quick start - Codespaces
+
+>Note that the Codespaces browser-based editor cannot currently access the desktop environment in this container (due to a [missing feature](https://github.com/MicrosoftDocs/vsonline/issues/117)). We recommend using Visual Studio Code from the desktop to connect instead in the near term.
+
+1. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Visual Studio Codespaces](https://aka.ms/vscs-ext-vscode) extension.
+
+    ![Image of VS Codespaces extension](https://microsoft.github.io/vscode-remote-release/images/codespaces-extn.png)
+
+    > Note that the Visual Studio Codespaces extension requires the Visual Studio Code distribution of Code - OSS.
+
+2. Sign in by pressing <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and selecting **Codespaces: Sign In**. You may also need to use the **Codespaces: Create Plan** if you do not have a plan. See the [Codespaces docs](https://aka.ms/vso-docs/vscode) for details.
+
+3. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **Codespaces: Create New Codespace**.
+
+4. Use default settings (which should include **Standard** 4 core, 8 GB RAM Codespace), select a plan, and then enter the repository URL `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box when prompted.
+
+5. After the container is running, open a web browser and go to [http://localhost:6080](http://localhost:6080) or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+
+6. Anything you start in VS Code or the integrated terminal will appear here.
+
+## Try it!
+
+This container uses the [Fluxbox](http://fluxbox.org/) window manager to keep things lean. **Right-click on the desktop** to see menu options. It works with GNOME and GTK applications, so other tools can be installed if needed.
+
+Note you can also set the resolution from the command line by typing `set-resolution`.
+
+To start working with Code - OSS, follow these steps:
+
+1. In your local VS Code, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
+
+    ```bash
+    yarn install
+    bash scripts/code.sh
+    ```
+
+2. After the build is complete, open a web browser and go to [http://localhost:6080](http://localhost:6080) or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+
+3. You should now see Code - OSS!
+
+Next, let's try debugging.
+
+1. Shut down Code - OSS by clicking the box in the upper right corner of the Code - OSS window through your browser or VNC viewer.
+
+2. Go to your local VS Code client, and use Run / Debug view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
+
+    > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
+
+3. After a bit, Code - OSS will appear with the debugger attached!
+
+Enjoy!

.devcontainer/bin/init-dev-container.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+NONROOT_USER=node
+LOG=/tmp/container-init.log
+
+# Execute the command it not already running
+startInBackgroundIfNotRunning()
+{
+	log "Starting $1."
+	echo -e "\n** $(date) **" | sudoIf tee -a /tmp/$1.log > /dev/null
+	if ! pidof $1 > /dev/null; then
+		keepRunningInBackground "$@"
+		while ! pidof $1 > /dev/null; do
+			sleep 1
+		done
+		log "$1 started."
+	else
+		echo "$1 is already running." | sudoIf tee -a /tmp/$1.log > /dev/null
+		log "$1 is already running."
+	fi
+}
+
+# Keep command running in background
+keepRunningInBackground()
+{
+	($2 sh -c "while :; do echo [\$(date)] Process started.; $3; echo [\$(date)] Process exited!; sleep 5; done 2>&1" | sudoIf tee -a /tmp/$1.log > /dev/null & echo "$!" | sudoIf tee /tmp/$1.pid > /dev/null)
+}
+
+# Use sudo to run as root when required
+sudoIf()
+{
+    if [ "$(id -u)" -ne 0 ]; then
+        sudo "$@"
+    else
+        "$@"
+    fi
+}
+
+# Use sudo to run as non-root user if not already running
+sudoUserIf()
+{
+    if [ "$(id -u)" -eq 0 ]; then
+        sudo -u ${NONROOT_USER} "$@"
+    else
+        "$@"
+    fi
+}
+
+# Log messages
+log()
+{
+    echo -e "[$(date)] $@" | sudoIf tee -a $LOG > /dev/null
+}
+
+log "** SCRIPT START **"
+
+# Start dbus.
+log 'Running "/etc/init.d/dbus start".'
+if [ -f "/var/run/dbus/pid" ] && ! pidof dbus-daemon  > /dev/null; then
+	sudoIf rm -f /var/run/dbus/pid
+fi
+sudoIf /etc/init.d/dbus start 2>&1 | sudoIf tee -a /tmp/dbus-daemon-system.log > /dev/null
+while ! pidof dbus-daemon > /dev/null; do
+	sleep 1
+done
+
+# Set up Xvfb.
+startInBackgroundIfNotRunning "Xvfb" sudoIf "Xvfb ${DISPLAY:-:1} +extension RANDR -screen 0 ${MAX_VNC_RESOLUTION:-1920x1080x16}"
+
+# Start fluxbox as a light weight window manager.
+startInBackgroundIfNotRunning "fluxbox" sudoUserIf "dbus-launch startfluxbox"
+
+# Start x11vnc
+startInBackgroundIfNotRunning "x11vnc" sudoIf "x11vnc -display ${DISPLAY:-:1} -rfbport ${VNC_PORT:-5901} -localhost -no6 -xkb -shared -forever -passwdfile $HOME/.vnc/passwd"
+
+# Set resolution
+/usr/local/bin/set-resolution ${VNC_RESOLUTION:-1280x720} ${VNC_DPI:-72}
+
+
+# Spin up noVNC if installed and not runnning.
+if [ -d "/usr/local/novnc" ] && [ "$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
+	keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen ${NOVNC_PORT:-6080} --vnc localhost:${VNC_PORT:-5901}"
+	log "noVNC started."
+else
+	log "noVNC is already running or not installed."
+fi
+
+# Run whatever was passed in
+log "Executing \"$@\"."
+"$@"
+log "** SCRIPT EXIT **"

.devcontainer/bin/set-resolution

@@ -0,0 +1,25 @@
+#!/bin/bash
+RESOLUTION=${1:-${VNC_RESOLUTION:-1920x1080}}
+DPI=${2:-${VNC_DPI:-72}}
+if [ -z "$1" ]; then
+	echo -e "**Current Settings **\n"
+	xrandr
+	echo -n -e "\nEnter new resolution (WIDTHxHEIGHT, blank for ${RESOLUTION}, Ctrl+C to abort).\n> "
+	read NEW_RES
+	if [ "${NEW_RES}" != "" ]; then
+		RESOLUTION=${NEW_RES}
+	fi
+	if [ -z "$2" ]; then
+		echo -n -e "\nEnter new DPI (blank for ${DPI}, Ctrl+C to abort).\n> "
+		read NEW_DPI
+		if [ "${NEW_DPI}" != "" ]; then
+			DPI=${NEW_DPI}
+		fi
+	fi
+fi
+
+xrandr --fb ${RESOLUTION} --dpi ${DPI} > /dev/null 2>&1
+
+echo -e "\n**New Settings **\n"
+xrandr
+echo

.devcontainer/devcontainer.json

@@ -0,0 +1,45 @@
+{
+	"name": "Code - OSS",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": {
+			"MAX_VNC_RESOLUTION": "1920x1080x16",
+			"TARGET_VNC_RESOLUTION": "1280x768",
+			"TARGET_VNC_PORT": "5901",
+			"TARGET_NOVNC_PORT": "6080",
+			"VNC_PASSWORD": "vscode",
+			"INSTALL_FIREFOX": "true"
+		}
+	},
+	"overrideCommand": false,
+	"runArgs": [
+		"--init",
+		// seccomp=unconfined is required for Chrome sandboxing
+		"--security-opt", "seccomp=unconfined"
+	],
+
+	"settings": {
+		// zsh is also available
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"resmon.show.battery": false,
+		"resmon.show.cpufreq": false,
+		"remote.extensionKind": {
+			"ms-vscode.js-debug-nightly": "workspace",
+			"msjsdiag.debugger-for-chrome": "workspace"
+		},
+		"debug.chrome.useV3": true
+	},
+
+	// noVNC, VNC ports
+	"forwardPorts": [6080, 5901],
+
+	"extensions": [
+		"dbaeumer.vscode-eslint",
+		"EditorConfig.EditorConfig",
+		"msjsdiag.debugger-for-chrome",
+		"mutantdino.resourcemonitor",
+		"GitHub.vscode-pull-request-github"
+	],
+
+	"remoteUser": "node"
+}

.devcontainer/fluxbox/apps

@@ -0,0 +1,9 @@
+[app] (name=code-oss-dev)
+  [Position]	(CENTER)	{0 0}
+	[Maximized]	{yes}
+  [Dimensions]	{100% 100%}
+[end]
+[transient] (role=GtkFileChooserDialog)
+  [Position]	(CENTER)	{0 0}
+  [Dimensions]	{70% 70%}
+[end]

.devcontainer/fluxbox/init

@@ -0,0 +1,9 @@
+session.menuFile:	~/.fluxbox/menu
+session.keyFile: ~/.fluxbox/keys
+session.styleFile: /usr/share/fluxbox/styles//Squared_for_Debian
+session.configVersion:	13
+session.screen0.workspaces: 1
+session.screen0.workspacewarping: false
+session.screen0.toolbar.widthPercent: 100
+session.screen0.strftimeFormat: %d %b, %a %02k:%M:%S
+session.screen0.toolbar.tools: prevworkspace, workspacename, nextworkspace, clock, prevwindow, nextwindow, iconbar, systemtray

.devcontainer/fluxbox/menu

@@ -0,0 +1,16 @@
+[begin] (  Code - OSS Development Container  )
+	[exec] (File Manager) { nautilus ~ } <>
+	[exec] (Terminal) {/usr/bin/gnome-terminal --working-directory=~ } <>
+	[exec] (Start Code - OSS) { x-terminal-emulator -T "Code - OSS Build" -e bash /workspaces/vscode*/scripts/code.sh } <>
+	[submenu] (System >) {}
+		[exec] (Set Resolution) { x-terminal-emulator -T "Set Resolution" -e bash /usr/local/bin/set-resolution } <>
+		[exec] (Passwords and Keys) { seahorse } <>
+		[exec] (Top) { x-terminal-emulator -T "Top" -e /usr/bin/top } <>
+		[exec] (Editres) {editres} <>
+		[exec] (Xfontsel) {xfontsel} <>
+		[exec] (Xkill) {xkill} <>
+		[exec] (Xrefresh) {xrefresh} <>
+	[end]
+	[config] (Configuration >)
+	[workspaces] (Workspaces >)
+[end]

.eslintrc.json

@@ -42,7 +42,15 @@
         "jsdoc/no-types": "warn",
         "semi": "off",
         "@typescript-eslint/semi": "warn",
-        "@typescript-eslint/class-name-casing": "warn",
+        "@typescript-eslint/naming-convention": [
+            "warn",
+            {
+                "selector": "class",
+                "format": [
+                    "PascalCase"
+                ]
+            }
+        ],
         "code-no-unused-expressions": [
             "warn",
             {
@@ -63,13 +71,18 @@
                 "browser": [
                     "common"
                 ],
-                "electron-main": [
+                "electron-sandbox": [
                     "common",
-                    "node"
+                    "browser"
                 ],
                 "electron-browser": [
                     "common",
                     "browser",
+                    "node",
+                    "electron-sandbox"
+                ],
+                "electron-main": [
+                    "common",
                     "node"
                 ]
             }
@@ -106,6 +119,14 @@
                     "rxjs/*"
                 ]
             },
+            {
+                "target": "**/{vs,sql}/base/electron-sandbox/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser,electron-sandbox}/**"
+                ]
+            },
             {
                 "target": "**/{vs,sql}/base/node/**",
                 "restrictions": [
@@ -155,13 +176,22 @@
                     "*" // node modules
                 ]
             },
+            {
+                "target": "**/{vs,sql}/base/parts/*/electron-sandbox/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,electron-sandbox}/**"
+                ]
+            },
             {
                 "target": "**/{vs,sql}/base/parts/*/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -191,10 +221,10 @@
                     "typemoq",
                     "sinon",
                     "vs/nls",
-					"azdata",
+                    "azdata",
                     "**/{vs,sql}/base/common/**",
-                    "**/{vs,sql}/base/test/common/**",
                     "**/{vs,sql}/base/parts/*/common/**",
+                    "**/{vs,sql}/base/test/common/**",
                     "**/{vs,sql}/platform/*/common/**",
                     "**/{vs,sql}/platform/*/test/common/**"
                 ]
@@ -221,15 +251,25 @@
                     "*" // node modules
                 ]
             },
+            {
+                "target": "**/{vs,sql}/platform/*/electron-sandbox/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/platform/*/{common,browser,electron-sandbox}/**"
+                ]
+            },
             {
                 "target": "**/{vs,sql}/platform/*/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "azdata",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,node}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/*/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -442,18 +482,34 @@
                     "**/{vs,sql}/**/{common,worker}/**"
                 ]
             },
+            {
+                "target": "**/{vs,sql}/workbench/electron-sandbox/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/platform/*/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/editor/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
+                    "**/{vs,sql}/workbench/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/api/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/services/*/{common,browser,electron-sandbox}/**"
+                ]
+            },
             {
                 "target": "**/{vs,sql}/workbench/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/*/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/editor/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/editor/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "**/{vs,sql}/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**",
-                    "**/{vs,sql}/workbench/services/*/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/services/*/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -465,7 +521,7 @@
                     "**/{vs,sql}/base/**",
                     "**/{vs,sql}/platform/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "vs/workbench/contrib/files/common/editors/fileEditorInput",
                     "**/{vs,sql}/workbench/services/**",
                     "**/{vs,sql}/workbench/test/**",
@@ -486,7 +542,9 @@
                     "**/{vs,sql}/workbench/api/**/common/**",
                     "vs/workbench/contrib/files/common/editors/fileEditorInput", // this should be fine, it only accesses constants from contrib
                     "vscode-textmate",
-                    "vscode-oniguruma"
+                    "vscode-oniguruma",
+                    "iconv-lite-umd",
+                    "semver-umd"
                 ]
             },
             {
@@ -537,16 +595,30 @@
                     "*" // node modules
                 ]
             },
+            {
+                "target": "**/{vs,sql}/workbench/services/**/electron-sandbox/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser,worker,electron-sandbox}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/api/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,electron-sandbox}/**"
+                ]
+            },
             {
                 "target": "**/{vs,sql}/workbench/services/**/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**",
-                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -559,7 +631,7 @@
                     "**/{vs,sql}/base/**",
                     "**/{vs,sql}/platform/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "**/{vs,sql}/workbench/services/**",
                     "**/{vs,sql}/workbench/contrib/**",
                     "**/{vs,sql}/workbench/test/**",
@@ -663,20 +735,47 @@
                     "*" // node modules
                 ]
             },
+            {
+                "target": "**/{vs,sql}/workbench/contrib/**/electron-sandbox/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser,worker,electron-sandbox}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/api/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/contrib/**/{common,browser,electron-sandbox}/**"
+                ]
+            },
             {
                 "target": "**/{vs,sql}/workbench/contrib/**/electron-browser/**",
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**",
-                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/workbench/contrib/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/contrib/**/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "*" // node modules
                 ]
             },
+            {
+                "target": "**/{vs,sql}/code/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/code/**/{common,browser}/**",
+                    "**/{vs,sql}/workbench/workbench.web.api"
+                ]
+            },
             {
                 "target": "**/{vs,sql}/code/node/**",
                 "restrictions": [
@@ -693,10 +792,10 @@
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{vs,sql}/base/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/base/parts/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
-                    "**/{vs,sql}/code/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/code/**/{common,browser,node,electron-sandbox,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -724,6 +823,66 @@
                     "*" // node modules
                 ]
             },
+            {
+                "target": "**/src/{vs,sql}/workbench/workbench.common.main.ts",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/**/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/src/{vs,sql}/workbench/workbench.web.main.ts",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/**/{common,browser}/**",
+                    "**/{vs,sql}/workbench/workbench.common.main"
+                ]
+            },
+            {
+                "target": "**/src/{vs,sql}/workbench/workbench.web.api.ts",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/**/{common,browser}/**",
+                    "**/{vs,sql}/workbench/workbench.web.main"
+                ]
+            },
+            {
+                "target": "**/src/{vs,sql}/workbench/workbench.sandbox.main.ts",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/**/{common,browser,electron-sandbox}/**",
+                    "**/{vs,sql}/workbench/workbench.common.main"
+                ]
+            },
+            {
+                "target": "**/src/{vs,sql}/workbench/workbench.desktop.main.ts",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/workbench.common.main",
+                    "**/{vs,sql}/workbench/workbench.sandbox.main"
+                ]
+            },
             {
                 "target": "**/extensions/**",
                 "restrictions": "**/*"

.github/classifier.yml

@@ -8,11 +8,13 @@
     Area - Acquisition: [],
     Area - Azure: [],
     Area - Backup\Restore: [],
+    Area - Big Data Cluster: [ charles-gagnon ],
     Area - Charting\Insights: [],
-    Area - Connection: [ charles-gagnon ],
+    Area - Connection: [ ],
     Area - DacFX: [],
     Area - Dashboard: [],
     Area - Data Explorer: [],
+    Area - Data Virtualization: [ charles-gagnon ],
     Area - Edit Data: [],
     Area - Extensibility: [],
     Area - External Table: [],
@@ -22,6 +24,7 @@
     Area - Notebooks: [ chlafreniere ],
     Area - Performance: [],
     Area - Query Editor: [ anthonydresser ],
+    Area - Query History: [ charles-gagnon ],
     Area - Query Plan: [],
     Area - Reliability: [],
     Area - Resource Deployment: [],

.github/pull_request_template.md

@@ -2,7 +2,7 @@
 * Read our Pull Request guidelines:
   https://github.com/Microsoft/azuredatastudio/wiki/How-to-Contribute#pull-requests.
 * Associate an issue with the Pull Request.
-* Ensure that the code is up-to-date with the `master` branch.
+* Ensure that the code is up-to-date with the `main` branch.
 * Include a description of the proposed changes and how to test them.
 -->
 

.github/workflows/ci.yml

@@ -3,11 +3,11 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
       - release/*
   pull_request:
     branches:
-      - master
+      - main
       - release/*
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2.2.0
     # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
     - run: |
         sudo apt-get update
@@ -51,16 +51,14 @@ jobs:
       name: Run Unit Tests (Electron)
     - run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
       name: Run Extension Unit Tests (Electron)
-    # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
-    - run: |
-        mkdir .build/coverage-combined
-        cat .build/coverage-single/lcov.info ./extensions/admin-tool-ext-win/coverage/lcov.info ./extensions/agent/coverage/lcov.info ./extensions/azurecore/coverage/lcov.info ./extensions/cms/coverage/lcov.info ./extensions/dacpac/coverage/lcov.info ./extensions/schema-compare/coverage/lcov.info ./extensions/notebook/coverage/lcov.info ./extensions/resource-deployment/coverage/lcov.info ./extensions/machine-learning/coverage/lcov.info > .build/coverage-combined/lcov.info
-      name: Merge coverage reports
+      # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
+    - run: node test/combineCoverage
+      name: Combine code coverage files
     - name: Upload Code Coverage
       uses: coverallsapp/github-action@v1.1.1
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: '.build/coverage-combined/lcov.info'
+        path-to-lcov: 'test/coverage/lcov.info'
 
     # Fails with cryptic error (e.g. https://github.com/microsoft/vscode/pull/90292/checks?check_run_id=433681926#step:13:9)
     # - run: DISPLAY=:10 yarn test-browser --browser chromium
@@ -74,7 +72,7 @@ jobs:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2.2.0
     - uses: actions/setup-node@v1
       with:
         node-version: 10
@@ -110,7 +108,7 @@ jobs:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2.2.0
     - uses: actions/setup-node@v1
       with:
         node-version: 10
@@ -143,7 +141,7 @@ jobs:
   #     CHILD_CONCURRENCY: "1"
   #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   #   steps:
-  #   - uses: actions/checkout@v1
+  #   - uses: actions/checkout@v2.2.0
   #   # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
   #   - run: |
   #       sudo apt-get update

.github/workflows/codeql.yml

@@ -0,0 +1,46 @@
+name: "Code Scanning - Action"
+
+on:
+  push:
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  CodeQL-Build:
+
+    strategy:
+      fail-fast: false
+
+
+    # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below).
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/on-issue-open.yml

@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.2.0
         with:
           repository: 'microsoft/azuredatastudio'
-          ref: master
+          ref: main
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions/build/actions

.github/workflows/on-pr-open.yml

@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'microsoft/azuredatastudio'
-          ref: master
+          ref: main
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions/build/actions

.gitignore

@@ -24,6 +24,7 @@ out-vscode-reh-web-min/
 out-vscode-reh-web-pkg/
 out-vscode-web/
 out-vscode-web-min/
+out-vscode-web-pkg/
 src/vs/server
 resources/server
 build/node_modules

.vscode/launch.json

@@ -20,15 +20,13 @@
 			"port": 5870,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"hidden": true
-			}
+			]
 		},
 		{
 			"type": "pwa-chrome",
 			"request": "attach",
 			"name": "Attach to Shared Process",
+			"timeout": 30000,
 			"port": 9222,
 			"urlFilter": "*sharedProcess.html*",
 			"presentation": {
@@ -60,6 +58,7 @@
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to Main Process",
+			"timeout": 30000,
 			"port": 5875,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
@@ -69,7 +68,7 @@
 			}
 		},
 		{
-			"type": "chrome",
+			"type": "pwa-chrome",
 			"request": "attach",
 			"name": "Attach to azuredatastudio",
 			"timeout": 50000,
@@ -91,9 +90,10 @@
 			"port": 9222,
 			"timeout": 20000,
 			"env": {
-				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null
+				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
+				"VSCODE_SKIP_PRELAUNCH": "1"
 			},
-			"breakOnLoad": false,
+			"cleanUp": "wholeBrowser",
 			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
 				"--inspect=5875",
@@ -106,40 +106,14 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
-			"browserLaunchLocation": "workspace"
-		},
-		{
-			"type": "chrome",
-			"request": "launch",
-			"name": "Launch azuredatastudio with new notebook command",
-			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat"
-			},
-			"osx": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
-			},
-			"linux": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
-			},
-			"urlFilter": "*index.html*",
-			"runtimeArgs": [
-				"--inspect=5875",
-				"--command=notebook.command.new"
-			],
-			"skipFiles": [
-				"**/winjs*.js"
-			],
-			"webRoot": "${workspaceFolder}",
-			"timeout": 45000
+			"browserLaunchLocation": "workspace",
+			"preLaunchTask": "Ensure Prelaunch Dependencies",
 		},
 		{
 			"type": "chrome",
 			"request": "launch",
 			"name": "Launch ADS (Web) (TBD)",
-			"runtimeExecutable": "yarn",
-			"runtimeArgs": [
-				"web"
-			],
+			"program": "${workspaceFolder}/resources/serverless/code-web.js",
 			"presentation": {
 				"group": "0_vscode",
 				"order": 2
@@ -175,6 +149,18 @@
 				"order": 3
 			}
 		},
+		{
+			"type": "pwa-msedge",
+			"request": "launch",
+			"name": "VS Code (Web, Edge)",
+			"url": "http://localhost:8080",
+			"pauseForSourceMap": false,
+			"preLaunchTask": "Run web",
+			"presentation": {
+				"group": "0_vscode",
+				"order": 3
+			}
+		},
 		{
 			"type": "node",
 			"request": "launch",
@@ -281,6 +267,7 @@
 		},
 		{
 			"name": "Azure Data Studio",
+			"stopAll": true,
 			"configurations": [
 				"Launch azuredatastudio",
 				"Attach to Main Process",

.vscode/notebooks/api.github-issues

@@ -0,0 +1,38 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Config",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"July 2020\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Finalization",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repo $milestone label:api-finalization",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Proposals",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repo $milestone is:open label:api-proposal ",
+    "editable": true
+  }
+]

.vscode/notebooks/inbox.github-issues

@@ -0,0 +1,47 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "##### `Config`: defines the inbox query",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$inbox=repo:microsoft/vscode is:open no:assignee -label:feature-request -label:testplan-item -label:plan-item "
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Inbox tracking and Issue triage"
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "New issues or pull requests submitted by the community are initially triaged by an [automatic classification bot](https://github.com/microsoft/vscode-github-triage-actions/tree/master/classifier-deep). Issues that the bot does not correctly triage are then triaged by a team member. The team rotates the inbox tracker on a weekly basis.\n\nA [mirror](https://github.com/JacksonKearl/testissues/issues) of the VS Code issue stream is available with details about how the bot classifies issues, including feature-area classifications and confidence ratings. Per-category confidence thresholds and feature-area ownership data is maintained in [.github/classifier.json](https://github.com/microsoft/vscode/blob/master/.github/classifier.json). \n\n💡 The bot is being run through a GitHub action that runs every 30 minutes. Give the bot the opportunity to classify an issue before doing it manually.\n\n### Inbox Tracking\n\nThe inbox tracker is responsible for the [global inbox](https://github.com/Microsoft/vscode/issues?utf8=%E2%9C%93&q=is%3Aopen+no%3Aassignee+-label%3Afeature-request+-label%3Atestplan-item+-label%3Aplan-item) containing all **open issues and pull requests** that\n- are neither **feature requests** nor **test plan items** nor **plan items** and\n- have **no owner assignment**.\n\nThe **inbox tracker** may perform any step described in our [issue triaging documentation](https://github.com/microsoft/vscode/wiki/Issues-Triaging) but its main responsibility is to route issues to the actual feature area owner.\n\nFeature area owners track the **feature area inbox** containing all **open issues and pull requests** that\n- are personally assigned to them and are not assigned to any milestone\n- are labeled with their feature area label and are not assigned to any milestone.\nThis secondary triage may involve any of the steps described in our [issue triaging documentation](https://github.com/microsoft/vscode/wiki/Issues-Triaging) and results in a fully triaged or closed issue.\n\nThe [github triage extension](https://github.com/microsoft/vscode-github-triage-extension) can be used to assist with triaging — it provides a \"Command Palette\"-style list of triaging actions like assignment, labeling, and triggers for various bot actions."
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Triage Inbox\n\nAll inbox issues but not those that need more information. These issues need to be triaged, e.g assigned to a user or ask for more information",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$inbox -label:\"needs more info\" -label:emmet",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Inbox\n\nAll issues that have no assignee and that have neither **feature requests** nor **test plan items** nor **plan items**.",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$inbox -label:emmet",
+    "editable": true
+  }
+]

.vscode/notebooks/my-work.github-issues

@@ -0,0 +1,98 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "##### `Config`: This should be changed every month/milestone",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks\n\n// current milestone name\n$milestone=milestone:\"June 2020\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "github-issues",
+    "value": "## Milestone Work",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos $milestone assignee:@me is:open",
+    "editable": false
+  },
+  {
+    "kind": 1,
+    "language": "github-issues",
+    "value": "## Bugs, Debt, Features...",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### My Bugs",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos assignee:@me is:open label:bug",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Debt & Engineering",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos assignee:@me is:open label:debt OR $repos assignee:@me is:open label:engineering",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Performance 🐌 🔜 🏎",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos assignee:@me is:open label:perf OR $repos assignee:@me is:open label:perf-startup OR $repos assignee:@me is:open label:perf-bloat OR $repos assignee:@me is:open label:freeze-slow-crash-leak",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Feature Requests",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos assignee:@me is:open label:feature-request milestone:Backlog sort:reactions-+1-desc",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos assignee:@me is:open milestone:\"Backlog Candidates\"",
+    "editable": false
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Not Actionable",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos assignee:@me is:open label:\"needs more info\"",
+    "editable": false
+  }
+]

.vscode/notebooks/verification.github-issues

@@ -0,0 +1,55 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Bug Verification Queries\n\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. ",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "#### Config: update list of `repos` and the `milestone`",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"June 2020\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Bugs You Filed",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate author:@me",
+    "editable": false
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Bugs From Outside",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos $milestone is:closed  -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl  -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand",
+    "editable": false
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### All"
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate",
+    "editable": false
+  }
+]

.vscode/searches/es6.code-search

@@ -2,7 +2,7 @@
 # Flags: CaseSensitive WordMatch
 # ContextLines: 2
 
-16 results - 5 files
+14 results - 4 files
 
 src/vs/base/browser/dom.ts:
   81  };
@@ -34,24 +34,11 @@ src/vs/base/common/arrays.ts:
   420   */
   421  export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
 
-  560  
-  561  /**
-  562:  * @deprecated ES6: use `Array.find`
-  563   */
-  564  export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
-
-src/vs/base/common/map.ts:
-  11  
-  12  /**
-  13:  * @deprecated ES6: use `[...SetOrMap.values()]`
-  14   */
-  15  export function values<V = any>(set: Set<V>): V[];
-
-  22  
-  23  /**
-  24:  * @deprecated ES6: use `[...map.keys()]`
-  25   */
-  26  export function keys<K, V>(map: Map<K, V>): K[] {
+  569  
+  570  /**
+  571:  * @deprecated ES6: use `Array.find`
+  572   */
+  573  export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
 
 src/vs/base/common/objects.ts:
   115  
@@ -79,8 +66,8 @@ src/vs/base/common/strings.ts:
   170   */
   171  export function endsWith(haystack: string, needle: string): boolean {
 
-  853  
-  854  /**
-  855:  * @deprecated ES6
-  856   */
-  857  export function repeat(s: string, count: number): string {
+  861  
+  862  /**
+  863:  * @deprecated ES6
+  864   */
+  865  export function repeat(s: string, count: number): string {

.vscode/settings.json

@@ -26,6 +26,7 @@
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true,
 		"src/vs/base/test/node/uri.test.data.txt": true,
+		"src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts": true,
 		"src/vs/server": false
 	},
 	"lcov.path": [
@@ -72,7 +73,7 @@
 	},
 	"gulp.autoDetect": "off",
 	"files.insertFinalNewline": true,
-  "[typescript]": {
+	"[typescript]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
 	},
 	"typescript.tsc.autoDetect": "off"

.vscode/tasks.json

@@ -3,12 +3,8 @@
 	"tasks": [
 		{
 			"type": "npm",
-			"script": "watchd",
-			"label": "Build VS Code",
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
+			"script": "watch-clientd",
+			"label": "Build VS Code Core",
 			"isBackground": true,
 			"presentation": {
 				"reveal": "never"
@@ -31,6 +27,71 @@
 				}
 			}
 		},
+		{
+			"type": "npm",
+			"script": "watch-extensionsd",
+			"label": "Build VS Code Extensions",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": {
+				"owner": "typescript",
+				"applyTo": "closedDocuments",
+				"fileLocation": [
+					"absolute"
+				],
+				"pattern": {
+					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				},
+				"background": {
+					"beginsPattern": "Starting compilation",
+					"endsPattern": "Finished compilation"
+				}
+			}
+		},
+		{
+			"label": "Build VS Code",
+			"dependsOn": [
+				"Build VS Code Core",
+				"Build VS Code Extensions"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		},
+		{
+			"type": "npm",
+			"script": "kill-watch-clientd",
+			"label": "Kill Build VS Code Core",
+			"group": "build",
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": "$tsc"
+		},
+		{
+			"type": "npm",
+			"script": "kill-watch-extensionsd",
+			"label": "Kill Build VS Code Extensions",
+			"group": "build",
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": "$tsc"
+		},
+		{
+			"label": "Kill Build VS Code",
+			"dependsOn": [
+				"Kill Build VS Code Core",
+				"Kill Build VS Code Extensions"
+			],
+			"group": "build"
+		},
 		{
 			"type": "npm",
 			"script": "strict-vscode-watch",
@@ -47,12 +108,39 @@
 		},
 		{
 			"type": "npm",
-			"script": "kill-watchd",
-			"label": "Kill Build VS Code",
+			"script": "watch-webd",
+			"label": "Build Web Extensions",
 			"group": "build",
+			"isBackground": true,
 			"presentation": {
 				"reveal": "never"
 			},
+			"problemMatcher": {
+				"owner": "typescript",
+				"applyTo": "closedDocuments",
+				"fileLocation": [
+					"absolute"
+				],
+				"pattern": {
+					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				},
+				"background": {
+					"beginsPattern": "Starting compilation",
+					"endsPattern": "Finished compilation"
+				}
+			}
+		},
+		{
+			"type": "npm",
+			"script": "kill-watch-webd",
+			"label": "Kill Build Web Extensions",
+			"group": "build",
+			"presentation": {
+				"reveal": "never",
+			},
 			"problemMatcher": "$tsc"
 		},
 		{
@@ -89,7 +177,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "yarn web -- --no-launch",
+			"command": "yarn web --no-launch",
 			"label": "Run web",
 			"isBackground": true,
 			"problemMatcher": {
@@ -112,6 +200,14 @@
 				"source": "eslint",
 				"base": "$eslint-stylish"
 			}
-		}
+		},
+		{
+			"type": "shell",
+			"command": "node build/lib/prelaunch.js",
+			"label": "Ensure Prelaunch Dependencies",
+			"presentation": {
+				"reveal": "silent"
+			}
+		},
 	]
 }

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "7.2.4"
+target "7.3.2"
 runtime "electron"

CHANGELOG.md

@@ -1,5 +1,53 @@
 # Change Log
 
+## Version 1.20.1
+* Release date: July 17, 2020
+* Release status: General Availability
+* Fix bug #11372 Object Explorer drag-and-drop table incorrectly wraps table names [#11372](https://github.com/microsoft/azuredatastudio/issues/11372)
+* Fix bug #11356 Dark theme is now the default theme [#11356](https://github.com/microsoft/azuredatastudio/issues/11356)
+* Known Issues:
+    * Some users have reported connection errors from the new Microsoft.Data.SqlClient v2.0.0 included in this release. Users have found [following these instructions](https://github.com/microsoft/azuredatastudio/issues/11367#issuecomment-659614111) to successfully connect. This issue was caused by a client driver update which fixed an issue where TLS encryption wasn't enforced correctly. See https://github.com/dotnet/SqlClient/blob/master/release-notes/2.0/2.0.0.md#breaking-changes-1 and https://docs.microsoft.com/en-us/sql/relational-databases/native-client/features/using-encryption-without-validation for more information.
+
+## Version 1.20.0
+* Release date: July 15, 2020
+* Release status: General Availability
+* Feature Tour
+* New Notebook Features
+    * Header support in Markdown Toolbar
+    * Side-by-side Markdown preview in Text Cells
+* Drag and drop columns and tables into Query Editor
+* Azure Account icon added to Activity Bar
+* Address issues in [July 2020 Milestone](https://github.com/microsoft/azuredatastudio/milestone/57?closed=1)
+* Bug fixes
+
+## Version 1.19.0
+* Release date: June 15, 2020
+* Release status: General Availability
+* Address issues in https://github.com/microsoft/azuredatastudio/milestone/55?closed=1
+* Bug fixes
+
+## Version 1.18.1
+* Release date: May 27, 2020
+* Release status: General Availability
+* Hotfix for https://github.com/microsoft/azuredatastudio/issues/10538
+* Hotfix for https://github.com/microsoft/azuredatastudio/issues/10537
+
+## Version 1.18.0
+* Release date: May 20, 2020
+* Release status: General Availability
+* Announcing Redgate SQL Prompt extension - This extension lets you manage formatting styles directly within Azure Data Studio, so you can create and edit your styles without leaving the IDE.
+* Announcing the new machine learning extension. This extension enables you to:
+    * Manage Python and R packages with SQL Server machine learning services with Azure Data Studio.
+    * Use ONNX model to make predictions in Azure SQL Edge.
+    * View ONNX models in an Azure SQL Edge database.
+    * Import ONNX models from a file or Azure Machine Learning into Azure SQL Edge database.
+    * Create a notebook to run experiments.
+* New notebook features:
+    * Added new Python dependencies wizard
+    * Improvements to the notebook markdown toolbar
+* Added support for parameterization for Always Encrypted - Allows you to run queries that insert, update or filter by encrypted database columns.
+* Bug fixes
+
 ## Version 1.17.1
 * Release date: April 29, 2020
 * Release status: General Availability

README.md

@@ -1,7 +1,7 @@
 # Azure Data Studio
 
 [![Join the chat at https://gitter.im/Microsoft/sqlopsstudio](https://badges.gitter.im/Microsoft/sqlopsstudio.svg)](https://gitter.im/Microsoft/sqlopsstudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://dev.azure.com/azuredatastudio/azuredatastudio/_apis/build/status/Azure%20Data%20Studio%20CI?branchName=master)](https://dev.azure.com/azuredatastudio/azuredatastudio/_build/latest?definitionId=4&branchName=master)
+[![Build Status](https://dev.azure.com/azuredatastudio/azuredatastudio/_apis/build/status/Azure%20Data%20Studio%20CI?branchName=main)](https://dev.azure.com/azuredatastudio/azuredatastudio/_build/latest?definitionId=4&branchName=main)
 [![Twitter Follow](https://img.shields.io/twitter/follow/azuredatastudio?style=social)](https://twitter.com/azuredatastudio)
 
 Azure Data Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux.
@@ -21,14 +21,14 @@ Azure Data Studio is a data management tool that enables you to work with SQL Se
 
 Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.
 
-## Try out the latest insiders build from `master`:
+## Try out the latest insiders build from `main`:
 - [Windows User Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-user/insider)
 - [Windows System Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64/insider)
 - [Windows ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-archive/insider)
 - [macOS ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/darwin/insider)
 - [Linux TAR.GZ - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/linux-x64/insider)
 
-See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CHANGELOG.md) for additional details of what's in this release.
+See the [change log](https://github.com/Microsoft/azuredatastudio/blob/main/CHANGELOG.md) for additional details of what's in this release.
 
 ## **Feature Highlights**
 
@@ -47,7 +47,7 @@ See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CH
 
 Here are some of these features in action.
 
-<img src='https://github.com/Microsoft/azuredatastudio/blob/master/docs/overview_screen.jpg' width='800px'>
+<img src='https://github.com/Microsoft/azuredatastudio/blob/main/docs/overview_screen.jpg' width='800px'>
 
 ## Contributing
 If you are interested in fixing issues and contributing directly to the code base,
@@ -60,9 +60,7 @@ please see the document [How to Contribute](https://github.com/Microsoft/azureda
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
 ## Localization
-Azure Data Studio localization is now open for community contributions. You can contribute to localization for both software and docs. https://aka.ms/SQLOpsStudioLoc
-
-Localization is now opened for 10 languages: French, Italian, German, Spanish, Simplified Chinese, Traditional Chinese, Japanese, Korean, Russian, and Portuguese (Brazil). Help us make Azure Data Studio available in your language!
+Azure Data Studio is localized into 10 languages: French, Italian, German, Spanish, Simplified Chinese, Traditional Chinese, Japanese, Korean, Russian, and Portuguese (Brazil). The language packs are available in the Extension Manager marketplace. Simply, search for the specific language using the extension marketplace and install. Once you install the selected language, Azure Data Studio will prompt you to restart with the new language.
 
 ## Privacy Statement
 The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement) describes the privacy statement of this software.
@@ -122,19 +120,8 @@ We would like to thank all our users who raised issues, and in particular the fo
 * SebastianPfliegel `Remove sqlExtensionHelp (#312)`
 * olljanat for `Implemented npm version check (#314)`
 * Adam Machanic for helping with the `whoisactive` extension
-* All community localization contributors:
-  * French: Adrien Clerbois, ANAS BELABBES, Antoine Griffard, Arian Papillon, Eric Macarez, Eric Van Thorre, Jérémy LANDON, Matthias GROSPERRIN, Maxime COQUEREL, Olivier Guinart, thierry DEMAN-BARCELÒ, Thomas Potier
-  * Italian: Aldo Donetti, Alessandro Alpi, Andrea Dottor, Bruni Luca, Gianluca Hotz, Luca Nardi, Luigi Bruno, Marco Dal Pino, Mirco Vanini, Pasquale Ceglie, Riccardo Cappello, Sergio Govoni, Stefano Demiliani
-  * German: Anna Henke-Gunvaldson, Ben Weissman, David Ullmer, J.M. ., Kai Modo, Konstantin Staschill, Kostja Klein, Lennart Trunk, Markus Ehrenmüller-Jensen, Mascha Kroenlein, Matthias Knoll, Mourad Louha, Thomas Hütter, Wolfgang Straßer
-  * Spanish: Alberto Poblacion, Andy Gonzalez, Carlos Mendible, Christian Araujo, Daniel D, Eickhel Mendoza, Ernesto Cardenas, Ivan Toledo Ivanovic, Fran Diaz, JESUS GIL, Jorge Serrano Pérez, José Saturnino Pimentel Juárez, Mauricio Hidalgo, Pablo Iglesias, Rikhardo Estrada Rdez, Thierry DEMAN, YOLANDA CUESTA ALTIERI
-  * Japanese: Fujio Kojima, Kazushi KAMEGAWA, Masayoshi Yamada, Masayuki Ozawa, Seiji Momoto, Takashi Kanai, Takayoshi Tanaka, Yoshihisa Ozaki, 庄垣内治
-  * Chinese (simplified): DAN YE, Joel Yang, Lynne Dong, Ryan（Yu） Zhang, Sheng Jiang, Wei Zhang, Zhiliang Xu
-  * Chinese  (Traditional): Bruce Chen, Chiayi Yen, Kevin Yang,  Winnie Lin, 保哥 Will,  謝政廷
-  * Korean: Do-Kyun Kim, Evelyn Kim, Helen Jung, Hong Jmee, jeongwoo choi, Jun Hyoung Lee, Jungsun Kim정선, Justin Yoo, Kavrith mucha, Kiwoong Youm, MinGyu Ju,  MVP_JUNO BEA, Sejun Kim, SOONMAN KWON, sung man ko, Yeongrak Choi, younggun kim, Youngjae Kim, 소영 이
-  * Russian: Andrey Veselov, Anton Fontanov, Anton Savin, Elena Ostrovskaia, Igor Babichev, Maxim Zelensky, Rodion Fedechkin, Tasha T, Vladimir Zyryanov
-  * Portuguese Brazil: Daniel de Sousa, Diogo Duarte, Douglas Correa, Douglas Eccker, José Emanuel Mendes, Marcelo Fernandes, Marcondes Alexandre, Roberto Fonseca, Rodrigo Crespi
 
-And of course, we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/ThirdPartyNotices.txt)
+And of course, we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/ThirdPartyNotices.txt)
 
 ## License
 
@@ -142,10 +129,10 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 
 Licensed under the [Source EULA](LICENSE.txt).
 
-[win-user]: https://go.microsoft.com/fwlink/?linkid=2127556
-[win-system]: https://go.microsoft.com/fwlink/?linkid=2127555
-[win-zip]: https://go.microsoft.com/fwlink/?linkid=2127476
-[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2127554
-[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2127553
-[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2127552
-[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2127551
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2135512
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2135513
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2135514
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2135266
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2135267
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2135268
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2135515

ThirdPartyNotices.txt

@@ -72,6 +72,8 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     vscode-ripgrep: https://github.com/roblourens/vscode-ripgrep
     vscode-textmate: https://github.com/Microsoft/vscode-textmate
     winreg: https://github.com/fresc81/node-winreg
+    xmldom: https://github.com/xmldom/xmldom
+    xml-formatter: https://github.com/chrisbottin/xml-formatter
     xterm: https://github.com/sourcelair/xterm.js
     yargs: https://github.com/yargs/yargs
     yauzl: https://github.com/thejoshwolfe/yauzl
@@ -2225,6 +2227,51 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 =========================================
 END OF winreg NOTICES AND INFORMATION
 
+%% xmldom NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in the
+Software without restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF xmldom NOTICES AND INFORMATION
+
+%% xml-formatter NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright 2019 Chris Bottin (https://github.com/chrisbottin)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF xml-formatter NOTICES AND INFORMATION
+
 %% xterm NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) 2014-2016, SourceLair Private Company (https://www.sourcelair.com)

azure-pipelines.yml

@@ -1,5 +1,5 @@
 trigger:
-  - master
+  - main
   - release/*
 
 jobs:

build/.webignore

@@ -0,0 +1,27 @@
+# cleanup rules for web node modules, .gitignore style
+
+**/*.txt
+**/*.json
+**/*.md
+**/*.d.ts
+**/*.js.map
+**/LICENSE
+**/CONTRIBUTORS
+
+jschardet/index.js
+jschardet/src/**
+jschardet/dist/jschardet.js
+
+vscode-textmate/webpack.config.js
+
+xterm/src/**
+
+xterm-addon-search/src/**
+xterm-addon-search/out/**
+xterm-addon-search/fixtures/**
+
+xterm-addon-unicode11/src/**
+xterm-addon-unicode11/out/**
+
+xterm-addon-webgl/src/**
+xterm-addon-webgl/out/**

build/azure-pipelines/common/extract-telemetry.sh

@@ -10,10 +10,10 @@ git clone --depth 1 https://github.com/Microsoft/vscode-node-debug2.git
 git clone --depth 1 https://github.com/Microsoft/vscode-node-debug.git
 git clone --depth 1 https://github.com/Microsoft/vscode-html-languageservice.git
 git clone --depth 1 https://github.com/Microsoft/vscode-json-languageservice.git
-$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
-$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
+node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
+node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
 mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
 mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
 mv config-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
 cd ..
-rm -rf extraction
+rm -rf extraction

build/azure-pipelines/common/publish.ts

@@ -216,10 +216,10 @@ async function publish(commit: string, quality: string, platform: string, type:
 	console.log('Asset:', JSON.stringify(asset, null, '  '));
 
 	// {{SQL CARBON EDIT}}
-	// Insiders: nightly build from master
+	// Insiders: nightly build from main
 	const isReleased = (
 		(
-			(quality === 'insider' && /^master$|^refs\/heads\/master$/.test(sourceBranch)) ||
+			(quality === 'insider' && /^main$|^refs\/heads\/main$/.test(sourceBranch)) ||
 			(quality === 'rc1' && /^release\/|^refs\/heads\/release\//.test(sourceBranch))
 		) &&
 		/Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy)

build/azure-pipelines/common/symbols.ts

@@ -1,228 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as request from 'request';
-import { createReadStream, createWriteStream, unlink, mkdir } from 'fs';
-import * as github from 'github-releases';
-import { join } from 'path';
-import { tmpdir } from 'os';
-import { promisify } from 'util';
-
-const BASE_URL = 'https://rink.hockeyapp.net/api/2/';
-const HOCKEY_APP_TOKEN_HEADER = 'X-HockeyAppToken';
-
-export interface IVersions {
-	app_versions: IVersion[];
-}
-
-export interface IVersion {
-	id: number;
-	version: string;
-}
-
-export interface IApplicationAccessor {
-	accessToken: string;
-	appId: string;
-}
-
-export interface IVersionAccessor extends IApplicationAccessor {
-	id: string;
-}
-
-enum Platform {
-	WIN_32 = 'win32-ia32',
-	WIN_64 = 'win32-x64',
-	LINUX_64 = 'linux-x64',
-	MAC_OS = 'darwin-x64'
-}
-
-function symbolsZipName(platform: Platform, electronVersion: string, insiders: boolean): string {
-	return `${insiders ? 'insiders' : 'stable'}-symbols-v${electronVersion}-${platform}.zip`;
-}
-
-const SEED = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-async function tmpFile(name: string): Promise<string> {
-	let res = '';
-	for (let i = 0; i < 8; i++) {
-		res += SEED.charAt(Math.floor(Math.random() * SEED.length));
-	}
-
-	const tmpParent = join(tmpdir(), res);
-
-	await promisify(mkdir)(tmpParent);
-
-	return join(tmpParent, name);
-}
-
-function getVersions(accessor: IApplicationAccessor): Promise<IVersions> {
-	return asyncRequest<IVersions>({
-		url: `${BASE_URL}/apps/${accessor.appId}/app_versions`,
-		method: 'GET',
-		headers: {
-			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
-		}
-	});
-}
-
-function createVersion(accessor: IApplicationAccessor, version: string): Promise<IVersion> {
-	return asyncRequest<IVersion>({
-		url: `${BASE_URL}/apps/${accessor.appId}/app_versions/new`,
-		method: 'POST',
-		headers: {
-			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
-		},
-		formData: {
-			bundle_version: version
-		}
-	});
-}
-
-function updateVersion(accessor: IVersionAccessor, symbolsPath: string) {
-	return asyncRequest<IVersions>({
-		url: `${BASE_URL}/apps/${accessor.appId}/app_versions/${accessor.id}`,
-		method: 'PUT',
-		headers: {
-			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
-		},
-		formData: {
-			dsym: createReadStream(symbolsPath)
-		}
-	});
-}
-
-function asyncRequest<T>(options: request.UrlOptions & request.CoreOptions): Promise<T> {
-	return new Promise<T>((resolve, reject) => {
-		request(options, (error, _response, body) => {
-			if (error) {
-				reject(error);
-			} else {
-				resolve(JSON.parse(body));
-			}
-		});
-	});
-}
-
-function downloadAsset(repository: any, assetName: string, targetPath: string, electronVersion: string) {
-	return new Promise((resolve, reject) => {
-		repository.getReleases({ tag_name: `v${electronVersion}` }, (err: any, releases: any) => {
-			if (err) {
-				reject(err);
-			} else {
-				const asset = releases[0].assets.filter((asset: any) => asset.name === assetName)[0];
-				if (!asset) {
-					reject(new Error(`Asset with name ${assetName} not found`));
-				} else {
-					repository.downloadAsset(asset, (err: any, reader: any) => {
-						if (err) {
-							reject(err);
-						} else {
-							const writer = createWriteStream(targetPath);
-							writer.on('error', reject);
-							writer.on('close', resolve);
-							reader.on('error', reject);
-
-							reader.pipe(writer);
-						}
-					});
-				}
-			}
-		});
-	});
-}
-
-interface IOptions {
-	repository: string;
-	platform: Platform;
-	versions: { code: string; insiders: boolean; electron: string; };
-	access: { hockeyAppToken: string; hockeyAppId: string; githubToken: string };
-}
-
-async function ensureVersionAndSymbols(options: IOptions) {
-
-	// Check version does not exist
-	console.log(`HockeyApp: checking for existing version ${options.versions.code} (${options.platform})`);
-	const versions = await getVersions({ accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId });
-	if (!Array.isArray(versions.app_versions)) {
-		throw new Error(`Unexpected response: ${JSON.stringify(versions)}`);
-	}
-
-	if (versions.app_versions.some(v => v.version === options.versions.code)) {
-		console.log(`HockeyApp: Returning without uploading symbols because version ${options.versions.code} (${options.platform}) was already found`);
-		return;
-	}
-
-	// Download symbols for platform and electron version
-	const symbolsName = symbolsZipName(options.platform, options.versions.electron, options.versions.insiders);
-	const symbolsPath = await tmpFile('symbols.zip');
-	console.log(`HockeyApp: downloading symbols ${symbolsName} for electron ${options.versions.electron} (${options.platform}) into ${symbolsPath}`);
-	await downloadAsset(new (github as any)({ repo: options.repository, token: options.access.githubToken }), symbolsName, symbolsPath, options.versions.electron);
-
-	// Create version
-	console.log(`HockeyApp: creating new version ${options.versions.code} (${options.platform})`);
-	const version = await createVersion({ accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId }, options.versions.code);
-
-	// Upload symbols
-	console.log(`HockeyApp: uploading symbols for version ${options.versions.code} (${options.platform})`);
-	await updateVersion({ id: String(version.id), accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId }, symbolsPath);
-
-	// Cleanup
-	await promisify(unlink)(symbolsPath);
-}
-
-// Environment
-const pakage = require('../../../package.json');
-const product = require('../../../product.json');
-const repository = product.electronRepository;
-const electronVersion = require('../../lib/electron').getElectronVersion();
-const insiders = product.quality !== 'stable';
-let codeVersion = pakage.version;
-if (insiders) {
-	codeVersion = `${codeVersion}-insider`;
-}
-const githubToken = process.argv[2];
-const hockeyAppToken = process.argv[3];
-const is64 = process.argv[4] === 'x64';
-const hockeyAppId = process.argv[5];
-
-if (process.argv.length !== 6) {
-	throw new Error(`HockeyApp: Unexpected number of arguments. Got ${process.argv}`);
-}
-
-let platform: Platform;
-if (process.platform === 'darwin') {
-	platform = Platform.MAC_OS;
-} else if (process.platform === 'win32') {
-	platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
-} else {
-	platform = Platform.LINUX_64;
-}
-
-// Create version and upload symbols in HockeyApp
-if (repository && codeVersion && electronVersion && (product.quality === 'stable' || product.quality === 'insider')) {
-	ensureVersionAndSymbols({
-		repository,
-		platform,
-		versions: {
-			code: codeVersion,
-			insiders,
-			electron: electronVersion
-		},
-		access: {
-			githubToken,
-			hockeyAppToken,
-			hockeyAppId
-		}
-	}).then(() => {
-		console.log('HockeyApp: done');
-	}).catch(error => {
-		console.error(`HockeyApp: error ${error} (AppID: ${hockeyAppId})`);
-
-		return process.exit(1);
-	});
-} else {
-	console.log(`HockeyApp: skipping due to unexpected context (repository: ${repository}, codeVersion: ${codeVersion}, electronVersion: ${electronVersion}, quality: ${product.quality})`);
-}

build/azure-pipelines/darwin/app-entitlements.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+</dict>
+</plist>

build/azure-pipelines/darwin/continuous-build-darwin.yml

@@ -29,15 +29,7 @@ steps:
     yarn electron x64
   displayName: Download Electron
 
-- script: |
-    yarn gulp hygiene
-  displayName: Run Hygiene Checks
-
-- script: | # {{SQL CARBON EDIT}} add step
-    yarn strict-vscode
-  displayName: Run Strict Null Check.
-
-# - script: | {{SQL CARBON EDIT}} remove step
+# - script: | {{SQL CARBON EDIT}} remove editor checks
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
 
@@ -65,12 +57,13 @@ steps:
 #     ./scripts/test-integration.sh --tfs "Integration Tests"
 #   displayName: Run Integration Tests (Electron)
 
-# - task: PublishPipelineArtifact@0
-#   inputs:
-#     artifactName: crash-dump-macos
-#     targetPath: .build/crashes
-#   displayName: 'Publish Crash Reports'
-#   condition: succeededOrFailed()
+- task: PublishPipelineArtifact@0
+  inputs:
+    artifactName: crash-dump-macos
+    targetPath: .build/crashes
+  displayName: 'Publish Crash Reports'
+  continueOnError: true
+  condition: failed()
 
 - task: PublishTestResults@2
   displayName: Publish Tests Results

build/azure-pipelines/darwin/entitlements.plist

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-</dict>
-</plist>

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -157,24 +157,18 @@ steps:
     artifactName: crash-dump-macos
     targetPath: .build/crashes
   displayName: 'Publish Crash Reports'
-  condition: succeededOrFailed()
+  continueOnError: true
+  condition: failed()
 
 - script: |
     set -e
-    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
-    APP_NAME="`ls $APP_ROOT | head -n 1`"
-    HELPER_APP_NAME="`echo $APP_NAME | sed -e 's/^Visual Studio //;s/\.app$//'`"
-    APP_FRAMEWORK_PATH="$APP_ROOT/$APP_NAME/Contents/Frameworks"
     security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
     security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
     security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
     echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
     security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
     security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
-    codesign -s 99FM488X57 --deep --force --options runtime --entitlements build/azure-pipelines/darwin/entitlements.plist "$APP_ROOT"/*.app
-    codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-gpu-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper (GPU).app"
-    codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-plugin-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper (Plugin).app"
-    codesign -s 99FM488X57 --force --options runtime --entitlements build/azure-pipelines/darwin/helper-renderer-entitlements.plist "$APP_FRAMEWORK_PATH/$HELPER_APP_NAME Helper (Renderer).app"
+    DEBUG=electron-osx-sign* node build/darwin/sign.js
   displayName: Set Hardened Entitlements
 
 - script: |
@@ -248,16 +242,28 @@ steps:
     SessionTimeout: 60
   displayName: Notarization
 
+- script: |
+    set -e
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
+    "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
+  displayName: Verify start after signing (export configuration)
+
 - script: |
     set -e
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
     AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
     AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
     AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
     ./build/azure-pipelines/darwin/publish.sh
   displayName: Publish
 
+- script: |
+    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
+    yarn gulp upload-vscode-configuration
+  displayName: Upload configuration (for Bing settings search)
+  continueOnError: true
+
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
   displayName: 'Component Detection'
   continueOnError: true

build/azure-pipelines/darwin/publish.sh

@@ -17,11 +17,3 @@ node build/azure-pipelines/common/createAsset.js \
 	archive-unsigned \
 	"vscode-server-darwin.zip" \
 	../vscode-server-darwin.zip
-
-# publish hockeyapp symbols
-# node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" x64 "$VSCODE_HOCKEYAPP_ID_MACOS"
-# Skip hockey app because build failure.
-# https://github.com/microsoft/vscode/issues/90491
-
-# upload configuration
-yarn gulp upload-vscode-configuration

build/azure-pipelines/darwin/sql-product-build-darwin-signing.yml

@@ -0,0 +1,82 @@
+steps:
+  - task: InstallAppleCertificate@2
+    displayName: 'Install developer certificate'
+    inputs:
+      certSecureFile: 'osx_signing_key.p12'
+    condition: eq(variables['signed'], true)
+
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download Build Artifacts'
+    inputs:
+      downloadType: specific
+      itemPattern: 'drop/darwin/archive/azuredatastudio-darwin-unsigned.zip'
+      downloadPath: '$(Build.SourcesDirectory)/.build/'
+
+  - script: |
+      pushd $(Build.SourcesDirectory)/.build/drop/darwin/archive
+      mv azuredatastudio-darwin-unsigned.zip azuredatastudio-darwin.zip
+    displayName: 'Rename the file'
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    displayName: 'ESRP CodeSigning'
+    inputs:
+      ConnectedServiceName: 'Code Signing'
+      FolderPath: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
+      Pattern: 'azuredatastudio-darwin.zip'
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-401337-Apple",
+            "operationCode": "MacAppDeveloperSign",
+            "parameters": {
+              "Hardening": "Enable"
+            },
+            "toolName": "sign",
+            "toolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 90
+    condition: and(succeeded(), eq(variables['signed'], true))
+
+  - script: |
+      zip -d $(Build.SourcesDirectory)/.build/drop/darwin/archive/azuredatastudio-darwin.zip "*.pkg"
+    displayName: Clean Archive
+    condition: and(succeeded(), eq(variables['signed'], true))
+
+  - task: EsrpCodeSigning@1
+    displayName: 'ESRP Notarization'
+    inputs:
+      ConnectedServiceName: 'Code Signing'
+      FolderPath: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
+      Pattern: 'azuredatastudio-darwin.zip'
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "KeyCode": "CP-401337-Apple",
+            "OperationCode": "MacAppNotarize",
+            "Parameters": {
+              "BundleId": "com.microsoft.azuredatastudio-$(VSCODE_QUALITY)"
+            },
+            "ToolName": "sign",
+            "ToolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 120
+    condition: and(succeeded(), eq(variables['signed'], true))
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)/darwin/archive'
+    inputs:
+      SourceFolder: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
+      TargetFolder: '$(Build.ArtifactStagingDirectory)/darwin/archive'
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: drop'
+    condition: always()
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: 'Component Detection'
+    inputs:
+      failOnAlert: true

build/azure-pipelines/darwin/sql-product-build-darwin.yml

@@ -27,11 +27,11 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: '10.15.3'
+      versionSpec: "12.13.0"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
-      versionSpec: '1.x'
+      versionSpec: "1.x"
 
   - task: AzureKeyVault@1
     displayName: 'Azure Key Vault: Get Secrets'
@@ -104,24 +104,39 @@ steps:
 
   - script: |
       set -e
-      ./scripts/test.sh --build --coverage --reporter mocha-junit-reporter
+      ./scripts/test.sh --build --coverage --reporter mocha-junit-reporter --tfs "Unit Tests"
     displayName: Run unit tests
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
+  - script: |
+      # Figure out the full absolute path of the product we just built
+      # including the remote server and configure the integration tests
+      # to run with these builds instead of running out of sources.
+      set -e
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-darwin" \
+      ./scripts/test-integration.sh --build --tfs "Integration Tests"
+    displayName: Run integration tests (Electron)
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
   - script: |
       set -e
       APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin
       APP_NAME="`ls $APP_ROOT | head -n 1`"
       yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots"
     displayName: Run smoke tests (Electron)
-    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
-  - script: |
-      set -e
-      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-web-darwin" \
-      yarn smoketest --web --headless  --screenshots "$(build.artifactstagingdirectory)/smokeshots"
-    displayName: Run smoke tests (Browser)
-    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  # - script: |
+  #     set -e
+  #     node ./node_modules/playwright/install.js
+  #     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-web-darwin" \
+  #     yarn smoketest --web --headless  --screenshots "$(build.artifactstagingdirectory)/smokeshots"
+  #   displayName: Run smoke tests (Browser)
+  #   continueOnError: true
+  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
   - script: |
       set -e
@@ -158,55 +173,16 @@ steps:
       pushd ../azuredatastudio-darwin
       ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
       popd
-    displayName: 'Archive'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    displayName: 'ESRP CodeSigning'
-    inputs:
-      ConnectedServiceName: 'Code Signing'
-      FolderPath: '$(Build.SourcesDirectory)/.build/darwin/archive'
-      Pattern: 'azuredatastudio-darwin.zip'
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationCode": "MacAppDeveloperSign",
-            "parameters": {
-              "Hardening": "Enable"
-            },
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 90
-    condition: and(succeeded(), eq(variables['signed'], true))
+    displayName: 'Archive (no signing)'
+    condition: and(succeeded(), eq(variables['signed'], false))
 
   - script: |
-      zip -d $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip "*.pkg"
-    displayName: Clean Archive
-    condition: and(succeeded(), eq(variables['signed'], true))
-
-  - task: EsrpCodeSigning@1
-    displayName: 'ESRP Notarization'
-    inputs:
-      ConnectedServiceName: 'Code Signing'
-      FolderPath: '$(Build.SourcesDirectory)/.build/darwin/archive'
-      Pattern: 'azuredatastudio-darwin.zip'
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "KeyCode": "CP-401337-Apple",
-            "OperationCode": "MacAppNotarize",
-            "Parameters": {
-              "BundleId": "com.microsoft.azuredatastudio-$(VSCODE_QUALITY)"
-            },
-            "ToolName": "sign",
-            "ToolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 120
+      set -e
+      mkdir -p .build/darwin/archive
+      pushd ../azuredatastudio-darwin
+      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin-unsigned.zip
+      popd
+    displayName: 'Archive'
     condition: and(succeeded(), eq(variables['signed'], true))
 
   - script: |

build/azure-pipelines/distro-build.yml

@@ -3,10 +3,10 @@ pool:
 
 trigger:
   branches:
-    include: ['master', 'release/*']
+    include: ['main', 'release/*']
 pr:
   branches:
-    include: ['master', 'release/*']
+    include: ['main', 'release/*']
 
 steps:
 - task: NodeTool@0
@@ -34,8 +34,8 @@ steps:
     git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
     git fetch distro
 
-    # Push master branch into oss/master
-    git push distro origin/master:refs/heads/oss/master
+    # Push main branch into oss/master
+    git push distro origin/main:refs/heads/oss/master
 
     # Push every release branch into oss/release
     git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push distro

build/azure-pipelines/docker/sql-product-build-docker.yml

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: '10.15.1'
+      versionSpec: "12.13.0"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -65,17 +65,17 @@ steps:
       node build/azure-pipelines/mixin
     displayName: Mix in quality
 
-  - task: DownloadPipelineArtifact@2
+  - task: DownloadBuildArtifacts@0
     inputs:
       buildType: 'current'
-      targetPath: '$(Build.SourcesDirectory)/.build'
+      downloadPath: '$(Build.SourcesDirectory)/.build'
       artifactName: drop
       itemPattern: |
         drop/linux/server/*.tar.gz
 
   - script: |
       set -e
-      for f in $(Build.SourcesDirectory)/.build/linux/server/*.tar.gz
+      for f in $(Build.SourcesDirectory)/.build/drop/linux/server/*.tar.gz
       do
         tar -C $(agent.builddirectory) -zxvf $f
         rm $f

build/azure-pipelines/exploration-build.yml

@@ -3,10 +3,10 @@ pool:
 
 trigger:
   branches:
-    include: ['master']
+    include: ['main']
 pr:
   branches:
-    include: ['master']
+    include: ['main']
 
 steps:
 - task: NodeTool@0
@@ -31,10 +31,10 @@ steps:
     git config user.email "vscode@microsoft.com"
     git config user.name "VSCode"
 
-    git checkout origin/electron-8.0.x
+    git checkout origin/electron-x.y.z
     git merge origin/master
 
     # Push master branch into exploration branch
-    git push origin HEAD:electron-8.0.x
+    git push origin HEAD:electron-x.y.z
 
   displayName: Sync & Merge Exploration

build/azure-pipelines/linux/continuous-build-linux.yml

@@ -81,6 +81,14 @@ steps:
 #   displayName: 'Publish Crash Reports'
 #   condition: succeededOrFailed()
 
+- task: PublishPipelineArtifact@0
+  inputs:
+    artifactName: crash-dump-linux
+    targetPath: .build/crashes
+  displayName: 'Publish Crash Reports'
+  continueOnError: true
+  condition: failed()
+
 - task: PublishTestResults@2
   displayName: Publish Tests Results
   inputs:

build/azure-pipelines/linux/product-build-linux-multiarch.yml

@@ -107,7 +107,6 @@ steps:
     AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
     AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
     ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/publish.sh
   displayName: Publish
 

build/azure-pipelines/linux/product-build-linux.yml

@@ -145,7 +145,8 @@ steps:
     artifactName: crash-dump-linux
     targetPath: .build/crashes
   displayName: 'Publish Crash Reports'
-  condition: succeededOrFailed()
+  continueOnError: true
+  condition: failed()
 
 - script: |
     set -e
@@ -178,7 +179,6 @@ steps:
     AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
     AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
     ./build/azure-pipelines/linux/publish.sh
   displayName: Publish
 

build/azure-pipelines/linux/publish.sh

@@ -27,11 +27,6 @@ rm -rf $ROOT/vscode-server-*.tar.*
 
 node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
 
-# Publish hockeyapp symbols
-# node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" "x64" "$VSCODE_HOCKEYAPP_ID_LINUX64"
-# Skip hockey app because build failure.
-# https://github.com/microsoft/vscode/issues/90491
-
 # Publish DEB
 PLATFORM_DEB="linux-deb-x64"
 DEB_ARCH="amd64"

build/azure-pipelines/linux/sql-product-build-linux.yml

@@ -1,3 +1,6 @@
+parameters:
+  extensionsToUnitTest: []
+
 steps:
   - script: |
       mkdir -p .build
@@ -21,7 +24,7 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: '10.15.1'
+      versionSpec: "12.13.0"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -94,12 +97,6 @@ steps:
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
 
-  - script: |
-      set -e
-      service xvfb start
-    displayName: Start xvfb
-    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
   - script: |
       set -e
       yarn gulp package-rebuild-extensions
@@ -108,14 +105,40 @@ steps:
     displayName: Package External extensions
 
   - script: |
+      set -e
+      service xvfb start
+    displayName: Start xvfb
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
+  - script: |
+      set -e
+      DISPLAY=:10 ./scripts/test.sh --build --coverage --reporter mocha-junit-reporter --tfs "Unit Tests"
+    displayName: Run unit tests (Electron)
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
+  - script: |
+      # Figure out the full absolute path of the product we just built
+      # including the remote server and configure the integration tests
+      # to run with these builds instead of running out of sources.
       set -e
       APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
       APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
       INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-      DISPLAY=:10 ./scripts/test-extensions-unit.sh
-    displayName: 'Run Stable Extension Unit Tests'
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-linux-x64" \
+      DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
+    displayName: Run integration tests (Electron)
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
+  - ${{each extension in parameters.extensionsToUnitTest}}:
+    - script: |
+        set -e
+        APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
+        APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+        INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+        DISPLAY=:10 node ./scripts/test-extensions-unit.js ${{ extension }}
+      displayName: 'Run ${{ extension }} Stable Extension Unit Tests'
+      condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
   - script: |
       set -e
       APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
@@ -141,12 +164,12 @@ steps:
       ./build/azure-pipelines/linux/createDrop.sh
     displayName: Create Drop
 
-  - task: CopyFiles@2
-    displayName: 'Copy Extension Unit Test Coverage Files to: $(Build.ArtifactStagingDirectory)'
-    inputs:
-      SourceFolder: '$(Build.SourcesDirectory)/extensions'
-      Contents: '*/coverage/**'
-      TargetFolder: '$(Build.ArtifactStagingDirectory)/test-results/coverage'
+  - script: |
+      set -e
+      shopt -s globstar
+      mkdir -p $(Build.ArtifactStagingDirectory)/test-results/coverage
+      cp --parents -r $(Build.SourcesDirectory)/extensions/*/coverage/** $(Build.ArtifactStagingDirectory)/test-results/coverage
+    displayName: Copy Coverage
 
   - task: PublishTestResults@2
     displayName: 'Publish Test Results test-results.xml'

build/azure-pipelines/mixin.js

@@ -12,6 +12,8 @@ const es = require('event-stream');
 const vfs = require('vinyl-fs');
 const fancyLog = require('fancy-log');
 const ansiColors = require('ansi-colors');
+const fs = require('fs');
+const path = require('path');
 
 function main() {
 	const quality = process.env['VSCODE_QUALITY'];
@@ -21,7 +23,7 @@ function main() {
 		return;
 	}
 
-	const productJsonFilter = filter('**/product.json', { restore: true });
+	const productJsonFilter = filter(f => f.relative === 'product.json', { restore: true });
 
 	fancyLog(ansiColors.blue('[mixin]'), `Mixing in sources:`);
 	return vfs
@@ -29,7 +31,32 @@ function main() {
 		.pipe(filter(f => !f.isDirectory()))
 		.pipe(productJsonFilter)
 		.pipe(buffer())
-		.pipe(json(o => Object.assign({}, require('../../product.json'), o)))
+		.pipe(json(o => {
+			const ossProduct = JSON.parse(fs.readFileSync(path.join(__dirname, '..', '..', 'product.json'), 'utf8'));
+			let builtInExtensions = ossProduct.builtInExtensions;
+
+			if (Array.isArray(o.builtInExtensions)) {
+				fancyLog(ansiColors.blue('[mixin]'), 'Overwriting built-in extensions:', o.builtInExtensions.map(e => e.name));
+
+				builtInExtensions = o.builtInExtensions;
+			} else if (o.builtInExtensions) {
+				const include = o.builtInExtensions['include'] || [];
+				const exclude = o.builtInExtensions['exclude'] || [];
+
+				fancyLog(ansiColors.blue('[mixin]'), 'OSS built-in extensions:', builtInExtensions.map(e => e.name));
+				fancyLog(ansiColors.blue('[mixin]'), 'Including built-in extensions:', include.map(e => e.name));
+				fancyLog(ansiColors.blue('[mixin]'), 'Excluding built-in extensions:', exclude);
+
+				builtInExtensions = builtInExtensions.filter(ext => !include.find(e => e.name === ext.name) && !exclude.find(name => name === ext.name));
+				builtInExtensions = [...builtInExtensions, ...include];
+
+				fancyLog(ansiColors.blue('[mixin]'), 'Final built-in extensions:', builtInExtensions.map(e => e.name));
+			} else {
+				fancyLog(ansiColors.blue('[mixin]'), 'Inheriting OSS built-in extensions', builtInExtensions.map(e => e.name));
+			}
+
+			return { ...ossProduct, ...o, builtInExtensions };
+		}))
 		.pipe(productJsonFilter.restore)
 		.pipe(es.mapSync(function (f) {
 			fancyLog(ansiColors.blue('[mixin]'), f.relative, ansiColors.green('✔︎'));

build/azure-pipelines/product-build.yml

@@ -36,6 +36,17 @@ jobs:
   steps:
   - template: win32/product-build-win32.yml
 
+- job: WindowsARM64
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WIN32_ARM64'], 'true'))
+  pool:
+    vmImage: VS2017-Win2016
+  variables:
+    VSCODE_ARCH: arm64
+  dependsOn:
+  - Compile
+  steps:
+  - template: win32/product-build-win32-arm64.yml
+
 - job: Linux
   condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
   pool:
@@ -149,4 +160,4 @@ schedules:
   displayName: Mon-Fri at 7:00
   branches:
     include:
-    - master
+    - main

build/azure-pipelines/product-compile.yml

@@ -72,29 +72,6 @@ steps:
     vstsFeed: 'npm-vscode'
   condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
 
-- script: |
-    set -e
-    yarn generate-github-config
-  displayName: Generate GitHub config
-  condition: succeeded()
-  env:
-    OSS_GITHUB_ID: "a5d3c261b032765a78de"
-    OSS_GITHUB_SECRET: $(oss-github-client-secret)
-    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
-    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
-    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
-    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
-    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
-    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
-    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
-    VSO_GITHUB_SECRET: $(vso-github-client-secret)
-    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
-    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
-    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
-    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
-    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
-    GITHUB_APP_SECRET: $(github-app-client-secret)
-
 - script: |
     set -e
     yarn postinstall

build/azure-pipelines/publish-types/update-types.ts

@@ -36,6 +36,18 @@ function updateDTSFile(outPath: string, tag: string) {
 	fs.writeFileSync(outPath, newContent);
 }
 
+function repeat(str: string, times: number): string {
+	const result = new Array(times);
+	for (let i = 0; i < times; i++) {
+		result[i] = str;
+	}
+	return result.join('');
+}
+
+function convertTabsToSpaces(str: string): string {
+	return str.replace(/^\t+/gm, value => repeat('    ', value.length));
+}
+
 function getNewFileContent(content: string, tag: string) {
 	const oldheader = [
 		`/*---------------------------------------------------------------------------------------------`,
@@ -44,7 +56,7 @@ function getNewFileContent(content: string, tag: string) {
 		` *--------------------------------------------------------------------------------------------*/`
 	].join('\n');
 
-	return getNewFileHeader(tag) + content.slice(oldheader.length);
+	return convertTabsToSpaces(getNewFileHeader(tag) + content.slice(oldheader.length));
 }
 
 function getNewFileHeader(tag: string) {

build/azure-pipelines/sql-product-build.yml

@@ -1,7 +1,7 @@
 resources:
   containers:
   - container: linux-x64
-    image: sqltoolscontainers.azurecr.io/linux-build-agent:1
+    image: sqltoolscontainers.azurecr.io/linux-build-agent:2
     endpoint: ContainerRegistry
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
   - template: sql-product-compile.yml
 
 - job: macOS
-  condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
   pool:
     vmImage: macOS-latest
   dependsOn:
@@ -26,8 +26,18 @@ jobs:
   - template: darwin/sql-product-build-darwin.yml
   timeoutInMinutes: 180
 
+- job: macOS_Signing
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), eq(variables['signed'], true))
+  pool:
+    vmImage: macOS-latest
+  dependsOn:
+  - macOS
+  steps:
+  - template: darwin/sql-product-build-darwin-signing.yml
+  timeoutInMinutes: 60
+
 - job: Linux
-  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
   pool:
     vmImage: 'Ubuntu-16.04'
   container: linux-x64
@@ -35,8 +45,22 @@ jobs:
   - Compile
   steps:
   - template: linux/sql-product-build-linux.yml
+    parameters:
+      extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azdata", "azurecore", "cms", "dacpac", "import", "schema-compare", "notebook", "resource-deployment", "machine-learning", "sql-database-projects"]
   timeoutInMinutes: 70
 
+- job: LinuxWeb
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  container: linux-x64
+  variables:
+    VSCODE_ARCH: x64
+  dependsOn:
+  - Compile
+  steps:
+  - template: web/sql-product-build-web.yml
+
 - job: Docker
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true'))
   pool:
@@ -48,7 +72,7 @@ jobs:
   - template: docker/sql-product-build-docker.yml
 
 - job: Windows
-  condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
   pool:
     vmImage: VS2017-Win2016
   dependsOn:
@@ -77,15 +101,10 @@ jobs:
   - Docker
   - Windows
   - Windows_Test
+  - LinuxWeb
+  - macOS_Signing
   steps:
   - template: sql-release.yml
 
 trigger: none
 pr: none
-
-schedules:
-- cron: "0 5 * * Mon-Fri"
-  displayName: Mon-Fri at 7:00
-  branches:
-    include:
-    - master

build/azure-pipelines/sql-product-compile.yml

@@ -15,13 +15,11 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+    versionSpec: "12.13.0"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:
     versionSpec: "1.x"
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
 - task: AzureKeyVault@1
   displayName: 'Azure Key Vault: Get Secrets'
@@ -56,26 +54,25 @@ steps:
     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
     vstsFeed: 'BuildCache'
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
 - script: |
     set -e
     CHILD_CONCURRENCY=1 yarn --frozen-lockfile
   displayName: Install dependencies
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
   inputs:
     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
     vstsFeed: 'BuildCache'
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - script: |
     set -e
     yarn postinstall
   displayName: Run postinstall scripts
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
+  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
 
 # Mixin must run before optimize, because the CSS loader will
 # inline small SVGs
@@ -104,6 +101,14 @@ steps:
   displayName: Compile
   condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
+- script: |
+    set -e
+    AZURE_STORAGE_ACCOUNT="$(sourcemap-storage-account)" \
+    AZURE_STORAGE_ACCESS_KEY="$(sourcemap-storage-key)" \
+      node build/azure-pipelines/upload-sourcemaps
+  displayName: Upload sourcemaps
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+
 - script: |
     set -e
 
@@ -113,7 +118,6 @@ steps:
 
     node build/azure-pipelines/common/copyArtifacts.js
   displayName: Write Version Information
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish Artifact: drop'

build/azure-pipelines/web/sql-product-build-web.yml

@@ -0,0 +1,108 @@
+steps:
+- script: |
+    mkdir -p .build
+    echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
+  displayName: Prepare cache flag
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  inputs:
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
+    vstsFeed: 'BuildCache'
+    platformIndependent: true
+    alias: 'Compilation'
+
+- script: |
+    set -e
+    exit 1
+  displayName: Check RestoreCache
+  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+
+- task: NodeTool@0
+  inputs:
+    versionSpec: "12.13.0"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
+  inputs:
+    versionSpec: "1.x"
+
+- task: AzureKeyVault@1
+  displayName: 'Azure Key Vault: Get Secrets'
+  inputs:
+    azureSubscription: 'ClientToolsInfra_670062 (88d5392f-a34f-4769-b405-f597fc533613)'
+    KeyVaultName: ado-secrets
+    SecretsFilter: 'github-distro-mixin-password'
+
+- script: |
+    set -e
+    cat << EOF > ~/.netrc
+    machine github.com
+    login azuredatastudio
+    password $(github-distro-mixin-password)
+    EOF
+
+    git config user.email "andresse@microsoft.com"
+    git config user.name "AzureDataStudio"
+  displayName: Prepare tooling
+
+- script: |
+    set -e
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    git fetch distro
+    git merge $(node -p "require('./package.json').distro")
+  displayName: Merge distro
+
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+#   inputs:
+#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: 'npm-vscode'
+
+- script: |
+    set -e
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+  displayName: Install dependencies
+  # condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+#   inputs:
+#     keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: 'npm-vscode'
+#   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+# - script: |
+#     set -e
+#     yarn postinstall
+#   displayName: Run postinstall scripts
+#   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+
+- script: |
+    set -e
+    node build/azure-pipelines/mixin
+  displayName: Mix in quality
+
+- script: |
+    set -e
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-web-min-ci
+  displayName: Build
+
+  # upload only the workbench.web.api.js source maps because
+  # we just compiled these bits in the previous step and the
+  # general task to upload source maps has already been run
+- script: |
+    set -e
+    AZURE_STORAGE_ACCOUNT="$(sourcemap-storage-account)" \
+    AZURE_STORAGE_ACCESS_KEY="$(sourcemap-storage-key)" \
+      node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.api.js.map
+  displayName: Upload sourcemaps (Web)
+
+# - script: |
+#     set -e
+#     AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+#     AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+#     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+#     ./build/azure-pipelines/web/publish.sh
+#   displayName: Publish

build/azure-pipelines/win32/continuous-build-win32.yml

@@ -36,15 +36,7 @@ steps:
     yarn electron
   displayName: Download Electron
 
-- script: |
-    yarn gulp hygiene
-  displayName: Run Hygiene Checks
-
-- script: | # {{SQL CARBON EDIT}} add step
-    yarn strict-vscode
-  displayName: Run Strict Null Check
-
-# - powershell: | {{SQL CARBON EDIT}} remove step
+# - powershell: | {{SQL CARBON EDIT}} remove editor check
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
 
@@ -72,12 +64,13 @@ steps:
 #     .\scripts\test-integration.bat --tfs "Integration Tests"
 #   displayName: Run Integration Tests (Electron)
 
-# - task: PublishPipelineArtifact@0
-#   displayName: 'Publish Crash Reports'
-#   inputs:
-#     artifactName: crash-dump-windows
-#     targetPath: .build\crashes
-#   condition: succeededOrFailed()
+- task: PublishPipelineArtifact@0
+  displayName: 'Publish Crash Reports'
+  inputs:
+    artifactName: crash-dump-windows
+    targetPath: .build\crashes
+  continueOnError: true
+  condition: failed()
 
 - task: PublishTestResults@2
   displayName: Publish Tests Results

build/azure-pipelines/win32/product-build-win32-arm64.yml

@@ -0,0 +1,190 @@
+steps:
+- powershell: |
+    mkdir .build -ea 0
+    "$env:BUILD_SOURCEVERSION" | Out-File -Encoding ascii -NoNewLine .build\commit
+    "$env:VSCODE_QUALITY" | Out-File -Encoding ascii -NoNewLine .build\quality
+  displayName: Prepare cache flag
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  inputs:
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
+    vstsFeed: 'npm-vscode'
+    platformIndependent: true
+    alias: 'Compilation'
+
+- powershell: |
+    $ErrorActionPreference = "Stop"
+    exit 1
+  displayName: Check RestoreCache
+  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+
+- task: NodeTool@0
+  inputs:
+    versionSpec: "12.13.0"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.x"
+
+- task: UsePythonVersion@0
+  inputs:
+    versionSpec: '2.x'
+    addToPath: true
+
+- task: AzureKeyVault@1
+  displayName: 'Azure Key Vault: Get Secrets'
+  inputs:
+    azureSubscription: 'vscode-builds-subscription'
+    KeyVaultName: vscode
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    "machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
+
+    exec { git config user.email "vscode@microsoft.com" }
+    exec { git config user.name "VSCode" }
+
+    mkdir .build -ea 0
+    "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch
+  displayName: Prepare tooling
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git" }
+    exec { git fetch distro }
+    exec { git merge $(node -p "require('./package.json').distro") }
+  displayName: Merge distro
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  inputs:
+    keyfile: 'build/.cachesalt, .build/arch, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    $env:npm_config_arch="$(VSCODE_ARCH)"
+    $env:CHILD_CONCURRENCY="1"
+    exec { yarn --frozen-lockfile }
+  displayName: Install dependencies
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+  inputs:
+    keyfile: 'build/.cachesalt, .build/arch, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { yarn postinstall }
+  displayName: Run postinstall scripts
+  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { node build/azure-pipelines/mixin }
+  displayName: Mix in quality
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min-ci" }
+    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-code-helper" }
+    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }
+  displayName: Build
+
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSign'
+    FolderPath: '$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)'
+    Pattern: '*.dll,*.exe,*.node'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-230012",
+          "operationSetCode": "SigntoolSign",
+          "parameters": [
+            {
+              "parameterName": "OpusName",
+              "parameterValue": "VS Code"
+            },
+            {
+              "parameterName": "OpusInfo",
+              "parameterValue": "https://code.visualstudio.com/"
+            },
+            {
+              "parameterName": "Append",
+              "parameterValue": "/as"
+            },
+            {
+              "parameterName": "FileDigest",
+              "parameterValue": "/fd \"SHA256\""
+            },
+            {
+              "parameterName": "PageHash",
+              "parameterValue": "/NPH"
+            },
+            {
+              "parameterName": "TimeStamp",
+              "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        },
+        {
+          "keyCode": "CP-230012",
+          "operationSetCode": "SigntoolVerify",
+          "parameters": [
+            {
+              "parameterName": "VerifyAll",
+              "parameterValue": "/all"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 120
+
+- task: NuGetCommand@2
+  displayName: Install ESRPClient.exe
+  inputs:
+    restoreSolution: 'build\azure-pipelines\win32\ESRPClient\packages.config'
+    feedsToUse: config
+    nugetConfigPath: 'build\azure-pipelines\win32\ESRPClient\NuGet.config'
+    externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
+    restoreDirectory: packages
+
+- task: ESRPImportCertTask@1
+  displayName: Import ESRP Request Signing Certificate
+  inputs:
+    ESRP: 'ESRP CodeSign'
+
+- powershell: |
+    $ErrorActionPreference = "Stop"
+    .\build\azure-pipelines\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(esrp-auth-certificate) -AuthCertificateKey $(esrp-auth-certificate-key)
+  displayName: Import ESRP Auth Certificate
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(vscode-storage-key)"
+    $env:AZURE_DOCUMENTDB_MASTERKEY = "$(builds-docdb-key-readwrite)"
+    $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+    .\build\azure-pipelines\win32\publish.ps1
+  displayName: Publish
+
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+  displayName: 'Component Detection'
+  continueOnError: true

build/azure-pipelines/win32/product-build-win32.yml

@@ -154,7 +154,8 @@ steps:
     artifactName: crash-dump-windows-$(VSCODE_ARCH)
     targetPath: .build\crashes
   displayName: 'Publish Crash Reports'
-  condition: succeededOrFailed()
+  continueOnError: true
+  condition: failed()
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
@@ -217,7 +218,7 @@ steps:
     restoreSolution: 'build\azure-pipelines\win32\ESRPClient\packages.config'
     feedsToUse: config
     nugetConfigPath: 'build\azure-pipelines\win32\ESRPClient\NuGet.config'
-    externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
+    externalFeedCredentials: 'ESRP Nuget'
     restoreDirectory: packages
 
 - task: ESRPImportCertTask@1
@@ -235,7 +236,6 @@ steps:
     $ErrorActionPreference = "Stop"
     $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(vscode-storage-key)"
     $env:AZURE_DOCUMENTDB_MASTERKEY = "$(builds-docdb-key-readwrite)"
-    $env:VSCODE_HOCKEYAPP_TOKEN = "$(vscode-hockeyapp-token)"
     $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
     .\build\azure-pipelines\win32\publish.ps1
   displayName: Publish

build/azure-pipelines/win32/publish.ps1

@@ -16,22 +16,21 @@ $ServerZip = "$Repo\.build\vscode-server-win32-$Arch.zip"
 $Build = "$Root\VSCode-win32-$Arch"
 
 # Create server archive
-exec { xcopy $LegacyServer $Server /H /E /I }
-exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r }
+if ("$Arch" -ne "arm64") {
+	exec { xcopy $LegacyServer $Server /H /E /I }
+	exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r }
+}
 
 # get version
 $PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json
 $Version = $PackageJson.version
 
-$AssetPlatform = if ("$Arch" -eq "ia32") { "win32" } else { "win32-x64" }
+$AssetPlatform = if ("$Arch" -eq "ia32") { "win32" } else { "win32-$Arch" }
 
 exec { node build/azure-pipelines/common/createAsset.js "$AssetPlatform-archive" archive "VSCode-win32-$Arch-$Version.zip" $Zip }
 exec { node build/azure-pipelines/common/createAsset.js "$AssetPlatform" setup "VSCodeSetup-$Arch-$Version.exe" $SystemExe }
 exec { node build/azure-pipelines/common/createAsset.js "$AssetPlatform-user" setup "VSCodeUserSetup-$Arch-$Version.exe" $UserExe }
-exec { node build/azure-pipelines/common/createAsset.js "server-$AssetPlatform" archive "vscode-server-win32-$Arch.zip" $ServerZip }
 
-# Skip hockey app because build failure.
-# https://github.com/microsoft/vscode/issues/90491
-# publish hockeyapp symbols
-# $hockeyAppId = if ("$Arch" -eq "ia32") { "$env:VSCODE_HOCKEYAPP_ID_WIN32" } else { "$env:VSCODE_HOCKEYAPP_ID_WIN64" }
-# exec { node build/azure-pipelines/common/symbols.js "$env:VSCODE_MIXIN_PASSWORD" "$env:VSCODE_HOCKEYAPP_TOKEN" "$Arch" $hockeyAppId }
+if ("$Arch" -ne "arm64") {
+	exec { node build/azure-pipelines/common/createAsset.js "server-$AssetPlatform" archive "vscode-server-win32-$Arch.zip" $ServerZip }
+}

build/azure-pipelines/win32/sql-product-build-win32.yml

@@ -21,7 +21,7 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: "10.15.1"
+      versionSpec: "12.13.0"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -103,6 +103,38 @@ steps:
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
 
+  - task: UniversalPackages@0
+    displayName: Download SAW Python package
+    inputs:
+      command: 'download'
+      downloadDirectory: '$(agent.builddirectory)\azuredatastudio-win32-x64\resources\app\ads-python'
+      feedsToUse: 'internal'
+      vstsFeed: '2191dd5f-4aec-491b-ac50-568bbc331c8a'
+      vstsFeedPackage: '2e355f03-a97e-499a-949b-f02d62b6160c'
+      vstsPackageVersion: '*'
+    condition: and(succeeded(), eq(variables['VSCODE_QUALITY'], 'saw'))
+
+  # - powershell: | @anthonydresser unit tests timeout never existing the node process
+  #     . build/azure-pipelines/win32/exec.ps1
+  #     $ErrorActionPreference = "Stop"
+  #     exec { yarn electron x64 }
+  #     exec { .\scripts\test.bat --build --coverage --reporter mocha-junit-reporter --tfs "Unit Tests" }
+  #   displayName: Run unit tests (Electron)
+  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
+  - powershell: |
+      # Figure out the full absolute path of the product we just built
+      # including the remote server and configure the integration tests
+      # to run with these builds instead of running out of sources.
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $AppRoot = "$(agent.builddirectory)\azuredatastudio-win32-x64"
+      $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
+      $AppNameShort = $AppProductJson.nameShort
+      exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\azuredatastudio-reh-win32-x64"; .\scripts\test-integration.bat --build --tfs "Integration Tests" }
+    displayName: Run integration tests (Electron)
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"

build/azure-pipelines/win32/sql-product-test-win32.yml

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "12.13.0"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:

build/builtin/main.js

@@ -10,11 +10,11 @@ const path = require('path');
 let window = null;
 
 app.once('ready', () => {
-	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true } });
+	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false, nativeWindowOpen: true } });
 	window.setMenuBarVisibility(false);
 	window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
 	// window.webContents.openDevTools();
 	window.once('closed', () => window = null);
 });
 
-app.on('window-all-closed', () => app.quit());
+app.on('window-all-closed', () => app.quit());

build/darwin/sign.js

@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const codesign = require("electron-osx-sign");
+const path = require("path");
+const util = require("../lib/util");
+const product = require("../../product.json");
+async function main() {
+    const buildDir = process.env['AGENT_BUILDDIRECTORY'];
+    const tempDir = process.env['AGENT_TEMPDIRECTORY'];
+    if (!buildDir) {
+        throw new Error('$AGENT_BUILDDIRECTORY not set');
+    }
+    if (!tempDir) {
+        throw new Error('$AGENT_TEMPDIRECTORY not set');
+    }
+    const baseDir = path.dirname(__dirname);
+    const appRoot = path.join(buildDir, 'VSCode-darwin');
+    const appName = product.nameLong + '.app';
+    const appFrameworkPath = path.join(appRoot, appName, 'Contents', 'Frameworks');
+    const helperAppBaseName = product.nameShort;
+    const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
+    const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app';
+    const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
+    const defaultOpts = {
+        app: path.join(appRoot, appName),
+        platform: 'darwin',
+        entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'app-entitlements.plist'),
+        'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'app-entitlements.plist'),
+        hardenedRuntime: true,
+        'pre-auto-entitlements': false,
+        'pre-embed-provisioning-profile': false,
+        keychain: path.join(tempDir, 'buildagent.keychain'),
+        version: util.getElectronVersion(),
+        identity: '99FM488X57',
+        'gatekeeper-assess': false
+    };
+    const appOpts = Object.assign(Object.assign({}, defaultOpts), { 
+        // TODO(deepak1556): Incorrectly declared type in electron-osx-sign
+        ignore: (filePath) => {
+            return filePath.includes(gpuHelperAppName) ||
+                filePath.includes(pluginHelperAppName) ||
+                filePath.includes(rendererHelperAppName);
+        } });
+    const gpuHelperOpts = Object.assign(Object.assign({}, defaultOpts), { app: path.join(appFrameworkPath, gpuHelperAppName), entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist') });
+    const pluginHelperOpts = Object.assign(Object.assign({}, defaultOpts), { app: path.join(appFrameworkPath, pluginHelperAppName), entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist') });
+    const rendererHelperOpts = Object.assign(Object.assign({}, defaultOpts), { app: path.join(appFrameworkPath, rendererHelperAppName), entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist') });
+    await codesign.signAsync(gpuHelperOpts);
+    await codesign.signAsync(pluginHelperOpts);
+    await codesign.signAsync(rendererHelperOpts);
+    await codesign.signAsync(appOpts);
+}
+if (require.main === module) {
+    main().catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}

build/darwin/sign.ts

@@ -0,0 +1,90 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as codesign from 'electron-osx-sign';
+import * as path from 'path';
+import * as util from '../lib/util';
+import * as product from '../../product.json';
+
+async function main(): Promise<void> {
+	const buildDir = process.env['AGENT_BUILDDIRECTORY'];
+	const tempDir = process.env['AGENT_TEMPDIRECTORY'];
+
+	if (!buildDir) {
+		throw new Error('$AGENT_BUILDDIRECTORY not set');
+	}
+
+	if (!tempDir) {
+		throw new Error('$AGENT_TEMPDIRECTORY not set');
+	}
+
+	const baseDir = path.dirname(__dirname);
+	const appRoot = path.join(buildDir, 'VSCode-darwin');
+	const appName = product.nameLong + '.app';
+	const appFrameworkPath = path.join(appRoot, appName, 'Contents', 'Frameworks');
+	const helperAppBaseName = product.nameShort;
+	const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
+	const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app';
+	const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
+
+	const defaultOpts: codesign.SignOptions = {
+		app: path.join(appRoot, appName),
+		platform: 'darwin',
+		entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'app-entitlements.plist'),
+		'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'app-entitlements.plist'),
+		hardenedRuntime: true,
+		'pre-auto-entitlements': false,
+		'pre-embed-provisioning-profile': false,
+		keychain: path.join(tempDir, 'buildagent.keychain'),
+		version: util.getElectronVersion(),
+		identity: '99FM488X57',
+		'gatekeeper-assess': false
+	};
+
+	const appOpts = {
+		...defaultOpts,
+		// TODO(deepak1556): Incorrectly declared type in electron-osx-sign
+		ignore: (filePath: string) => {
+			return filePath.includes(gpuHelperAppName) ||
+				filePath.includes(pluginHelperAppName) ||
+				filePath.includes(rendererHelperAppName);
+		}
+	};
+
+	const gpuHelperOpts: codesign.SignOptions = {
+		...defaultOpts,
+		app: path.join(appFrameworkPath, gpuHelperAppName),
+		entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist'),
+		'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist'),
+	};
+
+	const pluginHelperOpts: codesign.SignOptions = {
+		...defaultOpts,
+		app: path.join(appFrameworkPath, pluginHelperAppName),
+		entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
+		'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
+	};
+
+	const rendererHelperOpts: codesign.SignOptions = {
+		...defaultOpts,
+		app: path.join(appFrameworkPath, rendererHelperAppName),
+		entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'),
+		'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'),
+	};
+
+	await codesign.signAsync(gpuHelperOpts);
+	await codesign.signAsync(pluginHelperOpts);
+	await codesign.signAsync(rendererHelperOpts);
+	await codesign.signAsync(appOpts as any);
+}
+
+if (require.main === module) {
+	main().catch(err => {
+		console.error(err);
+		process.exit(1);
+	});
+}

build/gulpfile.editor.js

@@ -127,6 +127,7 @@ const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () =>
 
 const compileEditorESMTask = task.define('compile-editor-esm', () => {
 	const KEEP_PREV_ANALYSIS = false;
+	const FAIL_ON_PURPOSE = false;
 	console.log(`Launching the TS compiler at ${path.join(__dirname, '../out-editor-esm')}...`);
 	let result;
 	if (process.platform === 'win32') {
@@ -142,7 +143,7 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 	console.log(result.stdout.toString());
 	console.log(result.stderr.toString());
 
-	if (result.status !== 0) {
+	if (FAIL_ON_PURPOSE || result.status !== 0) {
 		console.log(`The TS Compilation failed, preparing analysis folder...`);
 		const destPath = path.join(__dirname, '../../vscode-monaco-editor-esm-analysis');
 		const keepPrevAnalysis = (KEEP_PREV_ANALYSIS && fs.existsSync(destPath));

build/gulpfile.extensions.js

@@ -8,9 +8,11 @@ require('events').EventEmitter.defaultMaxListeners = 100;
 
 const gulp = require('gulp');
 const path = require('path');
+const nodeUtil = require('util');
 const tsb = require('gulp-tsb');
 const es = require('event-stream');
 const filter = require('gulp-filter');
+const webpack = require('webpack');
 const util = require('./lib/util');
 const task = require('./lib/task');
 const watcher = require('./lib/watch');
@@ -21,6 +23,8 @@ const nlsDev = require('vscode-nls-dev');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
 const plumber = require('gulp-plumber');
+const fancyLog = require('fancy-log');
+const ansiColors = require('ansi-colors');
 const ext = require('./lib/extensions');
 
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
@@ -36,7 +40,7 @@ const compilations = glob.sync('**/tsconfig.json', {
 	ignore: ['**/out/**', '**/node_modules/**']
 });
 
-const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;
+const getBaseUrl = out => `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}/${out}`;
 
 const tasks = compilations.map(function (tsconfigFile) {
 	const absolutePath = path.join(extensionsPath, tsconfigFile);
@@ -167,9 +171,84 @@ gulp.task(compileExtensionsBuildLegacyTask);
 const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
 const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
 	cleanExtensionsBuildTask,
-	task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream().pipe(gulp.dest('.build'))),
-	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream().pipe(gulp.dest('.build')))
+	task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))),
+	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
 ));
 
 gulp.task(compileExtensionsBuildTask);
 exports.compileExtensionsBuildTask = compileExtensionsBuildTask;
+
+const compileWebExtensionsTask = task.define('compile-web', () => buildWebExtensions(false));
+gulp.task(compileWebExtensionsTask);
+exports.compileWebExtensionsTask = compileWebExtensionsTask;
+
+const watchWebExtensionsTask = task.define('watch-web', () => buildWebExtensions(true));
+gulp.task(watchWebExtensionsTask);
+exports.watchWebExtensionsTask = watchWebExtensionsTask;
+
+async function buildWebExtensions(isWatch) {
+
+	const webpackConfigLocations = await nodeUtil.promisify(glob)(
+		path.join(extensionsPath, '**', 'extension-browser.webpack.config.js'),
+		{ ignore: ['**/node_modules'] }
+	);
+
+	const webpackConfigs = [];
+
+	for (const webpackConfigPath of webpackConfigLocations) {
+		const configOrFnOrArray = require(webpackConfigPath);
+		function addConfig(configOrFn) {
+			if (typeof configOrFn === 'function') {
+				webpackConfigs.push(configOrFn({}, {}));
+			} else {
+				webpackConfigs.push(configOrFn);
+			}
+		}
+		addConfig(configOrFnOrArray);
+	}
+	function reporter(fullStats) {
+		if (Array.isArray(fullStats.children)) {
+			for (const stats of fullStats.children) {
+				const outputPath = stats.outputPath;
+				if (outputPath) {
+					const relativePath = path.relative(extensionsPath, outputPath).replace(/\\/g, '/');
+					const match = relativePath.match(/[^\/]+(\/server|\/client)?/);
+					fancyLog(`Finished ${ansiColors.green('packaging web extension')} ${ansiColors.cyan(match[0])} with ${stats.errors.length} errors.`);
+				}
+				if (Array.isArray(stats.errors)) {
+					stats.errors.forEach(error => {
+						fancyLog.error(error);
+					});
+				}
+				if (Array.isArray(stats.warnings)) {
+					stats.warnings.forEach(warning => {
+						fancyLog.warn(warning);
+					});
+				}
+			}
+		}
+	}
+	return new Promise((resolve, reject) => {
+		if (isWatch) {
+			webpack(webpackConfigs).watch({}, (err, stats) => {
+				if (err) {
+					reject();
+				} else {
+					reporter(stats.toJson());
+				}
+			});
+		} else {
+			webpack(webpackConfigs).run((err, stats) => {
+				if (err) {
+					fancyLog.error(err);
+					reject();
+				} else {
+					reporter(stats.toJson());
+					resolve();
+				}
+			});
+		}
+	});
+}
+
+

build/gulpfile.hygiene.js

@@ -42,8 +42,8 @@ const indentationFilter = [
 	'**',
 
 	// except specific files
-	'!ThirdPartyNotices.txt',
-	'!LICENSE.{txt,rtf}',
+	'!**/ThirdPartyNotices.txt',
+	'!**/LICENSE.{txt,rtf}',
 	'!LICENSES.chromium.html',
 	'!**/LICENSE',
 	'!src/vs/nls.js',
@@ -60,6 +60,7 @@ const indentationFilter = [
 	// except specific folders
 	'!test/automation/out/**',
 	'!test/smoke/out/**',
+	'!extensions/typescript-language-features/test-workspace/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
 	'!build/monaco/**',
@@ -85,7 +86,7 @@ const indentationFilter = [
 	'!src/typings/**/*.d.ts',
 	'!extensions/**/*.d.ts',
 	'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns,plist}',
-	'!build/{lib,download}/**/*.js',
+	'!build/{lib,download,darwin}/**/*.js',
 	'!build/**/*.sh',
 	'!build/azure-pipelines/**/*.js',
 	'!build/azure-pipelines/**/*.config',
@@ -103,9 +104,12 @@ const indentationFilter = [
 	'!extensions/resource-deployment/notebooks/**',
 	'!extensions/mssql/notebooks/**',
 	'!extensions/integration-tests/testData/**',
+	'!extensions/arc/src/controller/generated/**',
 	'!extensions/sql-database-projects/resources/templates/*.xml',
 	'!extensions/sql-database-projects/src/test/baselines/*.xml',
 	'!extensions/sql-database-projects/src/test/baselines/*.json',
+	'!extensions/sql-database-projects/src/test/baselines/*.sqlproj',
+	'!extensions/sql-database-projects/BuildDirectory/SystemDacpacs/**',
 	'!extensions/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts',
 	'!extensions/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts',
 	'!resources/linux/snap/electron-launch'
@@ -140,6 +144,7 @@ const copyrightFilter = [
 	'!extensions/*/server/bin/*',
 	'!src/vs/editor/test/node/classification/typescript-test.ts',
 	'!scripts/code-web.js',
+	'!resources/serverless/code-web.js',
 	// {{SQL CARBON EDIT}}
 	'!extensions/notebook/src/intellisense/text.ts',
 	'!extensions/mssql/src/hdfs/webhdfs.ts',
@@ -172,7 +177,8 @@ const copyrightFilter = [
 	'!**/*.gif',
 	'!**/*.xlf',
 	'!**/*.dacpac',
-	'!**/*.bacpac'
+	'!**/*.bacpac',
+	'!**/*.py'
 ];
 
 const jsHygieneFilter = [

build/gulpfile.vscode.js

@@ -36,28 +36,12 @@ const { compileBuildTask } = require('./gulpfile.compile');
 const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
 
 const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
-const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
-const nodeModules = [ // {{SQL CARBON EDIT}}
-	'electron',
-	'original-fs',
-	'rxjs/Observable',
-	'rxjs/add/observable/fromPromise',
-	'rxjs/Subject',
-	'rxjs/Observer',
-	'slickgrid/lib/jquery.event.drag-2.3.0',
-	'slickgrid/lib/jquery-ui-1.9.2',
-	'slickgrid/slick.core',
-	'slickgrid/slick.grid',
-	'slickgrid/slick.editors',
-	'slickgrid/slick.dataview']
-	.concat(Object.keys(product.dependencies || {}))
-	.concat(_.uniq(productionDependencies.map(d => d.name)))
-	.concat(baseModules);
 
 // Build
 const vscodeEntryPoints = _.flatten([
 	buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
 	buildfile.base,
+	buildfile.workerExtensionHost,
 	buildfile.workbenchDesktop,
 	buildfile.code
 ]);
@@ -69,19 +53,23 @@ const vscodeResources = [
 	'out-build/bootstrap.js',
 	'out-build/bootstrap-fork.js',
 	'out-build/bootstrap-amd.js',
+	'out-build/bootstrap-node.js',
 	'out-build/bootstrap-window.js',
 	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,html}',
 	'!out-build/vs/code/browser/**/*.html',
+	'!out-build/vs/editor/standalone/**/*.svg',
 	'out-build/vs/base/common/performance.js',
 	'out-build/vs/base/node/languagePacks.js',
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
 	'out-build/vs/base/browser/ui/codicons/codicon/**',
+	'out-build/vs/base/parts/sandbox/electron-browser/preload.js',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/contrib/debug/**/*.json',
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
 	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
 	'out-build/vs/workbench/contrib/webview/electron-browser/pre/*.js',
+	'out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js',
 	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/contrib/tasks/**/*.json',
 	'out-build/vs/platform/files/**/*.exe',
@@ -89,7 +77,6 @@ const vscodeResources = [
 	'out-build/vs/code/electron-browser/workbench/**',
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-browser/issue/issueReporter.js',
-	'out-build/vs/code/electron-browser/processExplorer/processExplorer.js',
 	'out-build/sql/workbench/electron-browser/splashscreen/*', // {{SQL CARBON EDIT}} STart
 	'out-build/sql/**/*.{svg,png,cur,html}',
 	'out-build/sql/base/browser/ui/table/media/*.{gif,png,svg}',
@@ -109,6 +96,7 @@ const vscodeResources = [
 	'out-build/sql/media/icons/*.svg',
 	'out-build/sql/workbench/parts/notebook/media/**/*.svg',
 	'out-build/sql/setup.js', // {{SQL CARBON EDIT}} end
+	'out-build/vs/code/electron-sandbox/processExplorer/processExplorer.js',
 	'out-build/vs/platform/auth/common/auth.css',
 	'!**/test/**'
 ];
@@ -119,23 +107,17 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
 		src: 'out-build',
 		entryPoints: vscodeEntryPoints,
 		resources: vscodeResources,
-		loaderConfig: common.loaderConfig(nodeModules),
+		loaderConfig: common.loaderConfig(),
 		out: 'out-vscode',
 		bundleInfo: undefined
 	})
 ));
 gulp.task(optimizeVSCodeTask);
 
-const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
+const sourceMappingURLBase = `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}`;
 const minifyVSCodeTask = task.define('minify-vscode', task.series(
 	optimizeVSCodeTask,
 	util.rimraf('out-vscode-min'),
-	() => {
-		const fullpath = path.join(process.cwd(), 'out-vscode/bootstrap-window.js');
-		const contents = fs.readFileSync(fullpath).toString();
-		const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
-		fs.writeFileSync(fullpath, newContents);
-	},
 	common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
 ));
 gulp.task(minifyVSCodeTask);
@@ -184,6 +166,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const out = sourceFolderName;
 
 		const checksums = computeChecksums(out, [
+			'vs/base/parts/sandbox/electron-browser/preload.js',
 			'vs/workbench/workbench.desktop.main.js',
 			'vs/workbench/workbench.desktop.main.css',
 			'vs/workbench/services/extensions/node/extensionHostProcess.js',

build/gulpfile.vscode.win32.js

@@ -66,6 +66,7 @@ function buildWin32Setup(arch, target) {
 	return cb => {
 		const ia32AppId = target === 'system' ? product.win32AppId : product.win32UserAppId;
 		const x64AppId = target === 'system' ? product.win32x64AppId : product.win32x64UserAppId;
+		const arm64AppId = target === 'system' ? product.win32arm64AppId : product.win32arm64UserAppId;
 
 		const sourcePath = buildPath(arch);
 		const outputPath = setupDir(arch, target);
@@ -89,12 +90,12 @@ function buildWin32Setup(arch, target) {
 			ShellNameShort: product.win32ShellNameShort,
 			AppMutex: product.win32MutexName,
 			Arch: arch,
-			AppId: arch === 'ia32' ? ia32AppId : x64AppId,
-			IncompatibleTargetAppId: arch === 'ia32' ? product.win32AppId : product.win32x64AppId,
-			IncompatibleArchAppId: arch === 'ia32' ? x64AppId : ia32AppId,
+			AppId: { 'ia32': ia32AppId, 'x64': x64AppId, 'arm64': arm64AppId }[arch],
+			IncompatibleTargetAppId: { 'ia32': product.win32AppId, 'x64': product.win32x64AppId, 'arm64': product.win32arm64AppId }[arch],
+			IncompatibleArchAppId: { 'ia32': x64AppId, 'x64': ia32AppId, 'arm64': ia32AppId }[arch],
 			AppUserId: product.win32AppUserModelId,
-			ArchitecturesAllowed: arch === 'ia32' ? '' : 'x64',
-			ArchitecturesInstallIn64BitMode: arch === 'ia32' ? '' : 'x64',
+			ArchitecturesAllowed: { 'ia32': '', 'x64': 'x64', 'arm64': 'arm64' }[arch],
+			ArchitecturesInstallIn64BitMode: { 'ia32': '', 'x64': 'x64', 'arm64': 'arm64' }[arch],
 			SourceDir: sourcePath,
 			RepoDir: repoPath,
 			OutputDir: outputPath,
@@ -113,8 +114,10 @@ function defineWin32SetupTasks(arch, target) {
 
 defineWin32SetupTasks('ia32', 'system');
 defineWin32SetupTasks('x64', 'system');
+defineWin32SetupTasks('arm64', 'system');
 defineWin32SetupTasks('ia32', 'user');
 defineWin32SetupTasks('x64', 'user');
+defineWin32SetupTasks('arm64', 'user');
 
 function archiveWin32Setup(arch) {
 	return cb => {
@@ -146,6 +149,7 @@ function updateIcon(executablePath) {
 
 gulp.task(task.define('vscode-win32-ia32-inno-updater', task.series(copyInnoUpdater('ia32'), updateIcon(path.join(buildPath('ia32'), 'tools', 'inno_updater.exe')))));
 gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
+gulp.task(task.define('vscode-win32-arm64-inno-updater', task.series(copyInnoUpdater('arm64'), updateIcon(path.join(buildPath('arm64'), 'tools', 'inno_updater.exe')))));
 
 // CodeHelper.exe icon
 

build/lib/builtInExtensions.js

@@ -100,7 +100,7 @@ function writeControlFile(control) {
 	fs.writeFileSync(controlFilePath, JSON.stringify(control, null, 2));
 }
 
-function main() {
+exports.getBuiltInExtensions = function getBuiltInExtensions() {
 	log('Syncronizing built-in extensions...');
 	log(`You can manage built-in extensions with the ${ansiColors.cyan('--builtin')} flag`);
 
@@ -116,14 +116,16 @@ function main() {
 
 	writeControlFile(control);
 
-	es.merge(streams)
-		.on('error', err => {
-			console.error(err);
-			process.exit(1);
-		})
-		.on('end', () => {
-			process.exit(0);
-		});
-}
+	return new Promise((resolve, reject) => {
+		es.merge(streams)
+			.on('error', reject)
+			.on('end', resolve);
+	});
+};
 
-main();
+if (require.main === module) {
+	exports.getBuiltInExtensions().then(() => process.exit(0)).catch(err => {
+		console.error(err);
+		process.exit(1);
+	});
+}

build/lib/compilation.js

@@ -18,6 +18,7 @@ const reporter_1 = require("./reporter");
 const util = require("./util");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
+const os = require("os");
 const watch = require('./watch');
 const reporter = reporter_1.createReporter();
 function getTypeScriptCompilerOptions(src) {
@@ -69,6 +70,9 @@ function createCompile(src, build, emitError) {
 }
 function compileTask(src, out, build) {
     return function () {
+        if (os.totalmem() < 4000000000) {
+            throw new Error('compilation requires 4GB of RAM');
+        }
         const compile = createCompile(src, build, true);
         const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
         let generator = new MonacoGenerator(false);

build/lib/compilation.ts

@@ -18,6 +18,7 @@ import { createReporter } from './reporter';
 import * as util from './util';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
+import * as os from 'os';
 import ts = require('typescript');
 
 const watch = require('./watch');
@@ -81,6 +82,11 @@ function createCompile(src: string, build: boolean, emitError?: boolean) {
 export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
+
+		if (os.totalmem() < 4_000_000_000) {
+			throw new Error('compilation requires 4GB of RAM');
+		}
+
 		const compile = createCompile(src, build, true);
 		const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
 		let generator = new MonacoGenerator(false);

build/lib/electron.js

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = exports.getElectronVersion = void 0;
+exports.config = void 0;
 const fs = require("fs");
 const path = require("path");
 const vfs = require("vinyl-fs");
@@ -16,12 +16,6 @@ const electron = require('gulp-atom-electron');
 const root = path.dirname(path.dirname(__dirname));
 const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
 const commit = util.getVersion(root);
-function getElectronVersion() {
-    const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-    const target = /^target "(.*)"$/m.exec(yarnrc)[1];
-    return target;
-}
-exports.getElectronVersion = getElectronVersion;
 const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
 function darwinBundleDocumentType(extensions, icon) {
     return {
@@ -33,7 +27,7 @@ function darwinBundleDocumentType(extensions, icon) {
     };
 }
 exports.config = {
-    version: getElectronVersion(),
+    version: util.getElectronVersion(),
     productAppName: product.nameLong,
     companyName: 'Microsoft Corporation',
     copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
@@ -73,7 +67,7 @@ function getElectron(arch) {
     };
 }
 async function main(arch = process.arch) {
-    const version = getElectronVersion();
+    const version = util.getElectronVersion();
     const electronPath = path.join(root, '.build', 'electron');
     const versionFile = path.join(electronPath, 'version');
     const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;

build/lib/electron.ts

@@ -19,12 +19,6 @@ const root = path.dirname(path.dirname(__dirname));
 const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
 const commit = util.getVersion(root);
 
-export function getElectronVersion(): string {
-	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-	const target = /^target "(.*)"$/m.exec(yarnrc)![1];
-	return target;
-}
-
 const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
 
 function darwinBundleDocumentType(extensions: string[], icon: string) {
@@ -38,7 +32,7 @@ function darwinBundleDocumentType(extensions: string[], icon: string) {
 }
 
 export const config = {
-	version: getElectronVersion(),
+	version: util.getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
 	copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
@@ -81,7 +75,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 }
 
 async function main(arch = process.arch): Promise<void> {
-	const version = getElectronVersion();
+	const version = util.getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');
 	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;

build/lib/eslint/vscode-dts-literal-or-types.js

@@ -13,6 +13,10 @@ module.exports = new class ApiLiteralOrTypes {
     create(context) {
         return {
             ['TSTypeAnnotation TSUnionType TSLiteralType']: (node) => {
+                var _a;
+                if (((_a = node.literal) === null || _a === void 0 ? void 0 : _a.type) === 'TSNullKeyword') {
+                    return;
+                }
                 context.report({
                     node: node,
                     messageId: 'useEnum'

build/lib/eslint/vscode-dts-literal-or-types.ts

@@ -15,6 +15,9 @@ export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
 			['TSTypeAnnotation TSUnionType TSLiteralType']: (node: any) => {
+				if (node.literal?.type === 'TSNullKeyword') {
+					return;
+				}
 				context.report({
 					node: node,
 					messageId: 'useEnum'

build/lib/extensions.js

@@ -4,7 +4,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageRebuildExtensionsStream = exports.cleanRebuildExtensions = exports.packageExternalExtensionsStream = exports.packageMarketplaceExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = void 0;
+exports.translatePackageJSON = exports.packageRebuildExtensionsStream = exports.cleanRebuildExtensions = exports.packageExternalExtensionsStream = exports.scanBuiltinExtensions = exports.packageMarketplaceExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = void 0;
 const es = require("event-stream");
 const fs = require("fs");
 const glob = require("glob");
@@ -22,33 +22,66 @@ const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
 const buffer = require('gulp-buffer');
 const json = require("gulp-json-editor");
+const jsoncParser = require("jsonc-parser");
 const webpack = require('webpack');
 const webpackGulp = require('webpack-stream');
 const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
-const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
-function fromLocal(extensionPath) {
-    const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
-    const input = fs.existsSync(webpackFilename)
-        ? fromLocalWebpack(extensionPath)
-        : fromLocalNormal(extensionPath);
-    const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
+const sourceMappingURLBase = `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}`;
+function minifyExtensionResources(input) {
+    const jsonFilter = filter(['**/*.json', '**/*.code-snippets'], { restore: true });
     return input
-        .pipe(tmLanguageJsonFilter)
+        .pipe(jsonFilter)
         .pipe(buffer())
         .pipe(es.mapSync((f) => {
-        f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
+        const errors = [];
+        const value = jsoncParser.parse(f.contents.toString('utf8'), errors);
+        if (errors.length === 0) {
+            // file parsed OK => just stringify to drop whitespace and comments
+            f.contents = Buffer.from(JSON.stringify(value));
+        }
         return f;
     }))
-        .pipe(tmLanguageJsonFilter.restore);
+        .pipe(jsonFilter.restore);
 }
-function fromLocalWebpack(extensionPath) {
+function updateExtensionPackageJSON(input, update) {
+    const packageJsonFilter = filter('extensions/*/package.json', { restore: true });
+    return input
+        .pipe(packageJsonFilter)
+        .pipe(buffer())
+        .pipe(es.mapSync((f) => {
+        const data = JSON.parse(f.contents.toString('utf8'));
+        f.contents = Buffer.from(JSON.stringify(update(data)));
+        return f;
+    }))
+        .pipe(packageJsonFilter.restore);
+}
+function fromLocal(extensionPath, forWeb) {
+    const webpackConfigFileName = forWeb ? 'extension-browser.webpack.config.js' : 'extension.webpack.config.js';
+    const isWebPacked = fs.existsSync(path.join(extensionPath, webpackConfigFileName));
+    let input = isWebPacked
+        ? fromLocalWebpack(extensionPath, webpackConfigFileName)
+        : fromLocalNormal(extensionPath);
+    if (isWebPacked) {
+        input = updateExtensionPackageJSON(input, (data) => {
+            delete data.scripts;
+            delete data.dependencies;
+            delete data.devDependencies;
+            if (data.main) {
+                data.main = data.main.replace('/out/', /dist/);
+            }
+            return data;
+        });
+    }
+    return input;
+}
+function fromLocalWebpack(extensionPath, webpackConfigFileName) {
     const result = es.through();
     const packagedDependencies = [];
     const packageJsonConfig = require(path.join(extensionPath, 'package.json'));
     if (packageJsonConfig.dependencies) {
-        const webpackRootConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
+        const webpackRootConfig = require(path.join(extensionPath, webpackConfigFileName));
         for (const key in webpackRootConfig.externals) {
             if (key in packageJsonConfig.dependencies) {
                 packagedDependencies.push(key);
@@ -64,30 +97,9 @@ function fromLocalWebpack(extensionPath) {
             base: extensionPath,
             contents: fs.createReadStream(filePath)
         }));
-        const filesStream = es.readArray(files);
         // check for a webpack configuration files, then invoke webpack
-        // and merge its output with the files stream. also rewrite the package.json
-        // file to a new entry point
-        const webpackConfigLocations = glob.sync(path.join(extensionPath, '/**/extension.webpack.config.js'), { ignore: ['**/node_modules'] });
-        const packageJsonFilter = filter(f => {
-            if (path.basename(f.path) === 'package.json') {
-                // only modify package.json's next to the webpack file.
-                // to be safe, use existsSync instead of path comparison.
-                return fs.existsSync(path.join(path.dirname(f.path), 'extension.webpack.config.js'));
-            }
-            return false;
-        }, { restore: true });
-        const patchFilesStream = filesStream
-            .pipe(packageJsonFilter)
-            .pipe(buffer())
-            .pipe(json((data) => {
-            if (data.main) {
-                // hardcoded entry point directory!
-                data.main = data.main.replace('/out/', /dist/);
-            }
-            return data;
-        }))
-            .pipe(packageJsonFilter.restore);
+        // and merge its output with the files stream.
+        const webpackConfigLocations = glob.sync(path.join(extensionPath, '**', webpackConfigFileName), { ignore: ['**/node_modules'] });
         const webpackStreams = webpackConfigLocations.map(webpackConfigPath => {
             const webpackDone = (err, stats) => {
                 fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
@@ -121,7 +133,7 @@ function fromLocalWebpack(extensionPath) {
                 this.emit('data', data);
             }));
         });
-        es.merge(...webpackStreams, patchFilesStream)
+        es.merge(...webpackStreams, es.readArray(files))
             // .pipe(es.through(function (data) {
             // 	// debug
             // 	console.log('out', data.path, data.contents.length);
@@ -182,7 +194,6 @@ function fromMarketplace(extensionName, version, metadata) {
 exports.fromMarketplace = fromMarketplace;
 const excludedExtensions = [
     'vscode-api-tests',
-    'vscode-web-playground',
     'vscode-colorize-tests',
     'vscode-test-resolver',
     'ms-vscode.node-debug',
@@ -198,6 +209,8 @@ const externalExtensions = [
     // Any extension not included here will be installed by default.
     'admin-tool-ext-win',
     'agent',
+    'arc',
+    'azdata',
     'import',
     'profiler',
     'admin-pack',
@@ -207,42 +220,117 @@ const externalExtensions = [
     'query-history',
     'liveshare',
     'sql-database-projects',
-    'machine-learning'
+    'machine-learning',
+    'sql-assessment',
+    'asde-deployment',
+    'sql-migration'
 ];
 // extensions that require a rebuild since they have native parts
 const rebuildExtensions = [
     'big-data-cluster',
     'mssql'
 ];
-const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
-function packageLocalExtensionsStream() {
-    const localExtensionDescriptions = glob.sync('extensions/*/package.json')
+const marketplaceWebExtensions = [
+    'ms-vscode.references-view'
+];
+const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
+const builtInExtensions = productJson.builtInExtensions || [];
+const webBuiltInExtensions = productJson.webBuiltInExtensions || [];
+/**
+ * Loosely based on `getExtensionKind` from `src/vs/workbench/services/extensions/common/extensionsUtil.ts`
+ */
+function isWebExtension(manifest) {
+    if (typeof manifest.extensionKind !== 'undefined') {
+        const extensionKind = Array.isArray(manifest.extensionKind) ? manifest.extensionKind : [manifest.extensionKind];
+        return (extensionKind.indexOf('web') >= 0);
+    }
+    return (!Boolean(manifest.main) || Boolean(manifest.browser));
+}
+function packageLocalExtensionsStream(forWeb) {
+    const localExtensionsDescriptions = (glob.sync('extensions/*/package.json')
         .map(manifestPath => {
+        const absoluteManifestPath = path.join(root, manifestPath);
         const extensionPath = path.dirname(path.join(root, manifestPath));
         const extensionName = path.basename(extensionPath);
-        return { name: extensionName, path: extensionPath };
+        return { name: extensionName, path: extensionPath, manifestPath: absoluteManifestPath };
     })
+        .filter(({ name }) => (name === 'vscode-web-playground' ? forWeb : true)) // package vscode-web-playground only for web
         .filter(({ name }) => excludedExtensions.indexOf(name) === -1)
         .filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-        .filter(({ name }) => externalExtensions.indexOf(name) === -1); // {{SQL CARBON EDIT}} Remove external Extensions with separate package
-    const nodeModules = gulp.src('extensions/node_modules/**', { base: '.' });
-    const localExtensions = localExtensionDescriptions.map(extension => {
-        return fromLocal(extension.path)
+        .filter(({ name }) => externalExtensions.indexOf(name) === -1) // {{SQL CARBON EDIT}} Remove external Extensions with separate package
+    );
+    const localExtensionsStream = minifyExtensionResources(es.merge(...localExtensionsDescriptions.map(extension => {
+        return fromLocal(extension.path, forWeb)
             .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-    });
-    return es.merge(nodeModules, ...localExtensions)
-        .pipe(util2.setExecutableBit(['**/*.sh']));
+    })));
+    let result;
+    if (forWeb) {
+        result = localExtensionsStream;
+    }
+    else {
+        // also include shared node modules
+        result = es.merge(localExtensionsStream, gulp.src('extensions/node_modules/**', { base: '.' }));
+    }
+    return (result
+        .pipe(util2.setExecutableBit(['**/*.sh'])));
 }
 exports.packageLocalExtensionsStream = packageLocalExtensionsStream;
-function packageMarketplaceExtensionsStream() {
-    const extensions = builtInExtensions.map(extension => {
-        return fromMarketplace(extension.name, extension.version, extension.metadata)
+function packageMarketplaceExtensionsStream(forWeb) {
+    const marketplaceExtensionsDescriptions = [
+        ...builtInExtensions.filter(({ name }) => (forWeb ? marketplaceWebExtensions.indexOf(name) >= 0 : true)),
+        ...(forWeb ? webBuiltInExtensions : [])
+    ];
+    const marketplaceExtensionsStream = minifyExtensionResources(es.merge(...marketplaceExtensionsDescriptions
+        .map(extension => {
+        const input = fromMarketplace(extension.name, extension.version, extension.metadata)
             .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-    });
-    return es.merge(extensions)
-        .pipe(util2.setExecutableBit(['**/*.sh']));
+        return updateExtensionPackageJSON(input, (data) => {
+            delete data.scripts;
+            delete data.dependencies;
+            delete data.devDependencies;
+            return data;
+        });
+    })));
+    return (marketplaceExtensionsStream
+        .pipe(util2.setExecutableBit(['**/*.sh'])));
 }
 exports.packageMarketplaceExtensionsStream = packageMarketplaceExtensionsStream;
+function scanBuiltinExtensions(extensionsRoot, exclude = []) {
+    const scannedExtensions = [];
+    try {
+        const extensionsFolders = fs.readdirSync(extensionsRoot);
+        for (const extensionFolder of extensionsFolders) {
+            if (exclude.indexOf(extensionFolder) >= 0) {
+                continue;
+            }
+            const packageJSONPath = path.join(extensionsRoot, extensionFolder, 'package.json');
+            if (!fs.existsSync(packageJSONPath)) {
+                continue;
+            }
+            let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));
+            if (!isWebExtension(packageJSON)) {
+                continue;
+            }
+            const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
+            const packageNLSPath = children.filter(child => child === 'package.nls.json')[0];
+            const packageNLS = packageNLSPath ? JSON.parse(fs.readFileSync(path.join(extensionsRoot, extensionFolder, packageNLSPath)).toString()) : undefined;
+            const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
+            const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
+            scannedExtensions.push({
+                extensionPath: extensionFolder,
+                packageJSON,
+                packageNLS,
+                readmePath: readme ? path.join(extensionFolder, readme) : undefined,
+                changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined,
+            });
+        }
+        return scannedExtensions;
+    }
+    catch (ex) {
+        return scannedExtensions;
+    }
+}
+exports.scanBuiltinExtensions = scanBuiltinExtensions;
 function packageExternalExtensionsStream() {
     const extenalExtensionDescriptions = glob.sync('extensions/*/package.json')
         .map(manifestPath => {
@@ -252,13 +340,13 @@ function packageExternalExtensionsStream() {
     })
         .filter(({ name }) => externalExtensions.indexOf(name) >= 0);
     const builtExtensions = extenalExtensionDescriptions.map(extension => {
-        return fromLocal(extension.path)
+        return fromLocal(extension.path, false)
             .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
     });
     return es.merge(builtExtensions);
 }
 exports.packageExternalExtensionsStream = packageExternalExtensionsStream;
-// {{SQL CARBON EDIT}} - End
+// {{SQL CARBON EDIT}} start
 function cleanRebuildExtensions(root) {
     return Promise.all(rebuildExtensions.map(async (e) => {
         await util2.rimraf(path.join(root, e))();
@@ -274,9 +362,34 @@ function packageRebuildExtensionsStream() {
     })
         .filter(({ name }) => rebuildExtensions.indexOf(name) >= 0);
     const builtExtensions = extenalExtensionDescriptions.map(extension => {
-        return fromLocal(extension.path)
+        return fromLocal(extension.path, false)
             .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
     });
     return es.merge(builtExtensions);
 }
 exports.packageRebuildExtensionsStream = packageRebuildExtensionsStream;
+// {{SQL CARBON EDIT}} end
+function translatePackageJSON(packageJSON, packageNLSPath) {
+    const CharCode_PC = '%'.charCodeAt(0);
+    const packageNls = JSON.parse(fs.readFileSync(packageNLSPath).toString());
+    const translate = (obj) => {
+        for (let key in obj) {
+            const val = obj[key];
+            if (Array.isArray(val)) {
+                val.forEach(translate);
+            }
+            else if (val && typeof val === 'object') {
+                translate(val);
+            }
+            else if (typeof val === 'string' && val.charCodeAt(0) === CharCode_PC && val.charCodeAt(val.length - 1) === CharCode_PC) {
+                const translated = packageNls[val.substr(1, val.length - 2)];
+                if (translated) {
+                    obj[key] = translated;
+                }
+            }
+        }
+    };
+    translate(packageJSON);
+    return packageJSON;
+}
+exports.translatePackageJSON = translatePackageJSON;

build/lib/extensions.ts

@@ -21,38 +21,75 @@ import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 const buffer = require('gulp-buffer');
 import json = require('gulp-json-editor');
+import * as jsoncParser from 'jsonc-parser';
 const webpack = require('webpack');
 const webpackGulp = require('webpack-stream');
 const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
-const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
-
-function fromLocal(extensionPath: string): Stream {
-	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
-	const input = fs.existsSync(webpackFilename)
-		? fromLocalWebpack(extensionPath)
-		: fromLocalNormal(extensionPath);
-
-	const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
+const sourceMappingURLBase = `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}`;
 
+function minifyExtensionResources(input: Stream): Stream {
+	const jsonFilter = filter(['**/*.json', '**/*.code-snippets'], { restore: true });
 	return input
-		.pipe(tmLanguageJsonFilter)
+		.pipe(jsonFilter)
 		.pipe(buffer())
 		.pipe(es.mapSync((f: File) => {
-			f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
+			const errors: jsoncParser.ParseError[] = [];
+			const value = jsoncParser.parse(f.contents.toString('utf8'), errors);
+			if (errors.length === 0) {
+				// file parsed OK => just stringify to drop whitespace and comments
+				f.contents = Buffer.from(JSON.stringify(value));
+			}
 			return f;
 		}))
-		.pipe(tmLanguageJsonFilter.restore);
+		.pipe(jsonFilter.restore);
 }
 
-function fromLocalWebpack(extensionPath: string): Stream {
+function updateExtensionPackageJSON(input: Stream, update: (data: any) => any): Stream {
+	const packageJsonFilter = filter('extensions/*/package.json', { restore: true });
+	return input
+		.pipe(packageJsonFilter)
+		.pipe(buffer())
+		.pipe(es.mapSync((f: File) => {
+			const data = JSON.parse(f.contents.toString('utf8'));
+			f.contents = Buffer.from(JSON.stringify(update(data)));
+			return f;
+		}))
+		.pipe(packageJsonFilter.restore);
+}
+
+function fromLocal(extensionPath: string, forWeb: boolean): Stream {
+	const webpackConfigFileName = forWeb ? 'extension-browser.webpack.config.js' : 'extension.webpack.config.js';
+
+	const isWebPacked = fs.existsSync(path.join(extensionPath, webpackConfigFileName));
+	let input = isWebPacked
+		? fromLocalWebpack(extensionPath, webpackConfigFileName)
+		: fromLocalNormal(extensionPath);
+
+	if (isWebPacked) {
+		input = updateExtensionPackageJSON(input, (data: any) => {
+			delete data.scripts;
+			delete data.dependencies;
+			delete data.devDependencies;
+			if (data.main) {
+				data.main = data.main.replace('/out/', /dist/);
+			}
+			return data;
+		});
+	}
+
+	return input;
+}
+
+
+function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string): Stream {
 	const result = es.through();
 
 	const packagedDependencies: string[] = [];
 	const packageJsonConfig = require(path.join(extensionPath, 'package.json'));
 	if (packageJsonConfig.dependencies) {
-		const webpackRootConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
+		const webpackRootConfig = require(path.join(extensionPath, webpackConfigFileName));
 		for (const key in webpackRootConfig.externals) {
 			if (key in packageJsonConfig.dependencies) {
 				packagedDependencies.push(key);
@@ -70,38 +107,13 @@ function fromLocalWebpack(extensionPath: string): Stream {
 				contents: fs.createReadStream(filePath) as any
 			}));
 
-		const filesStream = es.readArray(files);
-
 		// check for a webpack configuration files, then invoke webpack
-		// and merge its output with the files stream. also rewrite the package.json
-		// file to a new entry point
+		// and merge its output with the files stream.
 		const webpackConfigLocations = (<string[]>glob.sync(
-			path.join(extensionPath, '/**/extension.webpack.config.js'),
+			path.join(extensionPath, '**', webpackConfigFileName),
 			{ ignore: ['**/node_modules'] }
 		));
 
-		const packageJsonFilter = filter(f => {
-			if (path.basename(f.path) === 'package.json') {
-				// only modify package.json's next to the webpack file.
-				// to be safe, use existsSync instead of path comparison.
-				return fs.existsSync(path.join(path.dirname(f.path), 'extension.webpack.config.js'));
-			}
-			return false;
-		}, { restore: true });
-
-		const patchFilesStream = filesStream
-			.pipe(packageJsonFilter)
-			.pipe(buffer())
-			.pipe(json((data: any) => {
-				if (data.main) {
-					// hardcoded entry point directory!
-					data.main = data.main.replace('/out/', /dist/);
-				}
-				return data;
-			}))
-			.pipe(packageJsonFilter.restore);
-
-
 		const webpackStreams = webpackConfigLocations.map(webpackConfigPath => {
 
 			const webpackDone = (err: any, stats: any) => {
@@ -143,7 +155,7 @@ function fromLocalWebpack(extensionPath: string): Stream {
 				}));
 		});
 
-		es.merge(...webpackStreams, patchFilesStream)
+		es.merge(...webpackStreams, es.readArray(files))
 			// .pipe(es.through(function (data) {
 			// 	// debug
 			// 	console.log('out', data.path, data.contents.length);
@@ -213,10 +225,8 @@ export function fromMarketplace(extensionName: string, version: string, metadata
 		.pipe(json({ __metadata: metadata }))
 		.pipe(packageJsonFilter.restore);
 }
-
 const excludedExtensions = [
 	'vscode-api-tests',
-	'vscode-web-playground',
 	'vscode-colorize-tests',
 	'vscode-test-resolver',
 	'ms-vscode.node-debug',
@@ -233,6 +243,8 @@ const externalExtensions = [
 	// Any extension not included here will be installed by default.
 	'admin-tool-ext-win',
 	'agent',
+	'arc',
+	'azdata',
 	'import',
 	'profiler',
 	'admin-pack',
@@ -242,7 +254,10 @@ const externalExtensions = [
 	'query-history',
 	'liveshare',
 	'sql-database-projects',
-	'machine-learning'
+	'machine-learning',
+	'sql-assessment',
+	'asde-deployment',
+	'sql-migration'
 ];
 
 // extensions that require a rebuild since they have native parts
@@ -251,6 +266,10 @@ const rebuildExtensions = [
 	'mssql'
 ];
 
+const marketplaceWebExtensions = [
+	'ms-vscode.references-view'
+];
+
 interface IBuiltInExtension {
 	name: string;
 	version: string;
@@ -258,37 +277,134 @@ interface IBuiltInExtension {
 	metadata: any;
 }
 
-const builtInExtensions: IBuiltInExtension[] = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
+const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
+const builtInExtensions: IBuiltInExtension[] = productJson.builtInExtensions || [];
+const webBuiltInExtensions: IBuiltInExtension[] = productJson.webBuiltInExtensions || [];
 
-export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream {
-	const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))
-		.map(manifestPath => {
-			const extensionPath = path.dirname(path.join(root, manifestPath));
-			const extensionName = path.basename(extensionPath);
-			return { name: extensionName, path: extensionPath };
-		})
-		.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
-		.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-		.filter(({ name }) => externalExtensions.indexOf(name) === -1); // {{SQL CARBON EDIT}} Remove external Extensions with separate package
-
-	const nodeModules = gulp.src('extensions/node_modules/**', { base: '.' });
-	const localExtensions = localExtensionDescriptions.map(extension => {
-		return fromLocal(extension.path)
-			.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-	});
-
-	return es.merge(nodeModules, ...localExtensions)
-		.pipe(util2.setExecutableBit(['**/*.sh']));
+type ExtensionKind = 'ui' | 'workspace' | 'web';
+interface IExtensionManifest {
+	main: string;
+	browser: string;
+	extensionKind?: ExtensionKind | ExtensionKind[];
+}
+/**
+ * Loosely based on `getExtensionKind` from `src/vs/workbench/services/extensions/common/extensionsUtil.ts`
+ */
+function isWebExtension(manifest: IExtensionManifest): boolean {
+	if (typeof manifest.extensionKind !== 'undefined') {
+		const extensionKind = Array.isArray(manifest.extensionKind) ? manifest.extensionKind : [manifest.extensionKind];
+		return (extensionKind.indexOf('web') >= 0);
+	}
+	return (!Boolean(manifest.main) || Boolean(manifest.browser));
 }
 
-export function packageMarketplaceExtensionsStream(): NodeJS.ReadWriteStream {
-	const extensions = builtInExtensions.map(extension => {
-		return fromMarketplace(extension.name, extension.version, extension.metadata)
-			.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-	});
+export function packageLocalExtensionsStream(forWeb: boolean): Stream {
+	const localExtensionsDescriptions = (
+		(<string[]>glob.sync('extensions/*/package.json'))
+			.map(manifestPath => {
+				const absoluteManifestPath = path.join(root, manifestPath);
+				const extensionPath = path.dirname(path.join(root, manifestPath));
+				const extensionName = path.basename(extensionPath);
+				return { name: extensionName, path: extensionPath, manifestPath: absoluteManifestPath };
+			})
+			.filter(({ name }) => (name === 'vscode-web-playground' ? forWeb : true)) // package vscode-web-playground only for web
+			.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+			.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
+			.filter(({ name }) => externalExtensions.indexOf(name) === -1) // {{SQL CARBON EDIT}} Remove external Extensions with separate package
+	);
+	const localExtensionsStream = minifyExtensionResources(
+		es.merge(
+			...localExtensionsDescriptions.map(extension => {
+				return fromLocal(extension.path, forWeb)
+					.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+			})
+		)
+	);
 
-	return es.merge(extensions)
-		.pipe(util2.setExecutableBit(['**/*.sh']));
+	let result: Stream;
+	if (forWeb) {
+		result = localExtensionsStream;
+	} else {
+		// also include shared node modules
+		result = es.merge(localExtensionsStream, gulp.src('extensions/node_modules/**', { base: '.' }));
+	}
+
+	return (
+		result
+			.pipe(util2.setExecutableBit(['**/*.sh']))
+	);
+}
+
+export function packageMarketplaceExtensionsStream(forWeb: boolean): Stream {
+	const marketplaceExtensionsDescriptions = [
+		...builtInExtensions.filter(({ name }) => (forWeb ? marketplaceWebExtensions.indexOf(name) >= 0 : true)),
+		...(forWeb ? webBuiltInExtensions : [])
+	];
+	const marketplaceExtensionsStream = minifyExtensionResources(
+		es.merge(
+			...marketplaceExtensionsDescriptions
+				.map(extension => {
+					const input = fromMarketplace(extension.name, extension.version, extension.metadata)
+						.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+					return updateExtensionPackageJSON(input, (data: any) => {
+						delete data.scripts;
+						delete data.dependencies;
+						delete data.devDependencies;
+						return data;
+					});
+				})
+		)
+	);
+
+	return (
+		marketplaceExtensionsStream
+			.pipe(util2.setExecutableBit(['**/*.sh']))
+	);
+}
+
+export interface IScannedBuiltinExtension {
+	extensionPath: string;
+	packageJSON: any;
+	packageNLS?: any;
+	readmePath?: string;
+	changelogPath?: string;
+}
+
+export function scanBuiltinExtensions(extensionsRoot: string, exclude: string[] = []): IScannedBuiltinExtension[] {
+	const scannedExtensions: IScannedBuiltinExtension[] = [];
+
+	try {
+		const extensionsFolders = fs.readdirSync(extensionsRoot);
+		for (const extensionFolder of extensionsFolders) {
+			if (exclude.indexOf(extensionFolder) >= 0) {
+				continue;
+			}
+			const packageJSONPath = path.join(extensionsRoot, extensionFolder, 'package.json');
+			if (!fs.existsSync(packageJSONPath)) {
+				continue;
+			}
+			let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));
+			if (!isWebExtension(packageJSON)) {
+				continue;
+			}
+			const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
+			const packageNLSPath = children.filter(child => child === 'package.nls.json')[0];
+			const packageNLS = packageNLSPath ? JSON.parse(fs.readFileSync(path.join(extensionsRoot, extensionFolder, packageNLSPath)).toString()) : undefined;
+			const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
+			const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
+
+			scannedExtensions.push({
+				extensionPath: extensionFolder,
+				packageJSON,
+				packageNLS,
+				readmePath: readme ? path.join(extensionFolder, readme) : undefined,
+				changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined,
+			});
+		}
+		return scannedExtensions;
+	} catch (ex) {
+		return scannedExtensions;
+	}
 }
 
 export function packageExternalExtensionsStream(): NodeJS.ReadWriteStream {
@@ -301,14 +417,14 @@ export function packageExternalExtensionsStream(): NodeJS.ReadWriteStream {
 		.filter(({ name }) => externalExtensions.indexOf(name) >= 0);
 
 	const builtExtensions = extenalExtensionDescriptions.map(extension => {
-		return fromLocal(extension.path)
+		return fromLocal(extension.path, false)
 			.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
 	});
 
 	return es.merge(builtExtensions);
 }
-// {{SQL CARBON EDIT}} - End
 
+// {{SQL CARBON EDIT}} start
 export function cleanRebuildExtensions(root: string): Promise<void> {
 	return Promise.all(rebuildExtensions.map(async e => {
 		await util2.rimraf(path.join(root, e))();
@@ -325,9 +441,32 @@ export function packageRebuildExtensionsStream(): NodeJS.ReadWriteStream {
 		.filter(({ name }) => rebuildExtensions.indexOf(name) >= 0);
 
 	const builtExtensions = extenalExtensionDescriptions.map(extension => {
-		return fromLocal(extension.path)
+		return fromLocal(extension.path, false)
 			.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
 	});
 
 	return es.merge(builtExtensions);
 }
+// {{SQL CARBON EDIT}} end
+
+export function translatePackageJSON(packageJSON: string, packageNLSPath: string) {
+	const CharCode_PC = '%'.charCodeAt(0);
+	const packageNls = JSON.parse(fs.readFileSync(packageNLSPath).toString());
+	const translate = (obj: any) => {
+		for (let key in obj) {
+			const val = obj[key];
+			if (Array.isArray(val)) {
+				val.forEach(translate);
+			} else if (val && typeof val === 'object') {
+				translate(val);
+			} else if (typeof val === 'string' && val.charCodeAt(0) === CharCode_PC && val.charCodeAt(val.length - 1) === CharCode_PC) {
+				const translated = packageNls[val.substr(1, val.length - 2)];
+				if (translated) {
+					obj[key] = translated;
+				}
+			}
+		}
+	};
+	translate(packageJSON);
+	return packageJSON;
+}

build/lib/i18n.js

@@ -16,7 +16,7 @@ const https = require("https");
 const gulp = require("gulp");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
-const iconv = require("iconv-lite");
+const iconv = require("iconv-lite-umd");
 const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
 function log(message, ...rest) {
     fancyLog(ansiColors.green('[i18n]'), message, ...rest);
@@ -101,161 +101,158 @@ class TextModel {
         return this._lines;
     }
 }
-let XLF = /** @class */ (() => {
-    class XLF {
-        constructor(project) {
-            this.project = project;
-            this.buffer = [];
-            this.files = Object.create(null);
-            this.numberOfMessages = 0;
+class XLF {
+    constructor(project) {
+        this.project = project;
+        this.buffer = [];
+        this.files = Object.create(null);
+        this.numberOfMessages = 0;
+    }
+    toString() {
+        this.appendHeader();
+        for (let file in this.files) {
+            this.appendNewLine(`<file original="${file}" source-language="en" datatype="plaintext"><body>`, 2);
+            for (let item of this.files[file]) {
+                this.addStringItem(file, item);
+            }
+            this.appendNewLine('</body></file>', 2);
         }
-        toString() {
-            this.appendHeader();
-            for (let file in this.files) {
-                this.appendNewLine(`<file original="${file}" source-language="en" datatype="plaintext"><body>`, 2);
-                for (let item of this.files[file]) {
-                    this.addStringItem(file, item);
+        this.appendFooter();
+        return this.buffer.join('\r\n');
+    }
+    addFile(original, keys, messages) {
+        if (keys.length === 0) {
+            console.log('No keys in ' + original);
+            return;
+        }
+        if (keys.length !== messages.length) {
+            throw new Error(`Unmatching keys(${keys.length}) and messages(${messages.length}).`);
+        }
+        this.numberOfMessages += keys.length;
+        this.files[original] = [];
+        let existingKeys = new Set();
+        for (let i = 0; i < keys.length; i++) {
+            let key = keys[i];
+            let realKey;
+            let comment;
+            if (Is.string(key)) {
+                realKey = key;
+                comment = undefined;
+            }
+            else if (LocalizeInfo.is(key)) {
+                realKey = key.key;
+                if (key.comment && key.comment.length > 0) {
+                    comment = key.comment.map(comment => encodeEntities(comment)).join('\r\n');
                 }
-                this.appendNewLine('</body></file>', 2);
             }
-            this.appendFooter();
-            return this.buffer.join('\r\n');
-        }
-        addFile(original, keys, messages) {
-            if (keys.length === 0) {
-                console.log('No keys in ' + original);
-                return;
+            if (!realKey || existingKeys.has(realKey)) {
+                continue;
             }
-            if (keys.length !== messages.length) {
-                throw new Error(`Unmatching keys(${keys.length}) and messages(${messages.length}).`);
-            }
-            this.numberOfMessages += keys.length;
-            this.files[original] = [];
-            let existingKeys = new Set();
-            for (let i = 0; i < keys.length; i++) {
-                let key = keys[i];
-                let realKey;
-                let comment;
-                if (Is.string(key)) {
-                    realKey = key;
-                    comment = undefined;
-                }
-                else if (LocalizeInfo.is(key)) {
-                    realKey = key.key;
-                    if (key.comment && key.comment.length > 0) {
-                        comment = key.comment.map(comment => encodeEntities(comment)).join('\r\n');
-                    }
-                }
-                if (!realKey || existingKeys.has(realKey)) {
-                    continue;
-                }
-                existingKeys.add(realKey);
-                let message = encodeEntities(messages[i]);
-                this.files[original].push({ id: realKey, message: message, comment: comment });
-            }
-        }
-        addStringItem(file, item) {
-            if (!item.id || item.message === undefined || item.message === null) {
-                throw new Error(`No item ID or value specified: ${JSON.stringify(item)}. File: ${file}`);
-            }
-            if (item.message.length === 0) {
-                log(`Item with id ${item.id} in file ${file} has an empty message.`);
-            }
-            this.appendNewLine(`<trans-unit id="${item.id}">`, 4);
-            this.appendNewLine(`<source xml:lang="en">${item.message}</source>`, 6);
-            if (item.comment) {
-                this.appendNewLine(`<note>${item.comment}</note>`, 6);
-            }
-            this.appendNewLine('</trans-unit>', 4);
-        }
-        appendHeader() {
-            this.appendNewLine('<?xml version="1.0" encoding="utf-8"?>', 0);
-            this.appendNewLine('<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">', 0);
-        }
-        appendFooter() {
-            this.appendNewLine('</xliff>', 0);
-        }
-        appendNewLine(content, indent) {
-            let line = new Line(indent);
-            line.append(content);
-            this.buffer.push(line.toString());
+            existingKeys.add(realKey);
+            let message = encodeEntities(messages[i]);
+            this.files[original].push({ id: realKey, message: message, comment: comment });
         }
     }
-    XLF.parsePseudo = function (xlfString) {
-        return new Promise((resolve) => {
-            let parser = new xml2js.Parser();
-            let files = [];
-            parser.parseString(xlfString, function (_err, result) {
-                const fileNodes = result['xliff']['file'];
-                fileNodes.forEach(file => {
-                    const originalFilePath = file.$.original;
-                    const messages = {};
-                    const transUnits = file.body[0]['trans-unit'];
-                    if (transUnits) {
-                        transUnits.forEach((unit) => {
-                            const key = unit.$.id;
-                            const val = pseudify(unit.source[0]['_'].toString());
-                            if (key && val) {
-                                messages[key] = decodeEntities(val);
-                            }
-                        });
-                        files.push({ messages: messages, originalFilePath: originalFilePath, language: 'ps' });
-                    }
-                });
-                resolve(files);
-            });
-        });
-    };
-    XLF.parse = function (xlfString) {
-        return new Promise((resolve, reject) => {
-            let parser = new xml2js.Parser();
-            let files = [];
-            parser.parseString(xlfString, function (err, result) {
-                if (err) {
-                    reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`));
-                }
-                const fileNodes = result['xliff']['file'];
-                if (!fileNodes) {
-                    reject(new Error(`XLF parsing error: XLIFF file does not contain "xliff" or "file" node(s) required for parsing.`));
-                }
-                fileNodes.forEach((file) => {
-                    const originalFilePath = file.$.original;
-                    if (!originalFilePath) {
-                        reject(new Error(`XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.`));
-                    }
-                    let language = file.$['target-language'];
-                    if (!language) {
-                        reject(new Error(`XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.`));
-                    }
-                    const messages = {};
-                    const transUnits = file.body[0]['trans-unit'];
-                    if (transUnits) {
-                        transUnits.forEach((unit) => {
-                            const key = unit.$.id;
-                            if (!unit.target) {
-                                return; // No translation available
-                            }
-                            let val = unit.target[0];
-                            if (typeof val !== 'string') {
-                                val = val._;
-                            }
-                            if (key && val) {
-                                messages[key] = decodeEntities(val);
-                            }
-                            else {
-                                reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
-                            }
-                        });
-                        files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
-                    }
-                });
-                resolve(files);
-            });
-        });
-    };
-    return XLF;
-})();
+    addStringItem(file, item) {
+        if (!item.id || item.message === undefined || item.message === null) {
+            throw new Error(`No item ID or value specified: ${JSON.stringify(item)}. File: ${file}`);
+        }
+        if (item.message.length === 0) {
+            log(`Item with id ${item.id} in file ${file} has an empty message.`);
+        }
+        this.appendNewLine(`<trans-unit id="${item.id}">`, 4);
+        this.appendNewLine(`<source xml:lang="en">${item.message}</source>`, 6);
+        if (item.comment) {
+            this.appendNewLine(`<note>${item.comment}</note>`, 6);
+        }
+        this.appendNewLine('</trans-unit>', 4);
+    }
+    appendHeader() {
+        this.appendNewLine('<?xml version="1.0" encoding="utf-8"?>', 0);
+        this.appendNewLine('<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">', 0);
+    }
+    appendFooter() {
+        this.appendNewLine('</xliff>', 0);
+    }
+    appendNewLine(content, indent) {
+        let line = new Line(indent);
+        line.append(content);
+        this.buffer.push(line.toString());
+    }
+}
 exports.XLF = XLF;
+XLF.parsePseudo = function (xlfString) {
+    return new Promise((resolve) => {
+        let parser = new xml2js.Parser();
+        let files = [];
+        parser.parseString(xlfString, function (_err, result) {
+            const fileNodes = result['xliff']['file'];
+            fileNodes.forEach(file => {
+                const originalFilePath = file.$.original;
+                const messages = {};
+                const transUnits = file.body[0]['trans-unit'];
+                if (transUnits) {
+                    transUnits.forEach((unit) => {
+                        const key = unit.$.id;
+                        const val = pseudify(unit.source[0]['_'].toString());
+                        if (key && val) {
+                            messages[key] = decodeEntities(val);
+                        }
+                    });
+                    files.push({ messages: messages, originalFilePath: originalFilePath, language: 'ps' });
+                }
+            });
+            resolve(files);
+        });
+    });
+};
+XLF.parse = function (xlfString) {
+    return new Promise((resolve, reject) => {
+        let parser = new xml2js.Parser();
+        let files = [];
+        parser.parseString(xlfString, function (err, result) {
+            if (err) {
+                reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`));
+            }
+            const fileNodes = result['xliff']['file'];
+            if (!fileNodes) {
+                reject(new Error(`XLF parsing error: XLIFF file does not contain "xliff" or "file" node(s) required for parsing.`));
+            }
+            fileNodes.forEach((file) => {
+                const originalFilePath = file.$.original;
+                if (!originalFilePath) {
+                    reject(new Error(`XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.`));
+                }
+                let language = file.$['target-language'];
+                if (!language) {
+                    reject(new Error(`XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.`));
+                }
+                const messages = {};
+                const transUnits = file.body[0]['trans-unit'];
+                if (transUnits) {
+                    transUnits.forEach((unit) => {
+                        const key = unit.$.id;
+                        if (!unit.target) {
+                            return; // No translation available
+                        }
+                        let val = unit.target[0];
+                        if (typeof val !== 'string') {
+                            val = val._;
+                        }
+                        if (key && val) {
+                            messages[key] = decodeEntities(val);
+                        }
+                        else {
+                            reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
+                        }
+                    });
+                    files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
+                }
+            });
+            resolve(files);
+        });
+    });
+};
 class Limiter {
     constructor(maxDegreeOfParalellism) {
         this.maxDegreeOfParalellism = maxDegreeOfParalellism;
@@ -1150,12 +1147,7 @@ function createIslFile(originalFilePath, messages, language, innoSetup) {
         if (line.length > 0) {
             let firstChar = line.charAt(0);
             if (firstChar === '[' || firstChar === ';') {
-                if (line === '; *** Inno Setup version 5.5.3+ English messages ***') {
-                    content.push(`; *** Inno Setup version 5.5.3+ ${innoSetup.defaultInfo.name} messages ***`);
-                }
-                else {
-                    content.push(line);
-                }
+                content.push(line);
             }
             else {
                 let sections = line.split('=');
@@ -1184,9 +1176,10 @@ function createIslFile(originalFilePath, messages, language, innoSetup) {
     });
     const basename = path.basename(originalFilePath);
     const filePath = `${basename}.${language.id}.isl`;
+    const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage);
     return new File({
         path: filePath,
-        contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage)
+        contents: Buffer.from(encoded),
     });
 }
 function encodeEntities(value) {

build/lib/i18n.resources.json

@@ -138,6 +138,10 @@
 			"name": "vs/workbench/contrib/relauncher",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/sash",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/scm",
 			"project": "vscode-workbench"
@@ -214,6 +218,10 @@
 			"name": "vs/workbench/contrib/userDataSync",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/views",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/actions",
 			"project": "vscode-workbench"
@@ -338,6 +346,10 @@
 			"name": "vs/workbench/services/userDataSync",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/views",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/timeline",
 			"project": "vscode-workbench"

build/lib/i18n.ts

@@ -15,7 +15,7 @@ import * as https from 'https';
 import * as gulp from 'gulp';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
-import * as iconv from 'iconv-lite';
+import * as iconv from 'iconv-lite-umd';
 
 const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
 
@@ -1316,11 +1316,7 @@ function createIslFile(originalFilePath: string, messages: Map<string>, language
 		if (line.length > 0) {
 			let firstChar = line.charAt(0);
 			if (firstChar === '[' || firstChar === ';') {
-				if (line === '; *** Inno Setup version 5.5.3+ English messages ***') {
-					content.push(`; *** Inno Setup version 5.5.3+ ${innoSetup.defaultInfo!.name} messages ***`);
-				} else {
-					content.push(line);
-				}
+				content.push(line);
 			} else {
 				let sections: string[] = line.split('=');
 				let key = sections[0];
@@ -1347,10 +1343,11 @@ function createIslFile(originalFilePath: string, messages: Map<string>, language
 
 	const basename = path.basename(originalFilePath);
 	const filePath = `${basename}.${language.id}.isl`;
+	const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage);
 
 	return new File({
 		path: filePath,
-		contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage)
+		contents: Buffer.from(encoded),
 	});
 }
 

build/lib/layersChecker.js

@@ -130,6 +130,14 @@ const RULES = [
             'lib.dom.d.ts' // no DOM
         ]
     },
+    // Electron (sandbox)
+    {
+        target: '**/vs/**/electron-sandbox/**',
+        allowedTypes: CORE_TYPES,
+        disallowedDefinitions: [
+            '@types/node' // no node.js
+        ]
+    },
     // Electron (renderer): skip
     {
         target: '**/{vs,sql}/**/electron-browser/**',

build/lib/layersChecker.ts

@@ -143,6 +143,15 @@ const RULES = [
 		]
 	},
 
+	// Electron (sandbox)
+	{
+		target: '**/vs/**/electron-sandbox/**',
+		allowedTypes: CORE_TYPES,
+		disallowedDefinitions: [
+			'@types/node'	// no node.js
+		]
+	},
+
 	// Electron (renderer): skip
 	{
 		target: '**/{vs,sql}/**/electron-browser/**',

build/lib/optimize.js

@@ -28,14 +28,15 @@ const REPO_ROOT_PATH = path.join(__dirname, '../..');
 function log(prefix, message) {
     fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
 }
-function loaderConfig(emptyPaths) {
+function loaderConfig() {
     const result = {
         paths: {
             'vs': 'out-build/vs',
             'sql': 'out-build/sql',
-            'vscode': 'empty:'
+            'vscode': 'empty:',
+            'azdata': 'empty:' // {{SQL CARBON EDIT}}
         },
-        nodeModules: emptyPaths || []
+        amdModulesPattern: /^(vs|sql)\// // {{SQL CARBON EDIT}} include sql in regex
     };
     result['vs/css'] = { inlineResources: true };
     return result;
@@ -71,7 +72,7 @@ function loader(src, bundledFileHeader, bundleLoader) {
     }))
         .pipe(concat('vs/loader.js')));
 }
-function toConcatStream(src, bundledFileHeader, sources, dest) {
+function toConcatStream(src, bundledFileHeader, sources, dest, fileContentMapper) {
     const useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
     // If a bundle ends up including in any of the sources our copyright, then
     // insert a fake source at the beginning of each bundle with our copyright
@@ -92,10 +93,12 @@ function toConcatStream(src, bundledFileHeader, sources, dest) {
     const treatedSources = sources.map(function (source) {
         const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
         const base = source.path ? root + `/${src}` : '';
+        const path = source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake';
+        const contents = source.path ? fileContentMapper(source.contents, path) : source.contents;
         return new VinylFile({
-            path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
+            path: path,
             base: base,
-            contents: Buffer.from(source.contents)
+            contents: Buffer.from(contents)
         });
     });
     return es.readArray(treatedSources)
@@ -103,9 +106,9 @@ function toConcatStream(src, bundledFileHeader, sources, dest) {
         .pipe(concat(dest))
         .pipe(stats_1.createStatsStream(dest));
 }
-function toBundleStream(src, bundledFileHeader, bundles) {
+function toBundleStream(src, bundledFileHeader, bundles, fileContentMapper) {
     return es.merge(bundles.map(function (bundle) {
-        return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest);
+        return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest, fileContentMapper);
     }));
 }
 const DEFAULT_FILE_HEADER = [
@@ -121,6 +124,7 @@ function optimizeTask(opts) {
     const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER;
     const bundleLoader = (typeof opts.bundleLoader === 'undefined' ? true : opts.bundleLoader);
     const out = opts.out;
+    const fileContentMapper = opts.fileContentMapper || ((contents, _path) => contents);
     return function () {
         const bundlesStream = es.through(); // this stream will contain the bundled files
         const resourcesStream = es.through(); // this stream will contain the resources
@@ -129,7 +133,7 @@ function optimizeTask(opts) {
             if (err || !result) {
                 return bundlesStream.emit('error', JSON.stringify(err));
             }
-            toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
+            toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream);
             // Remove css inlined resources
             const filteredResources = resources.slice();
             result.cssInlinedResources.forEach(function (resource) {

build/lib/optimize.ts

@@ -18,7 +18,6 @@ import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 import * as path from 'path';
 import * as pump from 'pump';
-import * as sm from 'source-map';
 import * as terser from 'terser';
 import * as VinylFile from 'vinyl';
 import * as bundle from './bundle';
@@ -32,14 +31,15 @@ function log(prefix: string, message: string): void {
 	fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
 }
 
-export function loaderConfig(emptyPaths?: string[]) {
+export function loaderConfig() {
 	const result: any = {
 		paths: {
 			'vs': 'out-build/vs',
 			'sql': 'out-build/sql', // {{SQL CARBON EDIT}}
-			'vscode': 'empty:'
+			'vscode': 'empty:',
+			'azdata': 'empty:' // {{SQL CARBON EDIT}}
 		},
-		nodeModules: emptyPaths || []
+		amdModulesPattern: /^(vs|sql)\// // {{SQL CARBON EDIT}} include sql in regex
 	};
 
 	result['vs/css'] = { inlineResources: true };
@@ -49,10 +49,6 @@ export function loaderConfig(emptyPaths?: string[]) {
 
 const IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
 
-declare class FileSourceMap extends VinylFile {
-	public sourceMap: sm.RawSourceMap;
-}
-
 function loader(src: string, bundledFileHeader: string, bundleLoader: boolean): NodeJS.ReadWriteStream {
 	let sources = [
 		`${src}/vs/loader.js`
@@ -85,7 +81,7 @@ function loader(src: string, bundledFileHeader: string, bundleLoader: boolean):
 	);
 }
 
-function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.IFile[], dest: string): NodeJS.ReadWriteStream {
+function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.IFile[], dest: string, fileContentMapper: (contents: string, path: string) => string): NodeJS.ReadWriteStream {
 	const useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
 
 	// If a bundle ends up including in any of the sources our copyright, then
@@ -109,11 +105,13 @@ function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.
 	const treatedSources = sources.map(function (source) {
 		const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
 		const base = source.path ? root + `/${src}` : '';
+		const path = source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake';
+		const contents = source.path ? fileContentMapper(source.contents, path) : source.contents;
 
 		return new VinylFile({
-			path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
+			path: path,
 			base: base,
-			contents: Buffer.from(source.contents)
+			contents: Buffer.from(contents)
 		});
 	});
 
@@ -123,9 +121,9 @@ function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.
 		.pipe(createStatsStream(dest));
 }
 
-function toBundleStream(src: string, bundledFileHeader: string, bundles: bundle.IConcatFile[]): NodeJS.ReadWriteStream {
+function toBundleStream(src: string, bundledFileHeader: string, bundles: bundle.IConcatFile[], fileContentMapper: (contents: string, path: string) => string): NodeJS.ReadWriteStream {
 	return es.merge(bundles.map(function (bundle) {
-		return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest);
+		return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest, fileContentMapper);
 	}));
 }
 
@@ -163,6 +161,12 @@ export interface IOptimizeTaskOpts {
 	 * (out folder name)
 	 */
 	languages?: Language[];
+	/**
+	 * File contents interceptor
+	 * @param contents The contens of the file
+	 * @param path The absolute file path, always using `/`, even on Windows
+	 */
+	fileContentMapper?: (contents: string, path: string) => string;
 }
 
 const DEFAULT_FILE_HEADER = [
@@ -179,6 +183,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 	const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER;
 	const bundleLoader = (typeof opts.bundleLoader === 'undefined' ? true : opts.bundleLoader);
 	const out = opts.out;
+	const fileContentMapper = opts.fileContentMapper || ((contents: string, _path: string) => contents);
 
 	return function () {
 		const bundlesStream = es.through(); // this stream will contain the bundled files
@@ -188,7 +193,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 		bundle.bundle(entryPoints, loaderConfig, function (err, result) {
 			if (err || !result) { return bundlesStream.emit('error', JSON.stringify(err)); }
 
-			toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
+			toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream);
 
 			// Remove css inlined resources
 			const filteredResources = resources.slice();

build/lib/preLaunch.js

@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-check
+const path = require("path");
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const yarn = process.platform === 'win32' ? 'yarn.cmd' : 'yarn';
+const rootDir = path.resolve(__dirname, '..', '..');
+function runProcess(command, args = []) {
+    return new Promise((resolve, reject) => {
+        const child = child_process_1.spawn(command, args, { cwd: rootDir, stdio: 'inherit', env: process.env });
+        child.on('exit', err => !err ? resolve() : process.exit(err !== null && err !== void 0 ? err : 1));
+        child.on('error', reject);
+    });
+}
+async function exists(subdir) {
+    try {
+        await fs_1.promises.stat(path.join(rootDir, subdir));
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+}
+async function ensureNodeModules() {
+    if (!(await exists('node_modules'))) {
+        await runProcess(yarn);
+    }
+}
+async function getElectron() {
+    await runProcess(yarn, ['electron']);
+}
+async function ensureCompiled() {
+    if (!(await exists('out'))) {
+        await runProcess(yarn, ['compile']);
+    }
+}
+async function main() {
+    await ensureNodeModules();
+    await getElectron();
+    await ensureCompiled();
+    // Can't require this until after dependencies are installed
+    const { getBuiltInExtensions } = require('./builtInExtensions');
+    await getBuiltInExtensions();
+}
+if (require.main === module) {
+    main().catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}

build/lib/preLaunch.ts

@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+// @ts-check
+
+import * as path from 'path';
+import { spawn } from 'child_process';
+import { promises as fs } from 'fs';
+
+const yarn = process.platform === 'win32' ? 'yarn.cmd' : 'yarn';
+const rootDir = path.resolve(__dirname, '..', '..');
+
+function runProcess(command: string, args: ReadonlyArray<string> = []) {
+	return new Promise((resolve, reject) => {
+		const child = spawn(command, args, { cwd: rootDir, stdio: 'inherit', env: process.env });
+		child.on('exit', err => !err ? resolve() : process.exit(err ?? 1));
+		child.on('error', reject);
+	});
+}
+
+async function exists(subdir: string) {
+	try {
+		await fs.stat(path.join(rootDir, subdir));
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+async function ensureNodeModules() {
+	if (!(await exists('node_modules'))) {
+		await runProcess(yarn);
+	}
+}
+
+async function getElectron() {
+	await runProcess(yarn, ['electron']);
+}
+
+async function ensureCompiled() {
+	if (!(await exists('out'))) {
+		await runProcess(yarn, ['compile']);
+	}
+}
+
+async function main() {
+	await ensureNodeModules();
+	await getElectron();
+	await ensureCompiled();
+
+	// Can't require this until after dependencies are installed
+	const { getBuiltInExtensions } = require('./builtInExtensions');
+	await getBuiltInExtensions();
+}
+
+if (require.main === module) {
+	main().catch(err => {
+		console.error(err);
+		process.exit(1);
+	});
+}

build/lib/treeshaking.js

@@ -420,7 +420,7 @@ function markNodes(languageService, options) {
                         // (they can be the declaration of a module import)
                         continue;
                     }
-                    if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
+                    if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(program, checker, declaration)) {
                         enqueue_black(declaration.name);
                         for (let j = 0; j < declaration.members.length; j++) {
                             const member = declaration.members[j];
@@ -614,6 +614,34 @@ function generateResult(languageService, shakeLevel) {
 }
 //#endregion
 //#region Utils
+function isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(program, checker, declaration) {
+    if (!program.isSourceFileDefaultLibrary(declaration.getSourceFile()) && declaration.heritageClauses) {
+        for (const heritageClause of declaration.heritageClauses) {
+            for (const type of heritageClause.types) {
+                const symbol = findSymbolFromHeritageType(checker, type);
+                if (symbol) {
+                    const decl = symbol.valueDeclaration || (symbol.declarations && symbol.declarations[0]);
+                    if (decl && program.isSourceFileDefaultLibrary(decl.getSourceFile())) {
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}
+function findSymbolFromHeritageType(checker, type) {
+    if (ts.isExpressionWithTypeArguments(type)) {
+        return findSymbolFromHeritageType(checker, type.expression);
+    }
+    if (ts.isIdentifier(type)) {
+        return getRealNodeSymbol(checker, type)[0];
+    }
+    if (ts.isPropertyAccessExpression(type)) {
+        return findSymbolFromHeritageType(checker, type.name);
+    }
+    return null;
+}
 /**
  * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
  */

build/lib/treeshaking.ts

@@ -536,7 +536,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 						continue;
 					}
 
-					if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
+					if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(program, checker, declaration)) {
 						enqueue_black(declaration.name!);
 
 						for (let j = 0; j < declaration.members.length; j++) {
@@ -752,6 +752,36 @@ function generateResult(languageService: ts.LanguageService, shakeLevel: ShakeLe
 
 //#region Utils
 
+function isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(program: ts.Program, checker: ts.TypeChecker, declaration: ts.ClassDeclaration | ts.InterfaceDeclaration): boolean {
+	if (!program.isSourceFileDefaultLibrary(declaration.getSourceFile()) && declaration.heritageClauses) {
+		for (const heritageClause of declaration.heritageClauses) {
+			for (const type of heritageClause.types) {
+				const symbol = findSymbolFromHeritageType(checker, type);
+				if (symbol) {
+					const decl = symbol.valueDeclaration || (symbol.declarations && symbol.declarations[0]);
+					if (decl && program.isSourceFileDefaultLibrary(decl.getSourceFile())) {
+						return true;
+					}
+				}
+			}
+		}
+	}
+	return false;
+}
+
+function findSymbolFromHeritageType(checker: ts.TypeChecker, type: ts.ExpressionWithTypeArguments | ts.Expression | ts.PrivateIdentifier): ts.Symbol | null {
+	if (ts.isExpressionWithTypeArguments(type)) {
+		return findSymbolFromHeritageType(checker, type.expression);
+	}
+	if (ts.isIdentifier(type)) {
+		return getRealNodeSymbol(checker, type)[0];
+	}
+	if (ts.isPropertyAccessExpression(type)) {
+		return findSymbolFromHeritageType(checker, type.name);
+	}
+	return null;
+}
+
 /**
  * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
  */

build/lib/util.js

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamToPromise = exports.versionStringToNumber = exports.filter = exports.rebase = exports.getVersion = exports.ensureDir = exports.rreddir = exports.rimraf = exports.stripSourceMappingURL = exports.loadSourcemaps = exports.cleanNodeModules = exports.skipDirectories = exports.toFileUri = exports.setExecutableBit = exports.fixWin32DirectoryPermissions = exports.incremental = void 0;
+exports.getElectronVersion = exports.streamToPromise = exports.versionStringToNumber = exports.filter = exports.rebase = exports.getVersion = exports.ensureDir = exports.rreddir = exports.rimraf = exports.stripSourceMappingURL = exports.loadSourcemaps = exports.cleanNodeModules = exports.skipDirectories = exports.toFileUri = exports.setExecutableBit = exports.fixWin32DirectoryPermissions = exports.incremental = void 0;
 const es = require("event-stream");
 const debounce = require("debounce");
 const _filter = require("gulp-filter");
@@ -14,6 +14,7 @@ const fs = require("fs");
 const _rimraf = require("rimraf");
 const git = require("./git");
 const VinylFile = require("vinyl");
+const root = path.dirname(path.dirname(__dirname));
 const NoCancellationToken = { isCancellationRequested: () => false };
 function incremental(streamProvider, initial, supportsCancellation) {
     const input = es.through();
@@ -137,7 +138,7 @@ function loadSourcemaps() {
                 version: '3',
                 names: [],
                 mappings: '',
-                sources: [f.relative.replace(/\//g, '/')],
+                sources: [f.relative],
                 sourcesContent: [contents]
             };
             cb(undefined, f);
@@ -255,3 +256,9 @@ function streamToPromise(stream) {
     });
 }
 exports.streamToPromise = streamToPromise;
+function getElectronVersion() {
+    const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
+    const target = /^target "(.*)"$/m.exec(yarnrc)[1];
+    return target;
+}
+exports.getElectronVersion = getElectronVersion;

build/lib/util.ts

@@ -18,6 +18,8 @@ import * as VinylFile from 'vinyl';
 import { ThroughStream } from 'through';
 import * as sm from 'source-map';
 
+const root = path.dirname(path.dirname(__dirname));
+
 export interface ICancellationToken {
 	isCancellationRequested(): boolean;
 }
@@ -184,7 +186,7 @@ export function loadSourcemaps(): NodeJS.ReadWriteStream {
 					version: '3',
 					names: [],
 					mappings: '',
-					sources: [f.relative.replace(/\//g, '/')],
+					sources: [f.relative],
 					sourcesContent: [contents]
 				};
 
@@ -318,3 +320,9 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
 		stream.on('end', () => c());
 	});
 }
+
+export function getElectronVersion(): string {
+	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
+	const target = /^target "(.*)"$/m.exec(yarnrc)![1];
+	return target;
+}

build/npm/postinstall.js

@@ -33,9 +33,10 @@ function yarnInstall(location, opts) {
 
 yarnInstall('extensions'); // node modules shared by all extensions
 
-yarnInstall('remote'); // node modules used by vscode server
-
-yarnInstall('remote/web'); // node modules used by vscode web
+if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) {
+	yarnInstall('remote'); // node modules used by vscode server
+	yarnInstall('remote/web'); // node modules used by vscode web
+}
 
 const allExtensionFolders = fs.readdirSync('extensions');
 const extensions = allExtensionFolders.filter(e => {
@@ -72,3 +73,5 @@ yarnInstall('test/automation'); // node modules required for smoketest
 yarnInstall('test/smoke'); // node modules required for smoketest
 yarnInstall('test/integration/browser'); // node modules required for integration
 yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
+
+cp.execSync('git config pull.rebase true');

build/package.json

@@ -35,11 +35,13 @@
     "applicationinsights": "1.0.8",
     "azure-storage": "^2.1.0",
     "documentdb": "1.13.0",
+    "electron-osx-sign": "^0.4.16",
     "github-releases": "^0.4.1",
     "gulp-bom": "^1.0.0",
     "gulp-sourcemaps": "^1.11.0",
     "gulp-uglify": "^3.0.0",
-    "iconv-lite": "0.4.23",
+    "iconv-lite-umd": "0.6.8",
+    "jsonc-parser": "^2.3.0",
     "mime": "^1.3.4",
     "minimatch": "3.0.4",
     "minimist": "^1.2.3",
@@ -48,9 +50,9 @@
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "terser": "4.3.8",
-    "typescript": "^3.9.1-rc",
+    "typescript": "^4.0.0-dev.20200803",
     "vsce": "1.48.0",
-    "vscode-telemetry-extractor": "^1.5.4",
+    "vscode-telemetry-extractor": "^1.6.0",
     "xml2js": "^0.4.17"
   },
   "scripts": {

build/polyfills/vscode-extension-telemetry.js

@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+
+let TelemetryReporter = (function () {
+	function TelemetryReporter(extensionId, extensionVersion, key) {
+	}
+	TelemetryReporter.prototype.updateUserOptIn = function (key) {
+	};
+	TelemetryReporter.prototype.createAppInsightsClient = function (key) {
+	};
+	TelemetryReporter.prototype.getCommonProperties = function () {
+	};
+	TelemetryReporter.prototype.sendTelemetryEvent = function (eventName, properties, measurements) {
+	};
+	TelemetryReporter.prototype.dispose = function () {
+	};
+	TelemetryReporter.TELEMETRY_CONFIG_ID = 'telemetry';
+	TelemetryReporter.TELEMETRY_CONFIG_ENABLED_ID = 'enableTelemetry';
+	return TelemetryReporter;
+}());
+exports.default = TelemetryReporter;

build/polyfills/vscode-nls.js

@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+
+function format(message, args) {
+	let result;
+	// if (isPseudo) {
+	// 	// FF3B and FF3D is the Unicode zenkaku representation for [ and ]
+	// 	message = '\uFF3B' + message.replace(/[aouei]/g, '$&$&') + '\uFF3D';
+	// }
+	if (args.length === 0) {
+		result = message;
+	}
+	else {
+		result = message.replace(/\{(\d+)\}/g, function (match, rest) {
+			let index = rest[0];
+			let arg = args[index];
+			let replacement = match;
+			if (typeof arg === 'string') {
+				replacement = arg;
+			}
+			else if (typeof arg === 'number' || typeof arg === 'boolean' || arg === void 0 || arg === null) {
+				replacement = String(arg);
+			}
+			return replacement;
+		});
+	}
+	return result;
+}
+
+function localize(key, message) {
+	let args = [];
+	for (let _i = 2; _i < arguments.length; _i++) {
+		args[_i - 2] = arguments[_i];
+	}
+	return format(message, args);
+}
+
+function loadMessageBundle(file) {
+	return localize;
+}
+
+let MessageFormat;
+(function (MessageFormat) {
+	MessageFormat["file"] = "file";
+	MessageFormat["bundle"] = "bundle";
+	MessageFormat["both"] = "both";
+})(MessageFormat = exports.MessageFormat || (exports.MessageFormat = {}));
+let BundleFormat;
+(function (BundleFormat) {
+	// the nls.bundle format
+	BundleFormat["standalone"] = "standalone";
+	BundleFormat["languagePack"] = "languagePack";
+})(BundleFormat = exports.BundleFormat || (exports.BundleFormat = {}));
+
+exports.loadMessageBundle = loadMessageBundle;
+function config(opts) {
+	if (opts) {
+		if (isString(opts.locale)) {
+			options.locale = opts.locale.toLowerCase();
+			options.language = options.locale;
+			resolvedLanguage = undefined;
+			resolvedBundles = Object.create(null);
+		}
+		if (opts.messageFormat !== undefined) {
+			options.messageFormat = opts.messageFormat;
+		}
+		if (opts.bundleFormat === BundleFormat.standalone && options.languagePackSupport === true) {
+			options.languagePackSupport = false;
+		}
+	}
+	isPseudo = options.locale === 'pseudo';
+	return loadMessageBundle;
+}
+exports.config = config;

build/tsconfig.json

@@ -14,7 +14,8 @@
 		"checkJs": true,
 		"strict": true,
 		"noUnusedLocals": true,
-		"noUnusedParameters": true
+		"noUnusedParameters": true,
+		"newLine": "lf"
 	},
 	"include": [
 		"**/*.ts"

build/win32/code.iss

@@ -1,7 +1,8 @@
+#define RootLicenseFileName FileExists(RepoDir + '\LICENSE.rtf') ? 'LICENSE.rtf' : 'LICENSE.txt'
 #define LocalizedLanguageFile(Language = "") \
     DirExists(RepoDir + "\licenses") && Language != "" \
       ? ('; LicenseFile: "' + RepoDir + '\licenses\LICENSE-' + Language + '.txt"') \
-      : '; LicenseFile: "' + RepoDir + '\LICENSE.txt"'
+      : '; LicenseFile: "' + RepoDir + '\' + RootLicenseFileName + '"'
 
 [Setup]
 AppId={#AppId}
@@ -33,6 +34,7 @@ VersionInfoVersion={#RawVersion}
 ShowLanguageDialog=auto
 ArchitecturesAllowed={#ArchitecturesAllowed}
 ArchitecturesInstallIn64BitMode={#ArchitecturesInstallIn64BitMode}
+WizardStyle=modern
 
 #ifdef Sign
 SignTool=esrp
@@ -46,7 +48,7 @@ DefaultDirName={pf}\{#DirName}
 #endif
 
 [Languages]
-Name: "english"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.isl,{#RepoDir}\build\win32\i18n\messages.en.isl" {#LocalizedLanguageFile}
+Name: "english"; MessagesFile: "compiler:Default.isl,{#RepoDir}\build\win32\i18n\messages.en.isl" {#LocalizedLanguageFile}
 Name: "german"; MessagesFile: "compiler:Languages\German.isl,{#RepoDir}\build\win32\i18n\messages.de.isl" {#LocalizedLanguageFile("deu")}
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl,{#RepoDir}\build\win32\i18n\messages.es.isl" {#LocalizedLanguageFile("esp")}
 Name: "french"; MessagesFile: "compiler:Languages\French.isl,{#RepoDir}\build\win32\i18n\messages.fr.isl" {#LocalizedLanguageFile("fra")}
@@ -56,6 +58,9 @@ Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl,{#RepoDir}\build\
 Name: "korean"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.ko.isl,{#RepoDir}\build\win32\i18n\messages.ko.isl" {#LocalizedLanguageFile("kor")}
 Name: "simplifiedChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh-cn.isl,{#RepoDir}\build\win32\i18n\messages.zh-cn.isl" {#LocalizedLanguageFile("chs")}
 Name: "traditionalChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh-tw.isl,{#RepoDir}\build\win32\i18n\messages.zh-tw.isl" {#LocalizedLanguageFile("cht")}
+Name: "brazilianPortuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl,{#RepoDir}\build\win32\i18n\messages.pt-br.isl" {#LocalizedLanguageFile("ptb")}
+Name: "hungarian"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.hu.isl,{#RepoDir}\build\win32\i18n\messages.hu.isl" {#LocalizedLanguageFile("hun")}
+Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl,{#RepoDir}\build\win32\i18n\messages.tr.isl" {#LocalizedLanguageFile("trk")}
 
 [InstallDelete]
 Type: filesandordirs; Name: "{app}\resources\app\out"; Check: IsNotUpdate
@@ -143,7 +148,7 @@ begin
   Result := True;
 
   #if "user" == InstallTarget
-    if not WizardSilent() and IsAdminLoggedOn() then begin
+    if not WizardSilent() and IsAdmin() then begin
       if MsgBox('This User Installer is not meant to be run as an Administrator. If you would like to install Azure Data Studio for all users in this system, download the System Installer instead from https://docs.microsoft.com/sql/azure-data-studio/download. Are you sure you want to continue?', mbError, MB_OKCANCEL) = IDCANCEL then begin
         Result := False;
       end;
@@ -151,7 +156,7 @@ begin
   #endif
 
   #if "user" == InstallTarget
-    #if "ia32" == Arch
+    #if "ia32" == Arch || "arm64" == Arch
       #define IncompatibleArchRootKey "HKLM32"
     #else
       #define IncompatibleArchRootKey "HKLM64"
@@ -261,7 +266,7 @@ begin
   end;
 end;
 
-// http://stackoverflow.com/a/23838239/261019
+// https://stackoverflow.com/a/23838239/261019
 procedure Explode(var Dest: TArrayOfString; Text: String; Separator: String);
 var
   i, p: Integer;

build/win32/i18n/Default.hu.isl

@@ -0,0 +1,366 @@
+;Inno Setup version 6.0.3+ Hungarian messages
+;Based on the translation of Kornél Pál, kornelpal@gmail.com
+;István Szabó, E-mail: istvanszabo890629@gmail.com
+;
+; To download user-contributed translations of this file, go to:
+;   http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and 
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Magyar
+LanguageID=$040E
+LanguageCodePage=1250
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial CE
+;TitleFontSize=29
+;CopyrightFontName=Arial CE
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Telepítő
+SetupWindowTitle=%1 - Telepítő
+UninstallAppTitle=Eltávolító
+UninstallAppFullTitle=%1 Eltávolító
+
+; *** Misc. common
+InformationTitle=Információk
+ConfirmTitle=Megerősít
+ErrorTitle=Hiba
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=%1 telepítve lesz. Szeretné folytatni?
+LdrCannotCreateTemp=Átmeneti fájl létrehozása nem lehetséges. A telepítés megszakítva
+LdrCannotExecTemp=Fájl futtatása nem lehetséges az átmeneti könyvtárban. A telepítés megszakítva
+HelpTextNote=
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nHiba %2: %3
+SetupFileMissing=A(z) %1 fájl hiányzik a telepítő könyvtárából. Kérem hárítsa el a problémát, vagy szerezzen be egy másik példányt a programból!
+SetupFileCorrupt=A telepítési fájlok sérültek. Kérem, szerezzen be új másolatot a programból!
+SetupFileCorruptOrWrongVer=A telepítési fájlok sérültek, vagy inkompatibilisek a telepítő ezen verziójával. Hárítsa el a problémát, vagy szerezzen be egy másik példányt a programból!
+InvalidParameter=A parancssorba átadott paraméter érvénytelen:%n%n%1
+SetupAlreadyRunning=A Telepítő már fut.
+WindowsVersionNotSupported=A program nem támogatja a Windows ezen verzióját.
+WindowsServicePackRequired=A program futtatásához %1 Service Pack %2 vagy újabb szükséges.
+NotOnThisPlatform=Ez a program nem futtatható %1 alatt.
+OnlyOnThisPlatform=Ezt a programot %1 alatt kell futtatni.
+OnlyOnTheseArchitectures=A program kizárólag a következő processzor architektúrákhoz tervezett Windows-on telepíthető:%n%n%1
+WinVersionTooLowError=A program futtatásához %1 %2 verziója vagy későbbi szükséges.
+WinVersionTooHighError=Ez a program nem telepíthető %1 %2 vagy későbbire.
+AdminPrivilegesRequired=Csak rendszergazdai módban telepíthető ez a program.
+PowerUserPrivilegesRequired=Csak rendszergazdaként vagy kiemelt felhasználóként telepíthető ez a program.
+SetupAppRunningError=A telepítő úgy észlelte %1 jelenleg fut.%n%nZárja be az összes példányt, majd kattintson az 'OK'-ra a folytatáshoz, vagy a 'Mégse'-re a kilépéshez.
+UninstallAppRunningError=Az eltávolító úgy észlelte %1 jelenleg fut.%n%nZárja be az összes példányt, majd kattintson az 'OK'-ra a folytatáshoz, vagy a 'Mégse'-re a kilépéshez.
+
+; *** Startup questions
+PrivilegesRequiredOverrideTitle=Telepítési mód kiválasztása
+PrivilegesRequiredOverrideInstruction=Válasszon telepítési módot
+PrivilegesRequiredOverrideText1=%1 telepíthető az összes felhasználónak (rendszergazdai jogok szükségesek), vagy csak magának.
+PrivilegesRequiredOverrideText2=%1 csak magának telepíthető, vagy az összes felhasználónak (rendszergazdai jogok szükségesek).
+PrivilegesRequiredOverrideAllUsers=Telepítés &mindenkinek
+PrivilegesRequiredOverrideAllUsersRecommended=Telepítés &mindenkinek (ajánlott)
+PrivilegesRequiredOverrideCurrentUser=Telepítés csak &nekem
+PrivilegesRequiredOverrideCurrentUserRecommended=Telepítés csak &nekem (ajánlott)
+
+; *** Misc. errors
+ErrorCreatingDir=A Telepítő nem tudta létrehozni a(z) "%1" könyvtárat
+ErrorTooManyFilesInDir=Nem hozható létre fájl a(z) "%1" könyvtárban, mert az már túl sok fájlt tartalmaz
+
+; *** Setup common messages
+ExitSetupTitle=Kilépés a telepítőből
+ExitSetupMessage=A telepítés még folyamatban van. Ha most kilép, a program nem kerül telepítésre.%n%nMásik alkalommal is futtatható a telepítés befejezéséhez%n%nKilép a telepítőből?
+AboutSetupMenuItem=&Névjegy...
+AboutSetupTitle=Telepítő névjegye
+AboutSetupMessage=%1 %2 verzió%n%3%n%nAz %1 honlapja:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Vissza
+ButtonNext=&Tovább >
+ButtonInstall=&Telepít
+ButtonOK=OK
+ButtonCancel=Mégse
+ButtonYes=&Igen
+ButtonYesToAll=&Mindet
+ButtonNo=&Nem
+ButtonNoToAll=&Egyiket se
+ButtonFinish=&Befejezés
+ButtonBrowse=&Tallózás...
+ButtonWizardBrowse=T&allózás...
+ButtonNewFolder=Új &könyvtár
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Telepítő nyelvi beállítás
+SelectLanguageLabel=Válassza ki a telepítés alatt használt nyelvet.
+
+; *** Common wizard text
+ClickNext=A folytatáshoz kattintson a 'Tovább'-ra, a kilépéshez a 'Mégse'-re.
+BeveledLabel=
+BrowseDialogTitle=Válasszon könyvtárt 
+BrowseDialogLabel=Válasszon egy könyvtárat az alábbi listából, majd kattintson az 'OK'-ra.
+NewFolderName=Új könyvtár
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Üdvözli a(z) [name] Telepítővarázslója.
+WelcomeLabel2=A(z) [name/ver] telepítésre kerül a számítógépén.%n%nAjánlott minden, egyéb futó alkalmazás bezárása a folytatás előtt.
+
+; *** "Password" wizard page
+WizardPassword=Jelszó
+PasswordLabel1=Ez a telepítés jelszóval védett.
+PasswordLabel3=Kérem adja meg a jelszót, majd kattintson a 'Tovább'-ra. A jelszavak kis- és nagy betű érzékenyek lehetnek.
+PasswordEditLabel=&Jelszó:
+IncorrectPassword=Az ön által megadott jelszó helytelen. Próbálja újra.
+
+; *** "License Agreement" wizard page
+WizardLicense=Licencszerződés
+LicenseLabel=Olvassa el figyelmesen az információkat folytatás előtt.
+LicenseLabel3=Kérem, olvassa el az alábbi licencszerződést. A telepítés folytatásához, el kell fogadnia a szerződést.
+LicenseAccepted=&Elfogadom a szerződést
+LicenseNotAccepted=&Nem fogadom el a szerződést
+
+; *** "Information" wizard pages
+WizardInfoBefore=Információk
+InfoBeforeLabel=Olvassa el a következő fontos információkat a folytatás előtt.
+InfoBeforeClickLabel=Ha készen áll, kattintson a 'Tovább'-ra.
+WizardInfoAfter=Információk
+InfoAfterLabel=Olvassa el a következő fontos információkat a folytatás előtt.
+InfoAfterClickLabel=Ha készen áll, kattintson a 'Tovább'-ra.
+
+; *** "User Information" wizard page
+WizardUserInfo=Felhasználó adatai
+UserInfoDesc=Kérem, adja meg az adatait
+UserInfoName=&Felhasználónév:
+UserInfoOrg=&Szervezet:
+UserInfoSerial=&Sorozatszám:
+UserInfoNameRequired=Meg kell adnia egy nevet.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Válasszon célkönyvtárat
+SelectDirDesc=Hova települjön a(z) [name]?
+SelectDirLabel3=A(z) [name] az alábbi könyvtárba lesz telepítve. 
+SelectDirBrowseLabel=A folytatáshoz, kattintson a 'Tovább'-ra. Ha másik könyvtárat választana, kattintson a 'Tallózás'-ra.
+DiskSpaceGBLabel=At least [gb] GB szabad területre van szükség.
+DiskSpaceMBLabel=Legalább [mb] MB szabad területre van szükség.
+CannotInstallToNetworkDrive=A Telepítő nem tud hálózati meghajtóra telepíteni.
+CannotInstallToUNCPath=A Telepítő nem tud hálózati UNC elérési útra telepíteni.
+InvalidPath=Teljes útvonalat adjon meg, a meghajtó betűjelével; például:%n%nC:\Alkalmazás%n%nvagy egy hálózati útvonalat a következő alakban:%n%n\\kiszolgáló\megosztás
+InvalidDrive=A kiválasztott meghajtó vagy hálózati megosztás nem létezik vagy nem elérhető. Válasszon egy másikat.
+DiskSpaceWarningTitle=Nincs elég szabad terület
+DiskSpaceWarning=A Telepítőnek legalább %1 KB szabad lemezterületre van szüksége, viszont a kiválasztott meghajtón csupán %2 KB áll rendelkezésre.%n%nMindenképpen folytatja?
+DirNameTooLong=A könyvtár neve vagy az útvonal túl hosszú.
+InvalidDirName=A könyvtár neve érvénytelen.
+BadDirName32=A könyvtárak nevei ezen karakterek egyikét sem tartalmazhatják:%n%n%1
+DirExistsTitle=A könyvtár már létezik
+DirExists=A könyvtár:%n%n%1%n%nmár létezik. Mindenképp ide akar telepíteni?
+DirDoesntExistTitle=A könyvtár nem létezik
+DirDoesntExist=A könyvtár:%n%n%1%n%nnem létezik. Szeretné létrehozni?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Összetevők kiválasztása
+SelectComponentsDesc=Mely összetevők kerüljenek telepítésre?
+SelectComponentsLabel2=Jelölje ki a telepítendő összetevőket; törölje a telepíteni nem kívánt összetevőket. Kattintson a 'Tovább'-ra, ha készen áll a folytatásra.
+FullInstallation=Teljes telepítés
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Szokásos telepítés
+CustomInstallation=Egyéni telepítés
+NoUninstallWarningTitle=Létező összetevő
+NoUninstallWarning=A telepítő úgy találta, hogy a következő összetevők már telepítve vannak a számítógépre:%n%n%1%n%nEzen összetevők kijelölésének törlése, nem távolítja el azokat a számítógépről.%n%nMindenképpen folytatja?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=A jelenlegi kijelölés legalább [gb] GB lemezterületet igényel.
+ComponentsDiskSpaceMBLabel=A jelenlegi kijelölés legalább [mb] MB lemezterületet igényel.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=További feladatok
+SelectTasksDesc=Mely kiegészítő feladatok kerüljenek végrehajtásra?
+SelectTasksLabel2=Jelölje ki, mely kiegészítő feladatokat hajtsa végre a Telepítő a(z) [name] telepítése során, majd kattintson a 'Tovább'-ra.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Start Menü könyvtára
+SelectStartMenuFolderDesc=Hova helyezze a Telepítő a program parancsikonjait?
+SelectStartMenuFolderLabel3=A Telepítő a program parancsikonjait a Start menü következő mappájában fogja létrehozni.
+SelectStartMenuFolderBrowseLabel=A folytatáshoz kattintson a 'Tovább'-ra. Ha másik mappát választana, kattintson a 'Tallózás'-ra.
+MustEnterGroupName=Meg kell adnia egy mappanevet.
+GroupNameTooLong=A könyvtár neve vagy az útvonal túl hosszú.
+InvalidGroupName=A könyvtár neve érvénytelen.
+BadGroupName=A könyvtárak nevei ezen karakterek egyikét sem tartalmazhatják:%n%n%1
+NoProgramGroupCheck2=&Ne hozzon létre mappát a Start menüben
+
+; *** "Ready to Install" wizard page
+WizardReady=Készen állunk a telepítésre
+ReadyLabel1=A Telepítő készen áll, a(z) [name] számítógépre telepítéshez.
+ReadyLabel2a=Kattintson a 'Telepítés'-re a folytatáshoz, vagy a "Vissza"-ra a beállítások áttekintéséhez vagy megváltoztatásához.
+ReadyLabel2b=Kattintson a 'Telepítés'-re a folytatáshoz.
+ReadyMemoUserInfo=Felhasználó adatai:
+ReadyMemoDir=Telepítés célkönyvtára:
+ReadyMemoType=Telepítés típusa:
+ReadyMemoComponents=Választott összetevők:
+ReadyMemoGroup=Start menü mappája:
+ReadyMemoTasks=Kiegészítő feladatok:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Felkészülés a telepítésre
+PreparingDesc=A Telepítő felkészül a(z) [name] számítógépre történő telepítéshez.
+PreviousInstallNotCompleted=gy korábbi program telepítése/eltávolítása nem fejeződött be. Újra kell indítania a számítógépét a másik telepítés befejezéséhez.%n%nA számítógépe újraindítása után ismét futtassa a Telepítőt a(z) [name] telepítésének befejezéséhez.
+CannotContinue=A telepítés nem folytatható. A kilépéshez kattintson a 'Mégse'-re
+ApplicationsFound=A következő alkalmazások olyan fájlokat használnak, amelyeket a Telepítőnek frissíteni kell. Ajánlott, hogy engedélyezze a Telepítőnek ezen alkalmazások automatikus bezárását.
+ApplicationsFound2=A következő alkalmazások olyan fájlokat használnak, amelyeket a Telepítőnek frissíteni kell. Ajánlott, hogy engedélyezze a Telepítőnek ezen alkalmazások automatikus bezárását. A telepítés befejezése után a Telepítő megkísérli az alkalmazások újraindítását.
+CloseApplications=&Alkalmazások automatikus bezárása
+DontCloseApplications=&Ne zárja be az alkalmazásokat
+ErrorCloseApplications=A Telepítő nem tudott minden alkalmazást automatikusan bezárni. A folytatás előtt ajánlott minden, a Telepítő által frissítendő fájlokat használó alkalmazást bezárni.
+PrepareToInstallNeedsRestart=A telepítőnek újra kell indítania a számítógépet. Újraindítást követően, futtassa újból a telepítőt, a [name] telepítésének befejezéséhez .%n%nÚjra szeretné indítani most a számítógépet?
+
+; *** "Installing" wizard page
+WizardInstalling=Telepítés
+InstallingLabel=Kérem várjon, amíg a(z) [name] telepítése zajlik.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=A(z) [name] telepítésének befejezése
+FinishedLabelNoIcons=A Telepítő végzett a(z) [name] telepítésével.
+FinishedLabel=A Telepítő végzett a(z) [name] telepítésével. Az alkalmazást a létrehozott ikonok kiválasztásával indíthatja.
+ClickFinish=Kattintson a 'Befejezés'-re a kilépéshez.
+FinishedRestartLabel=A(z) [name] telepítésének befejezéséhez újra kell indítani a számítógépet. Újraindítja most?
+FinishedRestartMessage=A(z) [name] telepítésének befejezéséhez, a Telepítőnek újra kell indítani a számítógépet.%n%nÚjraindítja most?
+ShowReadmeCheck=Igen, szeretném elolvasni a FONTOS fájlt
+YesRadio=&Igen, újraindítás most
+NoRadio=&Nem, később indítom újra
+; used for example as 'Run MyProg.exe'
+RunEntryExec=%1 futtatása
+; used for example as 'View Readme.txt'
+RunEntryShellExec=%1 megtekintése
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=A Telepítőnek szüksége van a következő lemezre
+SelectDiskLabel2=Helyezze be a(z) %1. lemezt és kattintson az 'OK'-ra.%n%nHa a fájlok a lemez egy a megjelenítettől különböző mappájában találhatók, írja be a helyes útvonalat vagy kattintson a 'Tallózás'-ra.
+PathLabel=Ú&tvonal:
+FileNotInDir2=A(z) "%1" fájl nem található a következő helyen: "%2". Helyezze be a megfelelő lemezt vagy válasszon egy másik mappát.
+SelectDirectoryLabel=Adja meg a következő lemez helyét.
+
+; *** Installation phase messages
+SetupAborted=A telepítés nem fejeződött be.%n%nHárítsa el a hibát és futtassa újból a Telepítőt.
+AbortRetryIgnoreSelectAction=Válasszon műveletet
+AbortRetryIgnoreRetry=&Újra
+AbortRetryIgnoreIgnore=&Hiba elvetése és folytatás
+AbortRetryIgnoreCancel=Telepítés megszakítása
+
+; *** Installation status messages
+StatusClosingApplications=Alkalmazások bezárása...
+StatusCreateDirs=Könyvtárak létrehozása...
+StatusExtractFiles=Fájlok kibontása...
+StatusCreateIcons=Parancsikonok létrehozása...
+StatusCreateIniEntries=INI bejegyzések létrehozása...
+StatusCreateRegistryEntries=Rendszerleíró bejegyzések létrehozása...
+StatusRegisterFiles=Fájlok regisztrálása...
+StatusSavingUninstall=Eltávolító információk mentése...
+StatusRunProgram=Telepítés befejezése...
+StatusRestartingApplications=Alkalmazások újraindítása...
+StatusRollback=Változtatások visszavonása...
+
+; *** Misc. errors
+ErrorInternal2=Belső hiba: %1
+ErrorFunctionFailedNoCode=Sikertelen %1
+ErrorFunctionFailed=Sikertelen %1; kód: %2
+ErrorFunctionFailedWithMessage=Sikertelen %1; kód: %2.%n%3
+ErrorExecutingProgram=Nem hajtható végre a fájl:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Nem nyitható meg a rendszerleíró kulcs:%n%1\%2
+ErrorRegCreateKey=Nem hozható létre a rendszerleíró kulcs:%n%1\%2
+ErrorRegWriteKey=Nem módosítható a rendszerleíró kulcs:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Bejegyzés létrehozása sikertelen a következő INI fájlban: "%1".
+
+; *** File copying errors
+FileAbortRetryIgnoreSkipNotRecommended=&Fájl kihagyása (nem ajánlott)
+FileAbortRetryIgnoreIgnoreNotRecommended=&Hiba elvetése és folytatás (nem ajánlott)
+SourceIsCorrupted=A forrásfájl megsérült
+SourceDoesntExist=A(z) "%1" forrásfájl nem létezik
+ExistingFileReadOnly2=A fájl csak olvashatóként van jelölve.
+ExistingFileReadOnlyRetry=Csak &olvasható tulajdonság eltávolítása és újra próbálkozás 
+ExistingFileReadOnlyKeepExisting=&Létező fájl megtartása
+ErrorReadingExistingDest=Hiba lépett fel a fájl olvasása közben:
+FileExists=A fájl már létezik.%n%nFelül kívánja írni?
+ExistingFileNewer=A létező fájl újabb a telepítésre kerülőnél. Ajánlott a létező fájl megtartása.%n%nMeg kívánja tartani a létező fájlt?
+ErrorChangingAttr=Hiba lépett fel a fájl attribútumának módosítása közben:
+ErrorCreatingTemp=Hiba lépett fel a fájl telepítési könyvtárban történő létrehozása közben:
+ErrorReadingSource=Hiba lépett fel a forrásfájl olvasása közben:
+ErrorCopying=Hiba lépett fel a fájl másolása közben:
+ErrorReplacingExistingFile=Hiba lépett fel a létező fájl cseréje közben:
+ErrorRestartReplace=A fájl cseréje az újraindítás után sikertelen volt:
+ErrorRenamingTemp=Hiba lépett fel fájl telepítési könyvtárban történő átnevezése közben:
+ErrorRegisterServer=Nem lehet regisztrálni a DLL-t/OCX-et: %1
+ErrorRegSvr32Failed=Sikertelen RegSvr32. A visszaadott kód: %1
+ErrorRegisterTypeLib=Nem lehet regisztrálni a típustárat: %1
+
+; *** Uninstall display name markings
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32-bit
+UninstallDisplayNameMark64Bit=64-bit
+UninstallDisplayNameMarkAllUsers=Minden felhasználó
+UninstallDisplayNameMarkCurrentUser=Jelenlegi felhasználó
+
+; *** Post-installation errors
+ErrorOpeningReadme=Hiba lépett fel a FONTOS fájl megnyitása közben.
+ErrorRestartingComputer=A Telepítő nem tudta újraindítani a számítógépet. Indítsa újra kézileg.
+
+; *** Uninstaller messages
+UninstallNotFound=A(z) "%1" fájl nem létezik. Nem távolítható el.
+UninstallOpenError=A(z) "%1" fájl nem nyitható meg. Nem távolítható el.
+UninstallUnsupportedVer=A(z) "%1" eltávolítási naplófájl formátumát nem tudja felismerni az eltávolító jelen verziója. Az eltávolítás nem folytatható
+UninstallUnknownEntry=Egy ismeretlen bejegyzés (%1) található az eltávolítási naplófájlban
+ConfirmUninstall=Biztosan el kívánja távolítani a(z) %1 programot és minden összetevőjét?
+UninstallOnlyOnWin64=Ezt a telepítést csak 64-bites Windowson lehet eltávolítani.
+OnlyAdminCanUninstall=Ezt a telepítést csak adminisztrációs jogokkal rendelkező felhasználó távolíthatja el.
+UninstallStatusLabel=Legyen türelemmel, amíg a(z) %1 számítógépéről történő eltávolítása befejeződik.
+UninstalledAll=A(z) %1 sikeresen el lett távolítva a számítógépről.
+UninstalledMost=A(z) %1 eltávolítása befejeződött.%n%nNéhány elemet nem lehetett eltávolítani. Törölje kézileg.
+UninstalledAndNeedsRestart=A(z) %1 eltávolításának befejezéséhez újra kell indítania a számítógépét.%n%nÚjraindítja most?
+UninstallDataCorrupted=A(z) "%1" fájl sérült. Nem távolítható el.
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Törli a megosztott fájlt?
+ConfirmDeleteSharedFile2=A rendszer azt jelzi, hogy a következő megosztott fájlra már nincs szüksége egyetlen programnak sem. Eltávolítja a megosztott fájlt?%n%nHa más programok még mindig használják a megosztott fájlt, akkor az eltávolítása után lehet, hogy nem fognak megfelelően működni. Ha bizonytalan, válassza a Nemet. A fájl megtartása nem okoz problémát a rendszerben.
+SharedFileNameLabel=Fájlnév:
+SharedFileLocationLabel=Helye:
+WizardUninstalling=Eltávolítás állapota
+StatusUninstalling=%1 eltávolítása...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=%1 telepítése.
+ShutdownBlockReasonUninstallingApp=%1 eltávolítása.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1, verzió: %2
+AdditionalIcons=További parancsikonok:
+CreateDesktopIcon=&Asztali ikon létrehozása
+CreateQuickLaunchIcon=&Gyorsindító parancsikon létrehozása
+ProgramOnTheWeb=%1 az interneten
+UninstallProgram=Eltávolítás - %1
+LaunchProgram=Indítás %1
+AssocFileExtension=A(z) %1 &társítása a(z) %2 fájlkiterjesztéssel
+AssocingFileExtension=A(z) %1 társítása a(z) %2 fájlkiterjesztéssel...
+AutoStartProgramGroupDescription=Indítópult:
+AutoStartProgram=%1 automatikus indítása
+AddonHostProgramNotFound=A(z) %1 nem található a kiválasztott könyvtárban.%n%nMindenképpen folytatja?

build/win32/i18n/Default.isl

@@ -1,336 +0,0 @@
-; *** Inno Setup version 5.5.3+ English messages ***
-;
-; To download user-contributed translations of this file, go to:
-;   http://www.jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=English
-LanguageID=$0409
-LanguageCodePage=0
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=
-;DialogFontSize=8
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=Setup
-SetupWindowTitle=Setup - %1
-UninstallAppTitle=Uninstall
-UninstallAppFullTitle=%1 Uninstall
-
-; *** Misc. common
-InformationTitle=Information
-ConfirmTitle=Confirm
-ErrorTitle=Error
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=This will install %1. Do you wish to continue?
-LdrCannotCreateTemp=Unable to create a temporary file. Setup aborted
-LdrCannotExecTemp=Unable to execute file in the temporary directory. Setup aborted
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nError %2: %3
-SetupFileMissing=The file %1 is missing from the installation directory. Please correct the problem or obtain a new copy of the program.
-SetupFileCorrupt=The setup files are corrupted. Please obtain a new copy of the program.
-SetupFileCorruptOrWrongVer=The setup files are corrupted, or are incompatible with this version of Setup. Please correct the problem or obtain a new copy of the program.
-InvalidParameter=An invalid parameter was passed on the command line:%n%n%1
-SetupAlreadyRunning=Setup is already running.
-WindowsVersionNotSupported=This program does not support the version of Windows your computer is running.
-WindowsServicePackRequired=This program requires %1 Service Pack %2 or later.
-NotOnThisPlatform=This program will not run on %1.
-OnlyOnThisPlatform=This program must be run on %1.
-OnlyOnTheseArchitectures=This program can only be installed on versions of Windows designed for the following processor architectures:%n%n%1
-MissingWOW64APIs=The version of Windows you are running does not include functionality required by Setup to perform a 64-bit installation. To correct this problem, please install Service Pack %1.
-WinVersionTooLowError=This program requires %1 version %2 or later.
-WinVersionTooHighError=This program cannot be installed on %1 version %2 or later.
-AdminPrivilegesRequired=You must be logged in as an administrator when installing this program.
-PowerUserPrivilegesRequired=You must be logged in as an administrator or as a member of the Power Users group when installing this program.
-SetupAppRunningError=Setup has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
-UninstallAppRunningError=Uninstall has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
-
-; *** Misc. errors
-ErrorCreatingDir=Setup was unable to create the directory "%1"
-ErrorTooManyFilesInDir=Unable to create a file in the directory "%1" because it contains too many files
-
-; *** Setup common messages
-ExitSetupTitle=Exit Setup
-ExitSetupMessage=Setup is not complete. If you exit now, the program will not be installed.%n%nYou may run Setup again at another time to complete the installation.%n%nExit Setup?
-AboutSetupMenuItem=&About Setup...
-AboutSetupTitle=About Setup
-AboutSetupMessage=%1 version %2%n%3%n%n%1 home page:%n%4
-AboutSetupNote=
-TranslatorNote=
-
-; *** Buttons
-ButtonBack=< &Back
-ButtonNext=&Next >
-ButtonInstall=&Install
-ButtonOK=OK
-ButtonCancel=Cancel
-ButtonYes=&Yes
-ButtonYesToAll=Yes to &All
-ButtonNo=&No
-ButtonNoToAll=N&o to All
-ButtonFinish=&Finish
-ButtonBrowse=&Browse...
-ButtonWizardBrowse=B&rowse...
-ButtonNewFolder=&Make New Folder
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Select Setup Language
-SelectLanguageLabel=Select the language to use during the installation:
-
-; *** Common wizard text
-ClickNext=Click Next to continue, or Cancel to exit Setup.
-BeveledLabel=
-BrowseDialogTitle=Browse For Folder
-BrowseDialogLabel=Select a folder in the list below, then click OK.
-NewFolderName=New Folder
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Welcome to the [name] Setup Wizard
-WelcomeLabel2=This will install [name/ver] on your computer.%n%nIt is recommended that you close all other applications before continuing.
-
-; *** "Password" wizard page
-WizardPassword=Password
-PasswordLabel1=This installation is password protected.
-PasswordLabel3=Please provide the password, then click Next to continue. Passwords are case-sensitive.
-PasswordEditLabel=&Password:
-IncorrectPassword=The password you entered is not correct. Please try again.
-
-; *** "License Agreement" wizard page
-WizardLicense=License Agreement
-LicenseLabel=Please read the following important information before continuing.
-LicenseLabel3=Please read the following License Agreement. You must accept the terms of this agreement before continuing with the installation.
-LicenseAccepted=I &accept the agreement
-LicenseNotAccepted=I &do not accept the agreement
-
-; *** "Information" wizard pages
-WizardInfoBefore=Information
-InfoBeforeLabel=Please read the following important information before continuing.
-InfoBeforeClickLabel=When you are ready to continue with Setup, click Next.
-WizardInfoAfter=Information
-InfoAfterLabel=Please read the following important information before continuing.
-InfoAfterClickLabel=When you are ready to continue with Setup, click Next.
-
-; *** "User Information" wizard page
-WizardUserInfo=User Information
-UserInfoDesc=Please enter your information.
-UserInfoName=&User Name:
-UserInfoOrg=&Organization:
-UserInfoSerial=&Serial Number:
-UserInfoNameRequired=You must enter a name.
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Select Destination Location
-SelectDirDesc=Where should [name] be installed?
-SelectDirLabel3=Setup will install [name] into the following folder.
-SelectDirBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
-DiskSpaceMBLabel=At least [mb] MB of free disk space is required.
-CannotInstallToNetworkDrive=Setup cannot install to a network drive.
-CannotInstallToUNCPath=Setup cannot install to a UNC path.
-InvalidPath=You must enter a full path with drive letter; for example:%n%nC:\APP%n%nor a UNC path in the form:%n%n\\server\share
-InvalidDrive=The drive or UNC share you selected does not exist or is not accessible. Please select another.
-DiskSpaceWarningTitle=Not Enough Disk Space
-DiskSpaceWarning=Setup requires at least %1 KB of free space to install, but the selected drive only has %2 KB available.%n%nDo you want to continue anyway?
-DirNameTooLong=The folder name or path is too long.
-InvalidDirName=The folder name is not valid.
-BadDirName32=Folder names cannot include any of the following characters:%n%n%1
-DirExistsTitle=Folder Exists
-DirExists=The folder:%n%n%1%n%nalready exists. Would you like to install to that folder anyway?
-DirDoesntExistTitle=Folder Does Not Exist
-DirDoesntExist=The folder:%n%n%1%n%ndoes not exist. Would you like the folder to be created?
-
-; *** "Select Components" wizard page
-WizardSelectComponents=Select Components
-SelectComponentsDesc=Which components should be installed?
-SelectComponentsLabel2=Select the components you want to install; clear the components you do not want to install. Click Next when you are ready to continue.
-FullInstallation=Full installation
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Compact installation
-CustomInstallation=Custom installation
-NoUninstallWarningTitle=Components Exist
-NoUninstallWarning=Setup has detected that the following components are already installed on your computer:%n%n%1%n%nDeselecting these components will not uninstall them.%n%nWould you like to continue anyway?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Current selection requires at least [mb] MB of disk space.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Select Additional Tasks
-SelectTasksDesc=Which additional tasks should be performed?
-SelectTasksLabel2=Select the additional tasks you would like Setup to perform while installing [name], then click Next.
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Select Start Menu Folder
-SelectStartMenuFolderDesc=Where should Setup place the program's shortcuts?
-SelectStartMenuFolderLabel3=Setup will create the program's shortcuts in the following Start Menu folder.
-SelectStartMenuFolderBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
-MustEnterGroupName=You must enter a folder name.
-GroupNameTooLong=The folder name or path is too long.
-InvalidGroupName=The folder name is not valid.
-BadGroupName=The folder name cannot include any of the following characters:%n%n%1
-NoProgramGroupCheck2=&Don't create a Start Menu folder
-
-; *** "Ready to Install" wizard page
-WizardReady=Ready to Install
-ReadyLabel1=Setup is now ready to begin installing [name] on your computer.
-ReadyLabel2a=Click Install to continue with the installation, or click Back if you want to review or change any settings.
-ReadyLabel2b=Click Install to continue with the installation.
-ReadyMemoUserInfo=User information:
-ReadyMemoDir=Destination location:
-ReadyMemoType=Setup type:
-ReadyMemoComponents=Selected components:
-ReadyMemoGroup=Start Menu folder:
-ReadyMemoTasks=Additional tasks:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Preparing to Install
-PreparingDesc=Setup is preparing to install [name] on your computer.
-PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
-CannotContinue=Setup cannot continue. Please click Cancel to exit.
-ApplicationsFound=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications.
-ApplicationsFound2=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications. After the installation has completed, Setup will attempt to restart the applications.
-CloseApplications=&Automatically close the applications
-DontCloseApplications=&Do not close the applications
-ErrorCloseApplications=Setup was unable to automatically close all applications. It is recommended that you close all applications using files that need to be updated by Setup before continuing.
-
-; *** "Installing" wizard page
-WizardInstalling=Installing
-InstallingLabel=Please wait while Setup installs [name] on your computer.
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Completing the [name] Setup Wizard
-FinishedLabelNoIcons=Setup has finished installing [name] on your computer.
-FinishedLabel=Setup has finished installing [name] on your computer. The application may be launched by selecting the installed icons.
-ClickFinish=Click Finish to exit Setup.
-FinishedRestartLabel=To complete the installation of [name], Setup must restart your computer. Would you like to restart now?
-FinishedRestartMessage=To complete the installation of [name], Setup must restart your computer.%n%nWould you like to restart now?
-ShowReadmeCheck=Yes, I would like to view the README file
-YesRadio=&Yes, restart the computer now
-NoRadio=&No, I will restart the computer later
-; used for example as 'Run MyProg.exe'
-RunEntryExec=Run %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=View %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=Setup Needs the Next Disk
-SelectDiskLabel2=Please insert Disk %1 and click OK.%n%nIf the files on this disk can be found in a folder other than the one displayed below, enter the correct path or click Browse.
-PathLabel=&Path:
-FileNotInDir2=The file "%1" could not be located in "%2". Please insert the correct disk or select another folder.
-SelectDirectoryLabel=Please specify the location of the next disk.
-
-; *** Installation phase messages
-SetupAborted=Setup was not completed.%n%nPlease correct the problem and run Setup again.
-EntryAbortRetryIgnore=Click Retry to try again, Ignore to proceed anyway, or Abort to cancel installation.
-
-; *** Installation status messages
-StatusClosingApplications=Closing applications...
-StatusCreateDirs=Creating directories...
-StatusExtractFiles=Extracting files...
-StatusCreateIcons=Creating shortcuts...
-StatusCreateIniEntries=Creating INI entries...
-StatusCreateRegistryEntries=Creating registry entries...
-StatusRegisterFiles=Registering files...
-StatusSavingUninstall=Saving uninstall information...
-StatusRunProgram=Finishing installation...
-StatusRestartingApplications=Restarting applications...
-StatusRollback=Rolling back changes...
-
-; *** Misc. errors
-ErrorInternal2=Internal error: %1
-ErrorFunctionFailedNoCode=%1 failed
-ErrorFunctionFailed=%1 failed; code %2
-ErrorFunctionFailedWithMessage=%1 failed; code %2.%n%3
-ErrorExecutingProgram=Unable to execute file:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=Error opening registry key:%n%1\%2
-ErrorRegCreateKey=Error creating registry key:%n%1\%2
-ErrorRegWriteKey=Error writing to registry key:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Error creating INI entry in file "%1".
-
-; *** File copying errors
-FileAbortRetryIgnore=Click Retry to try again, Ignore to skip this file (not recommended), or Abort to cancel installation.
-FileAbortRetryIgnore2=Click Retry to try again, Ignore to proceed anyway (not recommended), or Abort to cancel installation.
-SourceIsCorrupted=The source file is corrupted
-SourceDoesntExist=The source file "%1" does not exist
-ExistingFileReadOnly=The existing file is marked as read-only.%n%nClick Retry to remove the read-only attribute and try again, Ignore to skip this file, or Abort to cancel installation.
-ErrorReadingExistingDest=An error occurred while trying to read the existing file:
-FileExists=The file already exists.%n%nWould you like Setup to overwrite it?
-ExistingFileNewer=The existing file is newer than the one Setup is trying to install. It is recommended that you keep the existing file.%n%nDo you want to keep the existing file?
-ErrorChangingAttr=An error occurred while trying to change the attributes of the existing file:
-ErrorCreatingTemp=An error occurred while trying to create a file in the destination directory:
-ErrorReadingSource=An error occurred while trying to read the source file:
-ErrorCopying=An error occurred while trying to copy a file:
-ErrorReplacingExistingFile=An error occurred while trying to replace the existing file:
-ErrorRestartReplace=RestartReplace failed:
-ErrorRenamingTemp=An error occurred while trying to rename a file in the destination directory:
-ErrorRegisterServer=Unable to register the DLL/OCX: %1
-ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
-ErrorRegisterTypeLib=Unable to register the type library: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=An error occurred while trying to open the README file.
-ErrorRestartingComputer=Setup was unable to restart the computer. Please do this manually.
-
-; *** Uninstaller messages
-UninstallNotFound=File "%1" does not exist. Cannot uninstall.
-UninstallOpenError=File "%1" could not be opened. Cannot uninstall
-UninstallUnsupportedVer=The uninstall log file "%1" is in a format not recognized by this version of the uninstaller. Cannot uninstall
-UninstallUnknownEntry=An unknown entry (%1) was encountered in the uninstall log
-ConfirmUninstall=Are you sure you want to completely remove %1? Extensions and settings will not be removed.
-UninstallOnlyOnWin64=This installation can only be uninstalled on 64-bit Windows.
-OnlyAdminCanUninstall=This installation can only be uninstalled by a user with administrative privileges.
-UninstallStatusLabel=Please wait while %1 is removed from your computer.
-UninstalledAll=%1 was successfully removed from your computer.
-UninstalledMost=%1 uninstall complete.%n%nSome elements could not be removed. These can be removed manually.
-UninstalledAndNeedsRestart=To complete the uninstallation of %1, your computer must be restarted.%n%nWould you like to restart now?
-UninstallDataCorrupted="%1" file is corrupted. Cannot uninstall
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=Remove Shared File?
-ConfirmDeleteSharedFile2=The system indicates that the following shared file is no longer in use by any programs. Would you like for Uninstall to remove this shared file?%n%nIf any programs are still using this file and it is removed, those programs may not function properly. If you are unsure, choose No. Leaving the file on your system will not cause any harm.
-SharedFileNameLabel=File name:
-SharedFileLocationLabel=Location:
-WizardUninstalling=Uninstall Status
-StatusUninstalling=Uninstalling %1...
-
-; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=Installing %1.
-ShutdownBlockReasonUninstallingApp=Uninstalling %1.
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 version %2
-AdditionalIcons=Additional icons:
-CreateDesktopIcon=Create a &desktop icon
-CreateQuickLaunchIcon=Create a &Quick Launch icon
-ProgramOnTheWeb=%1 on the Web
-UninstallProgram=Uninstall %1
-LaunchProgram=Launch %1
-AssocFileExtension=&Associate %1 with the %2 file extension
-AssocingFileExtension=Associating %1 with the %2 file extension...
-AutoStartProgramGroupDescription=Startup:
-AutoStartProgram=Automatically start %1
-AddonHostProgramNotFound=%1 could not be located in the folder you selected.%n%nDo you want to continue anyway?

build/win32/i18n/Default.ko.isl

@@ -1,12 +1,16 @@
-; *** Inno Setup version 5.5.3+ Korean messages ***
-;
-; To download user-contributed translations of this file, go to:
-;   http://www.jrsoftware.org/files/istrans/
+; *** Inno Setup version 6.0.0+ Korean messages ***
 ;
+; ▒ 6.0.3+ Translator: SungDong Kim (acroedit@gmail.com)
+; ▒ 5.5.3+ Translator: Domddol (domddol@gmail.com)
+; ▒ Translation date: MAR 04, 2014
+; ▒ Contributors: Hansoo KIM (iryna7@gmail.com), Woong-Jae An (a183393@hanmail.net)
+; ▒ Storage: http://www.jrsoftware.org/files/istrans/
+; ▒ 이 번역은 새로운 한국어 맞춤법 규칙을 준수합니다.
 ; Note: When translating this text, do not add periods (.) to the end of
 ; messages that didn't have them already, because on those messages Inno
 ; Setup adds the periods automatically (appending a period would result in
 ; two periods being displayed).
+
 [LangOptions]
 ; The following three entries are very important. Be sure to read and 
 ; understand the '[LangOptions] section' topic in the help file.
@@ -23,50 +27,68 @@ LanguageCodePage=949
 ;TitleFontSize=29
 ;CopyrightFontName=Arial
 ;CopyrightFontSize=8
+
 [Messages]
+
 ; *** Application titles
 SetupAppTitle=설치
-SetupWindowTitle=설치 - %1
+SetupWindowTitle=%1 설치
 UninstallAppTitle=제거
 UninstallAppFullTitle=%1 제거
+
 ; *** Misc. common
 InformationTitle=정보
 ConfirmTitle=확인
 ErrorTitle=오류
+
 ; *** SetupLdr messages
-SetupLdrStartupMessage=그러면 %1이(가) 설치됩니다. 계속하시겠습니까?
-LdrCannotCreateTemp=임시 파일을 만들 수 없습니다. 설치 프로그램이 중단되었습니다.
-LdrCannotExecTemp=임시 디렉터리에서 파일을 실행할 수 없습니다. 설치 프로그램이 중단되었습니다.
+SetupLdrStartupMessage=%1을(를) 설치합니다, 계속하시겠습니까?
+LdrCannotCreateTemp=임시 파일을 만들 수 없습니다, 설치를 중단합니다
+LdrCannotExecTemp=임시 폴더의 파일을 실행할 수 없습니다, 설치를 중단합니다
+HelpTextNote=
+
 ; *** Startup error messages
 LastErrorMessage=%1.%n%n오류 %2: %3
-SetupFileMissing=파일 %1이(가) 설치 디렉터리에서 누락되었습니다. 문제를 해결하거나 프로그램을 새로 받으세요.
-SetupFileCorrupt=설치 파일이 손상되었습니다. 프로그램을 새로 받으세요.
-SetupFileCorruptOrWrongVer=설치 파일이 손상되었거나 이 버전의 설치 프로그램과 호환되지 않습니다. 문제를 해결하거나 프로그램을 새로 받으세요.
-InvalidParameter=명령줄에 잘못된 매개 변수가 전달됨:%n%n%1
-SetupAlreadyRunning=설치 프로그램이 이미 실행 중입니다.
-WindowsVersionNotSupported=이 프로그램은 컴퓨터에서 실행 중인 버전의 Windows를 지원하지 않습니다.
-WindowsServicePackRequired=이 프로그램을 설치하려면 %1 서비스 팩 %2 이상이 필요합니다.
-NotOnThisPlatform=이 프로그램은 %1에서 실행되지 않습니다.
+SetupFileMissing=%1 파일이 존재하지 않습니다, 문제를 해결해 보거나 새로운 설치 프로그램을 구하시기 바랍니다.
+SetupFileCorrupt=설치 파일이 손상되었습니다, 새로운 설치 프로그램을 구하시기 바랍니다.
+SetupFileCorruptOrWrongVer=설치 파일의 손상이거나 이 설치 버전과 호환되지 않습니다, 문제를 해결해 보거나 새로운 설치 프로그램을 구하시기 바랍니다.
+InvalidParameter=잘못된 매개 변수입니다:%n%n%1
+SetupAlreadyRunning=설치가 이미 실행 중입니다.
+WindowsVersionNotSupported=이 프로그램은 귀하의 Windows 버전을 지원하지 않습니다.
+WindowsServicePackRequired=이 프로그램을 실행하려면 %1 sp%2 이상이어야 합니다.
+NotOnThisPlatform=이 프로그램은 %1에서 작동하지 않습니다.
 OnlyOnThisPlatform=이 프로그램은 %1에서 실행해야 합니다.
-OnlyOnTheseArchitectures=이 프로그램은 프로세서 아키텍처 %n%n%1용으로 설계된 Windows 버전에서만 설치할 수 있습니다.
-MissingWOW64APIs=실행 중인 Windows 버전에는 설치 프로그램에서 64비트를 설치하는 데 필요한 기능이 없습니다. 이 문제를 해결하려면 서비스 팩 %1을(를) 설치하세요.
-WinVersionTooLowError=이 프로그램을 설치하려면 %1 버전 %2 이상이 필요합니다.
-WinVersionTooHighError=이 프로그램은 %1 버전 %2 이상에서는 설치할 수 없습니다.
-AdminPrivilegesRequired=이 프로그램을 설치할 때는 관리자로 로그인해야 합니다.
-PowerUserPrivilegesRequired=이 프로그램을 설치할 때는 관리자나 고급 사용자 그룹의 구성원으로 로그인해야 합니다.
-SetupAppRunningError=설치 프로그램에서 %1(이)가 현재 실행 중임을 감지했습니다.%n%n이 항목의 모든 인스턴스를 지금 닫고 계속하려면 [확인]을, 종료하려면 [취소]를 클릭하세요.
-UninstallAppRunningError=제거 작업에서 %1(이)가 현재 실행 중임을 감지했습니다.%n%n이 항목의 모든 인스턴스를 지금 닫고 계속하려면 [확인]을, 종료하려면 [취소]를 클릭하세요.
+OnlyOnTheseArchitectures=이 프로그램은 아래 처리 구조와 호환되는 Windows 버전에만 설치할 수 있습니다:%n%n%1
+WinVersionTooLowError=이 프로그램은 %1 버전 %2 이상이 필요합니다.
+WinVersionTooHighError=이 프로그램은 %1 버전 %2 이상에서 설치할 수 없습니다.
+AdminPrivilegesRequired=이 프로그램을 설치하려면 관리자로 로그인해야 합니다.
+PowerUserPrivilegesRequired=이 프로그램을 설치하려면 관리자 또는 고급 사용자로 로그인해야 합니다.
+SetupAppRunningError=현재 %1이(가) 실행 중입니다!%n%n지금 그것의 모든 인스턴스를 닫아 주십시오. 그런 다음 계속하려면 "확인"을, 종료하려면 "취소"를 클릭하십시오.
+UninstallAppRunningError=현재 %1이(가) 실행 중입니다!%n%n지금 그것의 모든 인스턴스를 닫아 주십시오. 그런 다음 계속하려면 "확인"을, 종료하려면 "취소"를 클릭하십시오.
+
+; *** Startup questions
+PrivilegesRequiredOverrideTitle=설치 모드 선택
+PrivilegesRequiredOverrideInstruction=설치 모드를 선택해 주십시오
+PrivilegesRequiredOverrideText1=%1 은 모든 사용자(관리자 권한 필요) 또는 현재 사용자용으로 설치합니다.
+PrivilegesRequiredOverrideText2=%1 은 현재 사용자 또는 모든 사용자(관리자 권한 필요) 용으로 설치합니다.
+PrivilegesRequiredOverrideAllUsers=모든 사용자용으로 설치(&A)
+PrivilegesRequiredOverrideAllUsersRecommended=모든 사용자용으로 설치(&A) (추천)
+PrivilegesRequiredOverrideCurrentUser=현재 사용자용으로 설치(&M)
+PrivilegesRequiredOverrideCurrentUserRecommended=현재 사용자용으로 설치(&M) (추천)
+
 ; *** Misc. errors
-ErrorCreatingDir=설치 프로그램에서 디렉터리 "%1"을(를) 만들 수 없습니다.
-ErrorTooManyFilesInDir=디렉터리 "%1"에 파일이 너무 많으므로 이 디렉터리에 파일을 만들 수 없습니다.
+ErrorCreatingDir="%1" 폴더를 만들 수 없습니다.
+ErrorTooManyFilesInDir="%1" 폴더에 파일이 너무 많기 때문에 파일을 만들 수 없습니다.
+
 ; *** Setup common messages
-ExitSetupTitle=설치 종료
-ExitSetupMessage=설치가 완료되지 않았습니다. 지금 종료하면 프로그램이 설치되지 않습니다.%n%n나중에 설치 프로그램을 다시 실행하여 설치를 끝낼 수 있습니다.%n%n설치 프로그램을 종료하시겠습니까?
-AboutSetupMenuItem=설치 프로그램 정보(&A)...
-AboutSetupTitle=설치 프로그램 정보
-AboutSetupMessage=%1 버전 %2%n%3%n%n%1 홈페이지:%n%4
+ExitSetupTitle=설치 완료
+ExitSetupMessage=설치가 완료되지 않았습니다, 여기서 설치를 종료하면 프로그램은 설치되지 않습니다.%n%n설치를 완료하려면 나중에 다시 설치 프로그램을 실행해야 합니다.%n%n그래도 설치를 종료하시겠습니까?
+AboutSetupMenuItem=설치 정보(&A)...
+AboutSetupTitle=설치 정보
+AboutSetupMessage=%1 버전 %2%n%3%n%n%1 홈 페이지:%n%4
 AboutSetupNote=
 TranslatorNote=
+
 ; *** Buttons
 ButtonBack=< 뒤로(&B)
 ButtonNext=다음(&N) >
@@ -75,224 +97,271 @@ ButtonOK=Ȯ
 ButtonCancel=취소
 ButtonYes=예(&Y)
 ButtonYesToAll=모두 예(&A)
-ButtonNo=아니요(&N)
-ButtonNoToAll=모두 아니요(&O)
-ButtonFinish=마침(&F)
+ButtonNo=아니오(&N)
+ButtonNoToAll=모두 아니오(&O)
+ButtonFinish=종료(&F)
 ButtonBrowse=찾아보기(&B)...
-ButtonWizardBrowse=찾아보기(&R)
+ButtonWizardBrowse=찾아보기(&R)...
 ButtonNewFolder=새 폴더 만들기(&M)
+
 ; *** "Select Language" dialog messages
 SelectLanguageTitle=설치 언어 선택
-SelectLanguageLabel=설치 중에 사용할 언어를 선택하세요.
+SelectLanguageLabel=설치에 사용할 언어를 선택하십시오.
+
 ; *** Common wizard text
-ClickNext=계속하려면 [다음]을 클릭하고 설치 프로그램을 종료하려면 [취소]를 클릭하세요.
+ClickNext=계속하려면 "다음"을 클릭하고 설치를 종료하려면 "취소"를 클릭합니다.
 BeveledLabel=
 BrowseDialogTitle=폴더 찾아보기
-BrowseDialogLabel=아래 목록에서 폴더를 선택한 다음 [확인]을 클릭하세요.
+BrowseDialogLabel=아래 목록에서 폴더를 선택한 다음 "확인"을 클릭합니다.
 NewFolderName=새 폴더
+
 ; *** "Welcome" wizard page
 WelcomeLabel1=[name] 설치 마법사 시작
-WelcomeLabel2=이 마법사는 컴퓨터에 [name/ver]을(를) 설치합니다.%n%n계속하기 전에 다른 모든 응용 프로그램을 닫는 것이 좋습니다.
+WelcomeLabel2=이 마법사는 귀하의 컴퓨터에 [name/ver]을(를) 설치할 것입니다.%n%n설치하기 전에 다른 응용프로그램들을 모두 닫으시기 바랍니다.
+
 ; *** "Password" wizard page
-WizardPassword=암호
-PasswordLabel1=이 설치는 암호로 보호되고 있습니다.
-PasswordLabel3=계속하려면 암호를 입력한 다음 [다음]을 클릭하세요. 암호는 대소문자를 구분합니다.
-PasswordEditLabel=암호(&P):
-IncorrectPassword=입력한 암호가 잘못되었습니다. 다시 시도하세요.
+WizardPassword=비밀 번호
+PasswordLabel1=이 설치 마법사는 비밀 번호로 보호되어 있습니다.
+PasswordLabel3=비밀 번호를 입력하고 "다음"을 클릭하십시오. 비밀 번호는 대소문자를 구분해야 합니다.
+PasswordEditLabel=비밀 번호(&P):
+IncorrectPassword=비밀 번호가 정확하지 않습니다, 다시 입력하십시오.
+
 ; *** "License Agreement" wizard page
 WizardLicense=사용권 계약
-LicenseLabel=계속하기 전에 다음 중요한 정보를 읽어 보세요.
-LicenseLabel3=다음 사용권 계약을 읽어 주세요. 설치를 계속하려면 먼저 이 계약 조건에 동의해야 합니다.
-LicenseAccepted=계약에 동의함(&A)
-LicenseNotAccepted=계약에 동의 안 함(&D)
+LicenseLabel=계속하기 전에 다음의 중요 정보를 읽어보십시오.
+LicenseLabel3=다음 사용권 계약을 읽어보십시오, 설치를 계속하려면 이 계약에 동의해야 합니다.
+LicenseAccepted=동의합니다(&A)
+LicenseNotAccepted=동의하지 않습니다(&D)
+
 ; *** "Information" wizard pages
 WizardInfoBefore=정보
-InfoBeforeLabel=계속하기 전에 다음 중요한 정보를 읽어 보세요.
-InfoBeforeClickLabel=설치를 계속 진행할 준비가 되면 [다음]을 클릭합니다.
+InfoBeforeLabel=계속하기 전에 다음의 중요 정보를 읽어보십시오.
+InfoBeforeClickLabel=설치를 계속하려면 "다음"을 클릭하십시오.
 WizardInfoAfter=정보
-InfoAfterLabel=계속하기 전에 다음 중요한 정보를 읽어 보세요.
-InfoAfterClickLabel=설치를 계속 진행할 준비가 되면 [다음]을 클릭합니다.
+InfoAfterLabel=계속하기 전에 다음의 중요 정보를 읽어보십시오.
+InfoAfterClickLabel=설치를 계속하려면 "다음"을 클릭하십시오.
+
 ; *** "User Information" wizard page
 WizardUserInfo=사용자 정보
-UserInfoDesc=정보를 입력하세요.
+UserInfoDesc=사용자 정보를 입력하십시오.
 UserInfoName=사용자 이름(&U):
 UserInfoOrg=조직(&O):
-UserInfoSerial=일련 번호(&S):
-UserInfoNameRequired=이름을 입력해야 합니다.
+UserInfoSerial=시리얼 번호(&S):
+UserInfoNameRequired=사용자 이름을 입력하십시오.
+
 ; *** "Select Destination Location" wizard page
-WizardSelectDir=대상 위치 선택
-SelectDirDesc=[name]을(를) 어디에 설치하시겠습니까?
-SelectDirLabel3=설치 프로그램에서 [name]을(를) 다음 폴더에 설치합니다.
-SelectDirBrowseLabel=계속하려면 [다음]을 클릭하세요. 다른 폴더를 선택하려면 [찾아보기]를 클릭하세요.
-DiskSpaceMBLabel=적어도 [mb]MB의 여유 디스크 공간이 필요합니다.
-CannotInstallToNetworkDrive=설치 프로그램은 네트워크 드라이브에 설치할 수 없습니다.
-CannotInstallToUNCPath=설치 프로그램은 UNC 경로에 설치할 수 없습니다.
-InvalidPath=드라이브 문자와 함께 전체 경로를 입력해야 합니다. 예:%n%nC:\APP%n%n또는 다음 형태의 UNC 경로:%n%n\\server\share
-InvalidDrive=선택한 드라이브나 UNC 공유가 없거나 이 두 항목에 액세스할 수 없습니다. 다른 드라이브나 UNC 공유를 선택하세요.
-DiskSpaceWarningTitle=디스크 공간 부족
-DiskSpaceWarning=설치 프로그램을 설치하려면 여유 설치 공간이 적어도 %1KB가 필요하지만 선택한 드라이브의 가용 공간은 %2KB밖에 없습니다.%n%n그래도 계속하시겠습니까?
+WizardSelectDir=설치 위치 선택
+SelectDirDesc=[name]의 설치 위치를 선택하십시오.
+SelectDirLabel3=다음 폴더에 [name]을(를) 설치합니다.
+SelectDirBrowseLabel=계속하려면 "다음"을, 다른 폴더를 선택하려면 "찾아보기"를 클릭하십시오.
+DiskSpaceGBLabel=이 프로그램은 최소 [gb] GB의 디스크 여유 공간이 필요합니다.
+DiskSpaceMBLabel=이 프로그램은 최소 [mb] MB의 디스크 여유 공간이 필요합니다.
+CannotInstallToNetworkDrive=네트워크 드라이브에 설치할 수 없습니다.
+CannotInstallToUNCPath=UNC 경로에 설치할 수 없습니다.
+InvalidPath=드라이브 문자를 포함한 전체 경로를 입력하십시오.%n※ 예: C:\APP %n%n또는, UNC 형식의 경로를 입력하십시오.%n※ 예: \\server\share
+InvalidDrive=선택한 드라이브 또는 UNC 공유가 존재하지 않거나 액세스할 수 없습니다, 다른 경로를 선택하십시오.
+DiskSpaceWarningTitle=디스크 공간이 부족합니다
+DiskSpaceWarning=설치 시 최소 %1 KB 디스크 공간이 필요하지만, 선택한 드라이브의 여유 공간은 %2 KB 밖에 없습니다.%n%n그래도 계속하시겠습니까?
 DirNameTooLong=폴더 이름 또는 경로가 너무 깁니다.
-InvalidDirName=폴더 이름이 잘못되었습니다.
-BadDirName32=폴더 이름에는 %n%n%1 문자를 사용할 수 없습니다.
-DirExistsTitle=폴더 있음
-DirExists=폴더 %n%n%1%n%n이(가) 이미 있습니다. 그래도 해당 폴더에 설치하시겠습니까?
-DirDoesntExistTitle=폴더 없음
-DirDoesntExist=폴더 %n%n%1%n%n이(가) 없습니다. 폴더를 만드시겠습니까?
+InvalidDirName=폴더 이름이 유효하지 않습니다.
+BadDirName32=폴더 이름은 다음 문자를 포함할 수 없습니다:%n%n%1
+DirExistsTitle=폴더가 존재합니다
+DirExists=폴더 %n%n%1%n%n이(가) 이미 존재합니다, 이 폴더에 설치하시겠습니까?
+DirDoesntExistTitle=폴더가 존재하지 않습니다
+DirDoesntExist=폴더 %n%n%1%n%n이(가) 존재하지 않습니다, 새로 폴더를 만드시겠습니까?
+
 ; *** "Select Components" wizard page
 WizardSelectComponents=구성 요소 선택
-SelectComponentsDesc=어떤 구성 요소를 설치하시겠습니까?
-SelectComponentsLabel2=설치할 구성 요소는 선택하고 설치하지 않을 구성 요소는 지우세요. 계속 진행할 준비가 되면 [다음]을 클릭하세요.
-FullInstallation=전체 설치
+SelectComponentsDesc=설치할 구성 요소를 선택하십시오.
+SelectComponentsLabel2=필요한 구성 요소는 체크하고 불필요한 구성 요소는 체크 해제합니다, 계속하려면 "다음"을 클릭하십시오.
+FullInstallation=모두 설치
 ; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Compact 설치
+CompactInstallation=최소 설치
 CustomInstallation=사용자 지정 설치
-NoUninstallWarningTitle=구성 요소가 있음
-NoUninstallWarning=설치 프로그램에서 구성 요소 %n%n%1%n%n이(가) 컴퓨터에 이미 설치되어 있음을 감지했습니다. 이러한 구성 요소는 선택 취소해도 제거되지 않습니다.%n%n그래도 계속하시겠습니까?
-ComponentSize1=%1KB
-ComponentSize2=%1MB
-ComponentsDiskSpaceMBLabel=현재 선택을 위해서는 적어도 [mb]MB의 디스크 공간이 필요합니다.
+NoUninstallWarningTitle=구성 요소가 존재합니다
+NoUninstallWarning=다음 구성 요소가 이미 설치되어 있습니다:%n%n%1%n%n위 구성 요소을 선택하지 않으면, 프로그램 제거시 이 구성 요소들은 제거되지 않을 겁니다.%n%n그래도 계속하시겠습니까?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceGBLabel=현재 선택은 최소 [gb] GB의 디스크 여유 공간이 필요합니다.
+ComponentsDiskSpaceMBLabel=현재 선택은 최소 [mb] MB의 디스크 여유 공간이 필요합니다.
+
 ; *** "Select Additional Tasks" wizard page
 WizardSelectTasks=추가 작업 선택
-SelectTasksDesc=어떤 작업을 추가로 수행하시겠습니까?
-SelectTasksLabel2=설치 프로그램에서 [name]을(를) 설치하는 동안 수행할 추가 작업을 선택한 후 [다음]을 클릭하세요.
+SelectTasksDesc=수행할 추가 작업을 선택하십시오.
+SelectTasksLabel2=[name] 설치 과정에 포함할 추가 작업을 선택한 후, "다음"을 클릭하십시오.
+
 ; *** "Select Start Menu Folder" wizard page
 WizardSelectProgramGroup=시작 메뉴 폴더 선택
-SelectStartMenuFolderDesc=설치 프로그램에서 프로그램의 바로 가기를 어디에 만들도록 하시겠습니까?
-SelectStartMenuFolderLabel3=설치 프로그램에서 프로그램의 바로 가기를 다음 시작 메뉴 폴더에 만듭니다.
-SelectStartMenuFolderBrowseLabel=계속하려면 [다음]을 클릭하세요. 다른 폴더를 선택하려면 [찾아보기]를 클릭하세요.
-MustEnterGroupName=폴더 이름을 입력해야 합니다.
+SelectStartMenuFolderDesc=어디에 프로그램 바로가기를 위치하겠습니까?
+SelectStartMenuFolderLabel3=다음 시작 메뉴 폴더에 프로그램 바로가기를 만듭니다.
+SelectStartMenuFolderBrowseLabel=계속하려면 "다음"을 클릭하고, 다른 폴더를 선택하려면 "찾아보기"를 클릭하십시오.
+MustEnterGroupName=폴더 이름을 입력하십시오.
 GroupNameTooLong=폴더 이름 또는 경로가 너무 깁니다.
-InvalidGroupName=폴더 이름이 잘못되었습니다.
-BadGroupName=폴더 이름에는 %n%n%1 문자를 사용할 수 없습니다.
+InvalidGroupName=폴더 이름이 유효하지 않습니다.
+BadGroupName=폴더 이름은 다음 문자를 포함할 수 없습니다:%n%n%1
 NoProgramGroupCheck2=시작 메뉴 폴더를 만들지 않음(&D)
+
 ; *** "Ready to Install" wizard page
-WizardReady=설치 준비됨
-ReadyLabel1=이제 설치 프로그램이 컴퓨터에 [name] 설치를 시작할 준비가 되었습니다.
-ReadyLabel2a=설치를 계속하려면 [설치]를 클릭하고, 설정을 검토하거나 변경하려면 [뒤로]를 클릭하세요.
-ReadyLabel2b=설치를 계속하려면 [설치]를 클릭하세요.
+WizardReady=설치 준비 완료
+ReadyLabel1=귀하의 컴퓨터에 [name]을(를) 설치할 준비가 되었습니다.
+ReadyLabel2a=설치를 계속하려면 "설치"를, 설정을 변경하거나 검토하려면 "뒤로"를 클릭하십시오.
+ReadyLabel2b=설치를 계속하려면 "설치"를 클릭하십시오.
 ReadyMemoUserInfo=사용자 정보:
-ReadyMemoDir=대상 위치:
+ReadyMemoDir=설치 위치:
 ReadyMemoType=설치 유형:
 ReadyMemoComponents=선택한 구성 요소:
 ReadyMemoGroup=시작 메뉴 폴더:
 ReadyMemoTasks=추가 작업:
+
 ; *** "Preparing to Install" wizard page
 WizardPreparing=설치 준비 중
-PreparingDesc=설치 프로그램에서 컴퓨터에 [name] 설치를 준비하고 있습니다.
-PreviousInstallNotCompleted=이전 프로그램의 설치/제거 작업이 완료되지 않았습니다. 해당 설치를 완료하려면 컴퓨터를 다시 시작해야 합니다.%n%n컴퓨터를 다시 시작한 후 [name] 설치를 완료하려면 설치 프로그램을 다시 실행하세요.
-CannotContinue=설치 프로그램을 계속할 수 없습니다. 종료하려면 [취소]를 클릭하세요.
-ApplicationsFound=설치 프로그램에서 업데이트해야 하는 파일이 다음 응용 프로그램에 사용되고 있습니다. 설치 프로그램에서 이러한 응용 프로그램을 자동으로 닫도록 허용하는 것이 좋습니다.
-ApplicationsFound2=설치 프로그램에서 업데이트해야 하는 파일이 다음 응용 프로그램에 사용되고 있습니다. 설치 프로그램에서 이러한 응용 프로그램을 자동으로 닫도록 허용하는 것이 좋습니다. 설치가 완료되면 설치 프로그램에서 응용 프로그램을 다시 시작하려고 시도합니다.
-CloseApplications=응용 프로그램 자동 닫기(&A)
-DontCloseApplications=응용 프로그램을 닫지 않음(&D)
-ErrorCloseApplications=설치 프로그램에서 일부 응용 프로그램을 자동으로 닫을 수 없습니다. 계속하기 전에 설치 프로그램에서 업데이트해야 하는 파일을 사용하는 응용 프로그램을 모두 닫는 것이 좋습니다.
+PreparingDesc=귀하의 컴퓨터에 [name] 설치를 준비하는 중입니다.
+PreviousInstallNotCompleted=이전 프로그램의 설치/제거 작업이 완료되지 않았습니다, 완료하려면 컴퓨터를 다시 시작해야 합니다.%n%n컴퓨터를 다시 시작한 후, 설치 마법사를 다시 실행하여 [name] 설치를 완료하시기 바랍니다.
+CannotContinue=설치를 계속할 수 없습니다, "취소"를 클릭하여 설치를 종료하십시오.
+ApplicationsFound=다음 응용프로그램이 설치 업데이트가 필요한 파일을 사용하고 있습니다, 설치 마법사가 이런 응용프로그램을 자동으로 종료할 수 있도록 허용하시기 바랍니다.
+ApplicationsFound2=다음 응용프로그램이 설치 업데이트가 필요한 파일을 사용하고 있습니다, 설치 마법사가 이런 응용프로그램을 자동으로 종료할 수 있도록 허용하시기 바랍니다. 설치가 완료되면, 설치 마법사는 이 응용프로그램이 다시 시작되도록 시도할 겁니다.
+CloseApplications=자동으로 응용프로그램을 종료함(&A)
+DontCloseApplications=응용프로그램을 종료하지 않음(&D)
+ErrorCloseApplications=설치 마법사가 응용프로그램을 자동으로 종료할 수 없습니다, 계속하기 전에 설치 업데이트가 필요한 파일을 사용하고 있는 응용프로그램을 모두 종료하시기 바랍니다.
+PrepareToInstallNeedsRestart=설치 마법사는 귀하의 컴퓨터를 재시작해야 합니다. [name] 설치를 완료하기 위해 컴퓨터를 다시 시작한 후에 설치 마법사를 다시 실행해 주십시오.%n%n지금 다시 시작하시겠습니까?
+
 ; *** "Installing" wizard page
 WizardInstalling=설치 중
-InstallingLabel=설치 프로그램에서 컴퓨터에 [name]을(를) 설치하는 동안 기다려 주세요.
+InstallingLabel=귀하의 컴퓨터에 [name]을(를) 설치하는 중... 잠시 기다려 주십시오.
+
 ; *** "Setup Completed" wizard page
-FinishedHeadingLabel=[name] 설정 마법사를 완료하는 중
-FinishedLabelNoIcons=설치 프로그램에서 컴퓨터에 [name]을(를) 설치했습니다.
-FinishedLabel=설치 프로그램에서 컴퓨터에 [name]을(를) 설치했습니다. 설치한 바로 가기를 선택하여 해당 응용 프로그램을 시작할 수 있습니다.
-ClickFinish=설치 프로그램을 종료하려면 [마침]을 클릭하세요.
-FinishedRestartLabel=[name] 설치를 완료하려면 설치 프로그램에서 컴퓨터를 다시 시작해야 합니다. 지금 다시 시작하시겠습니까?
-FinishedRestartMessage=[name] 설치를 완료하려면 설치 프로그램에서 컴퓨터를 다시 시작해야 합니다.%n%n지금 다시 시작하시겠습니까?
-ShowReadmeCheck=예, README 파일을 보겠습니다.
-YesRadio=예, 컴퓨터를 지금 다시 시작하겠습니다(&Y).
-NoRadio=아니요, 컴퓨터를 나중에 다시 시작하겠습니다(&N).
+FinishedHeadingLabel=[name] 설치 마법사 완료
+FinishedLabelNoIcons=귀하의 컴퓨터에 [name]이(가) 설치되었습니다.
+FinishedLabel=귀하의 컴퓨터에 [name]이(가) 설치되었습니다, 응용프로그램은 설치된 아이콘을 선택하여 시작할 수 있습니다.
+ClickFinish=설치를 끝내려면 "종료"를 클릭하십시오.
+FinishedRestartLabel=[name] 설치를 완료하려면, 컴퓨터를 다시 시작해야 합니다. 지금 다시 시작하시겠습니까?
+FinishedRestartMessage=[name] 설치를 완료하려면, 컴퓨터를 다시 시작해야 합니다.%n%n지금 다시 시작하시겠습니까?
+ShowReadmeCheck=예, README 파일을 표시합니다
+YesRadio=예, 지금 다시 시작합니다(&Y)
+NoRadio=아니오, 나중에 다시 시작합니다(&N)
 ; used for example as 'Run MyProg.exe'
 RunEntryExec=%1 실행
 ; used for example as 'View Readme.txt'
-RunEntryShellExec=%1 보기
+RunEntryShellExec=%1 표시
+
 ; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=설치 프로그램에서 다음 디스크가 필요함
-SelectDiskLabel2=디스크 %1을(를) 삽입한 다음 [확인]을 클릭하세요.%n%n이 디스크의 파일이 아래 표시된 폴더가 아닌 다른 폴더에 있으면 올바른 경로를 입력하거나 [찾아보기]를 클릭하세요.
+ChangeDiskTitle=디스크가 필요합니다
+SelectDiskLabel2=디스크 %1을(를) 삽입하고 "확인"을 클릭하십시오.%n%n이 디스크 상의 파일이 아래 경로가 아닌 곳에 있는 경우, 올바른 경로를 입력하거나 "찾아보기"를 클릭하시기 바랍니다.
 PathLabel=경로(&P):
-FileNotInDir2="%2"에서 파일 "%1"을(를) 찾을 수 없습니다. 올바른 디스크를 삽입하거나 다른 폴더를 선택하세요.
-SelectDirectoryLabel=다음 디스크의 위치를 지정하세요.
+FileNotInDir2=%2에 파일 %1을(를) 위치할 수 없습니다, 올바른 디스크를 삽입하거나 다른 폴더를 선택하십시오.
+SelectDirectoryLabel=다음 디스크의 위치를 지정하십시오.
+
 ; *** Installation phase messages
-SetupAborted=설치를 완료하지 못했습니다.%n%n문제를 해결한 다음 설치 프로그램을 다시 실행하세요.
-EntryAbortRetryIgnore=다시 시도하려면 [다시 시도]를, 그래도 계속하려면 [무시]를, 설치를 취소하려면 [중단]을 클릭하세요.
+SetupAborted=설치가 완료되지 않았습니다.%n%n문제를 해결한 후, 다시 설치를 시작하십시오.
+AbortRetryIgnoreSelectAction=액션을 선택해 주십시오.
+AbortRetryIgnoreRetry=재시도(&T)
+AbortRetryIgnoreIgnore=오류를 무시하고 진행(&I)
+AbortRetryIgnoreCancel=설치 취소
+
 ; *** Installation status messages
-StatusClosingApplications=응용 프로그램을 닫는 중...
-StatusCreateDirs=디렉터리를 만드는 중...
+StatusClosingApplications=응용프로그램을 종료하는 중...
+StatusCreateDirs=폴더를 만드는 중...
 StatusExtractFiles=파일을 추출하는 중...
-StatusCreateIcons=바로 가기를 만드는 중...
+StatusCreateIcons=바로가기를 생성하는 중...
 StatusCreateIniEntries=INI 항목을 만드는 중...
 StatusCreateRegistryEntries=레지스트리 항목을 만드는 중...
 StatusRegisterFiles=파일을 등록하는 중...
 StatusSavingUninstall=제거 정보를 저장하는 중...
 StatusRunProgram=설치를 완료하는 중...
-StatusRestartingApplications=응용 프로그램을 다시 시작하는 중...
-StatusRollback=변경 사항을 롤백하는 중...
+StatusRestartingApplications=응용프로그램을 다시 시작하는 중...
+StatusRollback=변경을 취소하는 중...
+
 ; *** Misc. errors
 ErrorInternal2=내부 오류: %1
 ErrorFunctionFailedNoCode=%1 실패
-ErrorFunctionFailed=%1 실패, 코드 %2
-ErrorFunctionFailedWithMessage=%1 실패, 코드 %2.%n%3
-ErrorExecutingProgram=파일을 실행할 수 없음:%n%1
+ErrorFunctionFailed=%1 실패; 코드 %2
+ErrorFunctionFailedWithMessage=%1 실패, 코드: %2.%n%3
+ErrorExecutingProgram=파일 실행 오류:%n%1
+
 ; *** Registry errors
-ErrorRegOpenKey=레지스트리 키를 여는 중 오류 발생:%n%1\%2
-ErrorRegCreateKey=레지스트리 키를 만드는 중 오류 발생:%n%1\%2
-ErrorRegWriteKey=레지스트리 키에 기록하는 중 오류 발생:%n%1\%2
+ErrorRegOpenKey=레지스트리 키 열기 오류:%n%1\%2
+ErrorRegCreateKey=레지스트리 키 생성 오류:%n%1\%2
+ErrorRegWriteKey=레지스트리 키 쓰기 오류:%n%1\%2
+
 ; *** INI errors
-ErrorIniEntry=파일 "%1"에 INI 항목을 만드는 중에 오류가 발생했습니다. 
+ErrorIniEntry=%1 파일에 INI 항목 만들기 오류입니다.
+
 ; *** File copying errors
-FileAbortRetryIgnore=다시 시도하려면 [다시 시도]를, 이 파일을 건너뛰려면 [무시](권장되지 않음)를, 설치를 취소하려면 [중단]을 클릭하세요.
-FileAbortRetryIgnore2=다시 시도하려면 [다시 시도]를, 그래도 계속하려면 [무시](권장되지 않음)를, 설치를 취소하려면 [중단]을 클릭하세요.
-SourceIsCorrupted=원본 파일이 손상되었습니다.
-SourceDoesntExist=원본 파일 "%1"이(가) 없습니다.
-ExistingFileReadOnly=기존 파일이 읽기 전용으로 표시되어 있습니다.%n%n읽기 전용 특성을 제거하고 다시 시도하려면 [다시 시도]를, 이 파일을 건너뛰려면 [무시]를, 설치를 취소하려면 [중단]을 클릭하세요.
-ErrorReadingExistingDest=기존 파일을 읽는 중 오류 발생:
-FileExists=해당 파일이 이미 있습니다.%n%n설치 프로그램에서 이 파일을 덮어쓰도록 하시겠습니까?
-ExistingFileNewer=기존 파일이 설치 프로그램에서 설치하려는 파일보다 최신입니다. 기존 파일을 유지할 것을 권장합니다.%n%n기존 파일을 유지하시겠습니까?
-ErrorChangingAttr=기존 파일의 특성을 변경하는 중 오류 발생:
-ErrorCreatingTemp=대상 디렉터리에 파일을 만드는 중 오류 발생:
-ErrorReadingSource=원본 파일을 읽는 중 오류 발생:
-ErrorCopying=파일을 복사하는 중 오류 발생:
-ErrorReplacingExistingFile=기존 파일을 바꾸는 중 오류 발생:
+FileAbortRetryIgnoreSkipNotRecommended=이 파일을 건너띔(&S) (권장하지 않습니다)
+FileAbortRetryIgnoreIgnoreNotRecommended=오류를 무시하고 진행(&I) (권장하지 않습니다)
+SourceIsCorrupted=원본 파일이 손상됨
+SourceDoesntExist=원본 파일 %1이(가) 존재하지 않음
+ExistingFileReadOnly2=기존 파일은 읽기 전용이기때문에 대체할 수 없습니다.
+ExistingFileReadOnlyRetry=읽기 전용 속성을 해제하고 다시 시도하려면(&R)
+ExistingFileReadOnlyKeepExisting=기존 파일을 유지(&K)
+ErrorReadingExistingDest=기존 파일을 읽는 동안 오류 발생:
+FileExists=파일이 이미 존재합니다.%n%n파일을 덮어쓰시겠습니까?
+ExistingFileNewer=기존 파일이 설치하려고 하는 파일보다 새 파일입니다, 기존 파일을 유지하시기 바랍니다.%n%n기존 파일을 유지하시겠습니까?
+ErrorChangingAttr=기존 파일의 속성을 변경하는 동안 오류 발생:
+ErrorCreatingTemp=대상 폴더에 파일을 만드는 동안 오류 발생:
+ErrorReadingSource=원본 파일을 읽는 동안 오류 발생:
+ErrorCopying=파일을 복사하는 동안 오류 발생:
+ErrorReplacingExistingFile=기존 파일을 교체하는 동안 오류 발생:
 ErrorRestartReplace=RestartReplace 실패:
-ErrorRenamingTemp=대상 디렉터리에 있는 파일 이름을 바꾸는 중 오류 발생:
-ErrorRegisterServer=DLL/OCX를 등록할 수 없음: %1
-ErrorRegSvr32Failed=종료 코드 %1과(와) 함께 RegSvr32 실패
-ErrorRegisterTypeLib=형식 라이브러리를 등록할 수 없음: %1
+ErrorRenamingTemp=대상 폴더 내의 파일 이름을 바꾸는 동안 오류 발생:
+ErrorRegisterServer=DLL/OCX 등록 실패: %1
+ErrorRegSvr32Failed=RegSvr32가 다음 종료 코드로 실패: %1
+ErrorRegisterTypeLib=다음 유형의 라이브러리 등록에 실패: %1
+
+; *** Uninstall display name markings
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32비트
+UninstallDisplayNameMark64Bit=64비트
+UninstallDisplayNameMarkAllUsers=모든 사용자
+UninstallDisplayNameMarkCurrentUser=현재 사용자
+
 ; *** Post-installation errors
-ErrorOpeningReadme=README 파일을 여는 중에 오류가 발생했습니다.
-ErrorRestartingComputer=설치 프로그램에서 컴퓨터를 다시 시작할 수 없습니다. 수동으로 진행하세요.
+ErrorOpeningReadme=README 파일을 여는 중 오류가 발생했습니다.
+ErrorRestartingComputer=컴퓨터를 다시 시작할 수 없습니다, 수동으로 다시 시작하십시오.
+
 ; *** Uninstaller messages
-UninstallNotFound=파일 "%1"이(가) 없습니다. 제거할 수 없습니다.
-UninstallOpenError=파일 "%1"을(를) 열 수 없습니다. 제거할 수 없습니다.
-UninstallUnsupportedVer=제거 로그 파일 "%1"이(가) 이 버전의 제거 프로그램에서 인식하지 못하는 형식입니다. 제거할 수 없습니다.
-UninstallUnknownEntry=제거 로그에서 알 수 없는 항목(%1)이 발견되었습니다.
-ConfirmUninstall=%1과(와) 해당 구성 요소를 모두 완전히 제거하시겠습니까?
-UninstallOnlyOnWin64=이 설치는 64비트 Windows에서만 제거할 수 있습니다.
-OnlyAdminCanUninstall=이 설치는 관리자 권한이 있는 사용자만 제거할 수 있습니다.
-UninstallStatusLabel=컴퓨터에서 %1을(를) 제거하는 동안 기다려 주세요.
-UninstalledAll=컴퓨터에서 %1을(를) 제거했습니다.
-UninstalledMost=%1 제거가 완료되었습니다.%n%n일부 요소는 제거할 수 없습니다. 이러한 항목은 수동으로 제거할 수 있습니다.
-UninstalledAndNeedsRestart=%1 제거를 완료하려면 컴퓨터를 다시 시작해야 합니다.%n%n지금 다시 시작하시겠습니까?
-UninstallDataCorrupted="%1" 파일이 손상되었습니다. 제거할 수 없습니다.
+UninstallNotFound=파일 %1이(가) 존재하지 않기 때문에, 제거를 실행할 수 없습니다.
+UninstallOpenError=파일 %1을(를) 열 수 없기 때문에, 제거를 실행할 수 없습니다.
+UninstallUnsupportedVer=삭제 로그 파일 "%1"은(는) 이 삭제 마법사로 인식할 수 없는 형식이기 때문에, 제거를 실행할 수 없습니다.
+UninstallUnknownEntry=알 수 없는 항목 %1이(가) 삭제 로그에 포함되어 있습니다.
+ConfirmUninstall=정말 %1와(과) 그 구성 요소를 모두 제거하시겠습니까?
+UninstallOnlyOnWin64=이 프로그램은 64비트 Windows에서만 제거할 수 있습니다.
+OnlyAdminCanUninstall=이 프로그램을 제거하려면 관리자 권한이 필요합니다.
+UninstallStatusLabel=귀하의 컴퓨터에서 %1을(를) 제거하는 중... 잠시 기다려 주십시오.
+UninstalledAll=%1이(가) 성공적으로 제거되었습니다!
+UninstalledMost=%1 제거가 완료되었습니다.%n%n일부 요소는 삭제할 수 없으니, 수동으로 제거하시기 바랍니다.
+UninstalledAndNeedsRestart=%1의 제거를 완료하려면, 컴퓨터를 다시 시작해야 합니다.%n%n지금 다시 시작하시겠습니까?
+UninstallDataCorrupted=파일 "%1"이(가) 손상되었기 때문에, 제거를 실행할 수 없습니다.
+
 ; *** Uninstallation phase messages
 ConfirmDeleteSharedFileTitle=공유 파일을 제거하시겠습니까?
-ConfirmDeleteSharedFile2=시스템에서는 이제 다음 공유 파일을 사용하는 프로그램이 없는 것으로 표시됩니다. 제거 작업을 통해 이 공유 파일을 제거하시겠습니까?%n%n아직 이 파일을 사용하는 프로그램이 있는데 이 파일을 제거하면 해당 프로그램이 올바르게 작동하지 않을 수 있습니다. 잘 모르는 경우 [아니요]를 선택하세요. 시스템에 파일을 그대로 두어도 아무런 문제가 발생하지 않습니다.
+ConfirmDeleteSharedFile2=시스템의 어떤 프로그램도 다음 공유 파일을 사용하지 않습니다, 이 공유 파일을 삭제하시겠습니까?%n%n이 파일을 다른 프로그램이 공유하고 있는 상태에서 이 파일을 제거할 경우, 해당 프로그램이 제대로 작동하지 않을 수 있으니, 확신이 없으면 "아니오"를 선택하셔도 됩니다. 시스템에 파일이 남아 있어도 문제가 되진 않습니다.
 SharedFileNameLabel=파일 이름:
 SharedFileLocationLabel=위치:
 WizardUninstalling=제거 상태
 StatusUninstalling=%1을(를) 제거하는 중...
+
 ; *** Shutdown block reasons
 ShutdownBlockReasonInstallingApp=%1을(를) 설치하는 중입니다.
 ShutdownBlockReasonUninstallingApp=%1을(를) 제거하는 중입니다.
+
 ; The custom messages below aren't used by Setup itself, but if you make
 ; use of them in your scripts, you'll want to translate them.
+
 [CustomMessages]
+
 NameAndVersion=%1 버전 %2
-AdditionalIcons=추가 바로 가기:
-CreateDesktopIcon=바탕 화면 바로 가기 만들기(&D)
-CreateQuickLaunchIcon=빠른 실행 바로 가기 만들기(&Q)
-ProgramOnTheWeb=%1 웹 정보
+AdditionalIcons=아이콘 추가:
+CreateDesktopIcon=바탕 화면에 바로가기 만들기(&D)
+CreateQuickLaunchIcon=빠른 실행 아이콘 만들기(&Q)
+ProgramOnTheWeb=%1 웹페이지
 UninstallProgram=%1 제거
-LaunchProgram=%1 시작
-AssocFileExtension=%1을(를) %2 파일 확장명과 연결(&A)
-AssocingFileExtension=%1을(를) %2 파일 확장명과 연결 중...
+LaunchProgram=%1 실행
+AssocFileExtension=파일 확장자 %2을(를) %1에 연결합니다.
+AssocingFileExtension=파일 확장자 %2을(를) %1에 연결하는 중...
 AutoStartProgramGroupDescription=시작:
-AutoStartProgram=%1 자동 시작
-AddonHostProgramNotFound=선택한 폴더에서 %1을(를) 찾을 수 없습니다.%n%n그래도 계속하시겠습니까?
+AutoStartProgram=%1을(를) 자동으로 시작
+AddonHostProgramNotFound=%1은(는) 선택한 폴더에 위치할 수 없습니다.%n%n그래도 계속하시겠습니까?