Fix Notebook Viewlet Highlighting (#10868) (#10870)

* Stop double tree data provider registrations

* revert book finding logic, leverage currentBook

.devcontainer/Dockerfile

@@ -1,121 +0,0 @@
-#-------------------------------------------------------------------------------------------------------------
-# 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

@@ -1,82 +0,0 @@
-# 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

@@ -1,91 +0,0 @@
-#!/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

@@ -1,25 +0,0 @@
-#!/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

@@ -1,45 +0,0 @@
-{
-	"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

@@ -1,9 +0,0 @@
-[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

@@ -1,9 +0,0 @@
-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

@@ -1,16 +0,0 @@
-[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,15 +42,7 @@
         "jsdoc/no-types": "warn",
         "semi": "off",
         "@typescript-eslint/semi": "warn",
-        "@typescript-eslint/naming-convention": [
-            "warn",
-            {
-                "selector": "class",
-                "format": [
-                    "PascalCase"
-                ]
-            }
-        ],
+        "@typescript-eslint/class-name-casing": "warn",
         "code-no-unused-expressions": [
             "warn",
             {
@@ -71,18 +63,13 @@
                 "browser": [
                     "common"
                 ],
-                "electron-sandbox": [
+                "electron-main": [
                     "common",
-                    "browser"
+                    "node"
                 ],
                 "electron-browser": [
                     "common",
                     "browser",
-                    "node",
-                    "electron-sandbox"
-                ],
-                "electron-main": [
-                    "common",
                     "node"
                 ]
             }
@@ -119,14 +106,6 @@
                     "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": [
@@ -176,22 +155,13 @@
                     "*" // 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-sandbox,electron-browser}/**",
-                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -221,10 +191,10 @@
                     "typemoq",
                     "sinon",
                     "vs/nls",
-                    "azdata",
+					"azdata",
                     "**/{vs,sql}/base/common/**",
-                    "**/{vs,sql}/base/parts/*/common/**",
                     "**/{vs,sql}/base/test/common/**",
+                    "**/{vs,sql}/base/parts/*/common/**",
                     "**/{vs,sql}/platform/*/common/**",
                     "**/{vs,sql}/platform/*/test/common/**"
                 ]
@@ -251,25 +221,15 @@
                     "*" // 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,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}/base/{common,browser,node}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser,node,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -482,34 +442,18 @@
                     "**/{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-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}/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}/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
-                    "**/{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/{common,browser,node,electron-browser,api}/**",
+                    "**/{vs,sql}/workbench/services/*/{common,browser,node,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -521,7 +465,7 @@
                     "**/{vs,sql}/base/**",
                     "**/{vs,sql}/platform/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser}/**",
                     "vs/workbench/contrib/files/common/editors/fileEditorInput",
                     "**/{vs,sql}/workbench/services/**",
                     "**/{vs,sql}/workbench/test/**",
@@ -542,9 +486,7 @@
                     "**/{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",
-                    "iconv-lite-umd",
-                    "semver-umd"
+                    "vscode-oniguruma"
                 ]
             },
             {
@@ -595,30 +537,16 @@
                     "*" // 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-sandbox,electron-browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{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/{common,browser,node,electron-browser,api}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-browser}/**",
                     "*" // node modules
                 ]
             },
@@ -631,7 +559,7 @@
                     "**/{vs,sql}/base/**",
                     "**/{vs,sql}/platform/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{vs,sql}/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser}/**",
                     "**/{vs,sql}/workbench/services/**",
                     "**/{vs,sql}/workbench/contrib/**",
                     "**/{vs,sql}/workbench/test/**",
@@ -735,47 +663,20 @@
                     "*" // 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-sandbox,electron-browser}/**",
-                    "**/{vs,sql}/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
                     "**/{vs,sql}/editor/**",
-                    "**/{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}/**",
+                    "**/{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}/**",
                     "*" // 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": [
@@ -792,10 +693,10 @@
                 "restrictions": [
                     "vs/nls",
                     "vs/css!./**/*",
-                    "**/{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}/**",
+                    "**/{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}/**",
                     "*" // node modules
                 ]
             },
@@ -823,66 +724,6 @@
                     "*" // 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/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 `main` branch.
+* Ensure that the code is up-to-date with the `master` 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:
-      - main
+      - master
       - release/*
   pull_request:
     branches:
-      - main
+      - master
       - release/*
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v1
     # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
     - run: |
         sudo apt-get update
@@ -72,7 +72,7 @@ jobs:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v1
     - uses: actions/setup-node@v1
       with:
         node-version: 10
@@ -108,7 +108,7 @@ jobs:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-    - uses: actions/checkout@v2.2.0
+    - uses: actions/checkout@v1
     - uses: actions/setup-node@v1
       with:
         node-version: 10
@@ -141,7 +141,7 @@ jobs:
   #     CHILD_CONCURRENCY: "1"
   #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   #   steps:
-  #   - uses: actions/checkout@v2.2.0
+  #   - uses: actions/checkout@v1
   #   # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
   #   - run: |
   #       sudo apt-get update

.github/workflows/codeql.yml

@@ -1,46 +0,0 @@
-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.2.0
+        uses: actions/checkout@v2
         with:
           repository: 'microsoft/azuredatastudio'
-          ref: main
+          ref: master
           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: main
+          ref: master
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions/build/actions

.gitignore

@@ -24,7 +24,6 @@ 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,13 +20,15 @@
 			"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": {
@@ -58,7 +60,6 @@
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to Main Process",
-			"timeout": 30000,
 			"port": 5875,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
@@ -90,10 +91,9 @@
 			"port": 9222,
 			"timeout": 20000,
 			"env": {
-				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
-				"VSCODE_SKIP_PRELAUNCH": "1"
+				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null
 			},
-			"cleanUp": "wholeBrowser",
+			"breakOnLoad": false,
 			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
 				"--inspect=5875",
@@ -106,14 +106,40 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
-			"browserLaunchLocation": "workspace",
-			"preLaunchTask": "Ensure Prelaunch Dependencies",
+			"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
 		},
 		{
 			"type": "chrome",
 			"request": "launch",
 			"name": "Launch ADS (Web) (TBD)",
-			"program": "${workspaceFolder}/resources/serverless/code-web.js",
+			"runtimeExecutable": "yarn",
+			"runtimeArgs": [
+				"web"
+			],
 			"presentation": {
 				"group": "0_vscode",
 				"order": 2
@@ -149,18 +175,6 @@
 				"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",
@@ -267,7 +281,6 @@
 		},
 		{
 			"name": "Azure Data Studio",
-			"stopAll": true,
 			"configurations": [
 				"Launch azuredatastudio",
 				"Attach to Main Process",

.vscode/notebooks/api.github-issues

@@ -1,38 +0,0 @@
-[
-  {
-    "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

@@ -1,47 +0,0 @@
-[
-  {
-    "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

@@ -1,98 +0,0 @@
-[
-  {
-    "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

@@ -1,55 +0,0 @@
-[
-  {
-    "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
 
-14 results - 4 files
+16 results - 5 files
 
 src/vs/base/browser/dom.ts:
   81  };
@@ -34,11 +34,24 @@ src/vs/base/common/arrays.ts:
   420   */
   421  export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
 
-  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 {
+  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[] {
 
 src/vs/base/common/objects.ts:
   115  
@@ -66,8 +79,8 @@ src/vs/base/common/strings.ts:
   170   */
   171  export function endsWith(haystack: string, needle: string): boolean {
 
-  861  
-  862  /**
-  863:  * @deprecated ES6
-  864   */
-  865  export function repeat(s: string, count: number): string {
+  853  
+  854  /**
+  855:  * @deprecated ES6
+  856   */
+  857  export function repeat(s: string, count: number): string {

.vscode/settings.json

@@ -26,7 +26,6 @@
 		"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": [
@@ -73,7 +72,7 @@
 	},
 	"gulp.autoDetect": "off",
 	"files.insertFinalNewline": true,
-	"[typescript]": {
+  "[typescript]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
 	},
 	"typescript.tsc.autoDetect": "off"

.vscode/tasks.json

@@ -3,95 +3,34 @@
 	"tasks": [
 		{
 			"type": "npm",
-			"script": "watch-clientd",
-			"label": "Build VS Code Core",
-			"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": "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"
-				}
-			}
-		},
-		{
+			"script": "watchd",
 			"label": "Build VS Code",
-			"dependsOn": [
-				"Build VS Code Core",
-				"Build VS Code Extensions"
-			],
 			"group": {
 				"kind": "build",
 				"isDefault": true
+			},
+			"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-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",
@@ -108,39 +47,12 @@
 		},
 		{
 			"type": "npm",
-			"script": "watch-webd",
-			"label": "Build Web Extensions",
+			"script": "kill-watchd",
+			"label": "Kill Build VS Code",
 			"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"
 		},
 		{
@@ -177,7 +89,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "yarn web --no-launch",
+			"command": "yarn web -- --no-launch",
 			"label": "Run web",
 			"isBackground": true,
 			"problemMatcher": {
@@ -200,14 +112,6 @@
 				"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.3.2"
+target "7.2.4"
 runtime "electron"

CHANGELOG.md

@@ -1,31 +1,5 @@
 # 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

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=main)](https://dev.azure.com/azuredatastudio/azuredatastudio/_build/latest?definitionId=4&branchName=main)
+[![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)
 [![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 `main`:
+## Try out the latest insiders build from `master`:
 - [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/main/CHANGELOG.md) for additional details of what's in this release.
+See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/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/main/CHAN
 
 Here are some of these features in action.
 
-<img src='https://github.com/Microsoft/azuredatastudio/blob/main/docs/overview_screen.jpg' width='800px'>
+<img src='https://github.com/Microsoft/azuredatastudio/blob/master/docs/overview_screen.jpg' width='800px'>
 
 ## Contributing
 If you are interested in fixing issues and contributing directly to the code base,
@@ -121,7 +121,7 @@ We would like to thank all our users who raised issues, and in particular the fo
 * olljanat for `Implemented npm version check (#314)`
 * Adam Machanic for helping with the `whoisactive` extension
 
-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)
+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)
 
 ## License
 
@@ -129,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=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
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2127522
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2127432
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2127716
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2127431
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2127523
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2127433
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2127524

ThirdPartyNotices.txt

@@ -72,8 +72,6 @@ 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
@@ -2227,51 +2225,6 @@ 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:
-  - main
+  - master
   - release/*
 
 jobs:

build/.webignore

@@ -1,27 +0,0 @@
-# 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
-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 .
+$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 .
 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 main
+	// Insiders: nightly build from master
 	const isReleased = (
 		(
-			(quality === 'insider' && /^main$|^refs\/heads\/main$/.test(sourceBranch)) ||
+			(quality === 'insider' && /^master$|^refs\/heads\/master$/.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

@@ -0,0 +1,228 @@
+/*---------------------------------------------------------------------------------------------
+ *  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

@@ -1,12 +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>
-    <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,7 +29,15 @@ steps:
     yarn electron x64
   displayName: Download Electron
 
-# - script: | {{SQL CARBON EDIT}} remove editor checks
+- 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
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
 
@@ -57,13 +65,12 @@ 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'
-  continueOnError: true
-  condition: failed()
+# - task: PublishPipelineArtifact@0
+#   inputs:
+#     artifactName: crash-dump-macos
+#     targetPath: .build/crashes
+#   displayName: 'Publish Crash Reports'
+#   condition: succeededOrFailed()
 
 - task: PublishTestResults@2
   displayName: Publish Tests Results

build/azure-pipelines/darwin/entitlements.plist

@@ -0,0 +1,6 @@
+<?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,18 +157,24 @@ steps:
     artifactName: crash-dump-macos
     targetPath: .build/crashes
   displayName: 'Publish Crash Reports'
-  continueOnError: true
-  condition: failed()
+  condition: succeededOrFailed()
 
 - 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
-    DEBUG=electron-osx-sign* node build/darwin/sign.js
+    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"
   displayName: Set Hardened Entitlements
 
 - script: |
@@ -242,28 +248,16 @@ 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,3 +17,11 @@ 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

@@ -1,82 +0,0 @@
-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: "12.13.0"
+      versionSpec: '10.15.3'
 
   - 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'
@@ -131,11 +131,9 @@ steps:
 
   # - 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: |
@@ -173,16 +171,55 @@ steps:
       pushd ../azuredatastudio-darwin
       ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
       popd
-    displayName: 'Archive (no signing)'
-    condition: and(succeeded(), eq(variables['signed'], false))
+    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))
 
   - script: |
-      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'
+      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
     condition: and(succeeded(), eq(variables['signed'], true))
 
   - script: |

build/azure-pipelines/distro-build.yml

@@ -3,10 +3,10 @@ pool:
 
 trigger:
   branches:
-    include: ['main', 'release/*']
+    include: ['master', 'release/*']
 pr:
   branches:
-    include: ['main', 'release/*']
+    include: ['master', '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 main branch into oss/master
-    git push distro origin/main:refs/heads/oss/master
+    # Push master branch into oss/master
+    git push distro origin/master: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: "12.13.0"
+      versionSpec: '10.15.1'
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:

build/azure-pipelines/exploration-build.yml

@@ -3,10 +3,10 @@ pool:
 
 trigger:
   branches:
-    include: ['main']
+    include: ['master']
 pr:
   branches:
-    include: ['main']
+    include: ['master']
 
 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-x.y.z
+    git checkout origin/electron-8.0.x
     git merge origin/master
 
     # Push master branch into exploration branch
-    git push origin HEAD:electron-x.y.z
+    git push origin HEAD:electron-8.0.x
 
   displayName: Sync & Merge Exploration

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

@@ -81,14 +81,6 @@ 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,6 +107,7 @@ 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,8 +145,7 @@ steps:
     artifactName: crash-dump-linux
     targetPath: .build/crashes
   displayName: 'Publish Crash Reports'
-  continueOnError: true
-  condition: failed()
+  condition: succeededOrFailed()
 
 - script: |
     set -e
@@ -179,6 +178,7 @@ 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,6 +27,11 @@ 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,6 +1,3 @@
-parameters:
-  extensionsToUnitTest: []
-
 steps:
   - script: |
       mkdir -p .build
@@ -24,7 +21,7 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.13.0"
+      versionSpec: '10.15.1'
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -129,15 +126,14 @@ steps:
     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
+      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'
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
   - script: |
       set -e
@@ -164,12 +160,12 @@ steps:
       ./build/azure-pipelines/linux/createDrop.sh
     displayName: Create Drop
 
-  - 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: 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'
 
   - task: PublishTestResults@2
     displayName: 'Publish Test Results test-results.xml'

build/azure-pipelines/mixin.js

@@ -12,8 +12,6 @@ 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'];
@@ -23,7 +21,7 @@ function main() {
 		return;
 	}
 
-	const productJsonFilter = filter(f => f.relative === 'product.json', { restore: true });
+	const productJsonFilter = filter('**/product.json', { restore: true });
 
 	fancyLog(ansiColors.blue('[mixin]'), `Mixing in sources:`);
 	return vfs
@@ -31,32 +29,7 @@ function main() {
 		.pipe(filter(f => !f.isDirectory()))
 		.pipe(productJsonFilter)
 		.pipe(buffer())
-		.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(json(o => Object.assign({}, require('../../product.json'), o)))
 		.pipe(productJsonFilter.restore)
 		.pipe(es.mapSync(function (f) {
 			fancyLog(ansiColors.blue('[mixin]'), f.relative, ansiColors.green('✔︎'));

build/azure-pipelines/product-build.yml

@@ -36,17 +36,6 @@ 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:
@@ -160,4 +149,4 @@ schedules:
   displayName: Mon-Fri at 7:00
   branches:
     include:
-    - main
+    - master

build/azure-pipelines/product-compile.yml

@@ -72,6 +72,29 @@ 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,18 +36,6 @@ 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 = [
 		`/*---------------------------------------------------------------------------------------------`,
@@ -56,7 +44,7 @@ function getNewFileContent(content: string, tag: string) {
 		` *--------------------------------------------------------------------------------------------*/`
 	].join('\n');
 
-	return convertTabsToSpaces(getNewFileHeader(tag) + content.slice(oldheader.length));
+	return 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:2
+    image: sqltoolscontainers.azurecr.io/linux-build-agent:1
     endpoint: ContainerRegistry
 
 jobs:
@@ -26,16 +26,6 @@ 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: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
   pool:
@@ -45,22 +35,8 @@ 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:
@@ -101,10 +77,15 @@ 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,7 +15,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "10.15.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
   inputs:
@@ -101,14 +101,6 @@ 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
 

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

@@ -1,108 +0,0 @@
-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,7 +36,15 @@ steps:
     yarn electron
   displayName: Download Electron
 
-# - powershell: | {{SQL CARBON EDIT}} remove editor check
+- 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
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
 
@@ -64,13 +72,12 @@ 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
-  continueOnError: true
-  condition: failed()
+# - task: PublishPipelineArtifact@0
+#   displayName: 'Publish Crash Reports'
+#   inputs:
+#     artifactName: crash-dump-windows
+#     targetPath: .build\crashes
+#   condition: succeededOrFailed()
 
 - task: PublishTestResults@2
   displayName: Publish Tests Results

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

@@ -1,190 +0,0 @@
-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,8 +154,7 @@ steps:
     artifactName: crash-dump-windows-$(VSCODE_ARCH)
     targetPath: .build\crashes
   displayName: 'Publish Crash Reports'
-  continueOnError: true
-  condition: failed()
+  condition: succeededOrFailed()
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
@@ -218,7 +217,7 @@ steps:
     restoreSolution: 'build\azure-pipelines\win32\ESRPClient\packages.config'
     feedsToUse: config
     nugetConfigPath: 'build\azure-pipelines\win32\ESRPClient\NuGet.config'
-    externalFeedCredentials: 'ESRP Nuget'
+    externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
     restoreDirectory: packages
 
 - task: ESRPImportCertTask@1
@@ -236,6 +235,7 @@ 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,21 +16,22 @@ $ServerZip = "$Repo\.build\vscode-server-win32-$Arch.zip"
 $Build = "$Root\VSCode-win32-$Arch"
 
 # Create server archive
-if ("$Arch" -ne "arm64") {
-	exec { xcopy $LegacyServer $Server /H /E /I }
-	exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r }
-}
+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-$Arch" }
+$AssetPlatform = if ("$Arch" -eq "ia32") { "win32" } else { "win32-x64" }
 
 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 }
 
-if ("$Arch" -ne "arm64") {
-	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 }

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

@@ -21,7 +21,7 @@ steps:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.13.0"
+      versionSpec: "10.15.1"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     inputs:
@@ -103,17 +103,6 @@ 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"

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

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "10.15.1"
 
 - 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, enableWebSQL: false, nativeWindowOpen: true } });
+	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: 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

@@ -1,61 +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';
-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

@@ -1,90 +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 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,7 +127,6 @@ 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') {
@@ -143,7 +142,7 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 	console.log(result.stdout.toString());
 	console.log(result.stderr.toString());
 
-	if (FAIL_ON_PURPOSE || result.status !== 0) {
+	if (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,11 +8,9 @@ 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');
@@ -23,8 +21,6 @@ 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');
@@ -40,7 +36,7 @@ const compilations = glob.sync('**/tsconfig.json', {
 	ignore: ['**/out/**', '**/node_modules/**']
 });
 
-const getBaseUrl = out => `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}/${out}`;
+const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;
 
 const tasks = compilations.map(function (tsconfigFile) {
 	const absolutePath = path.join(extensionsPath, tsconfigFile);
@@ -171,84 +167,9 @@ 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(false).pipe(gulp.dest('.build'))),
-	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
+	task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream().pipe(gulp.dest('.build'))),
+	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream().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,7 +60,6 @@ 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/**',
@@ -86,7 +85,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,darwin}/**/*.js',
+	'!build/{lib,download}/**/*.js',
 	'!build/**/*.sh',
 	'!build/azure-pipelines/**/*.js',
 	'!build/azure-pipelines/**/*.config',
@@ -109,7 +108,6 @@ const indentationFilter = [
 	'!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'
@@ -144,7 +142,6 @@ 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',
@@ -177,8 +174,7 @@ const copyrightFilter = [
 	'!**/*.gif',
 	'!**/*.xlf',
 	'!**/*.dacpac',
-	'!**/*.bacpac',
-	'!**/*.py'
+	'!**/*.bacpac'
 ];
 
 const jsHygieneFilter = [

build/gulpfile.vscode.js

@@ -36,12 +36,28 @@ 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
 ]);
@@ -53,23 +69,19 @@ 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',
@@ -77,6 +89,7 @@ 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}',
@@ -96,7 +109,6 @@ 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/**'
 ];
@@ -107,17 +119,23 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
 		src: 'out-build',
 		entryPoints: vscodeEntryPoints,
 		resources: vscodeResources,
-		loaderConfig: common.loaderConfig(),
+		loaderConfig: common.loaderConfig(nodeModules),
 		out: 'out-vscode',
 		bundleInfo: undefined
 	})
 ));
 gulp.task(optimizeVSCodeTask);
 
-const sourceMappingURLBase = `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}`;
+const sourceMappingURLBase = `https://ticino.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);
@@ -166,7 +184,6 @@ 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,7 +66,6 @@ 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);
@@ -90,12 +89,12 @@ function buildWin32Setup(arch, target) {
 			ShellNameShort: product.win32ShellNameShort,
 			AppMutex: product.win32MutexName,
 			Arch: arch,
-			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],
+			AppId: arch === 'ia32' ? ia32AppId : x64AppId,
+			IncompatibleTargetAppId: arch === 'ia32' ? product.win32AppId : product.win32x64AppId,
+			IncompatibleArchAppId: arch === 'ia32' ? x64AppId : ia32AppId,
 			AppUserId: product.win32AppUserModelId,
-			ArchitecturesAllowed: { 'ia32': '', 'x64': 'x64', 'arm64': 'arm64' }[arch],
-			ArchitecturesInstallIn64BitMode: { 'ia32': '', 'x64': 'x64', 'arm64': 'arm64' }[arch],
+			ArchitecturesAllowed: arch === 'ia32' ? '' : 'x64',
+			ArchitecturesInstallIn64BitMode: arch === 'ia32' ? '' : 'x64',
 			SourceDir: sourcePath,
 			RepoDir: repoPath,
 			OutputDir: outputPath,
@@ -114,10 +113,8 @@ 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 => {
@@ -149,7 +146,6 @@ 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));
 }
 
-exports.getBuiltInExtensions = function getBuiltInExtensions() {
+function main() {
 	log('Syncronizing built-in extensions...');
 	log(`You can manage built-in extensions with the ${ansiColors.cyan('--builtin')} flag`);
 
@@ -116,16 +116,14 @@ exports.getBuiltInExtensions = function getBuiltInExtensions() {
 
 	writeControlFile(control);
 
-	return new Promise((resolve, reject) => {
-		es.merge(streams)
-			.on('error', reject)
-			.on('end', resolve);
-	});
-};
-
-if (require.main === module) {
-	exports.getBuiltInExtensions().then(() => process.exit(0)).catch(err => {
-		console.error(err);
-		process.exit(1);
-	});
+	es.merge(streams)
+		.on('error', err => {
+			console.error(err);
+			process.exit(1);
+		})
+		.on('end', () => {
+			process.exit(0);
+		});
 }
+
+main();

build/lib/compilation.js

@@ -18,7 +18,6 @@ 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) {
@@ -70,9 +69,6 @@ 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,7 +18,6 @@ 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');
@@ -82,11 +81,6 @@ 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 = void 0;
+exports.config = exports.getElectronVersion = void 0;
 const fs = require("fs");
 const path = require("path");
 const vfs = require("vinyl-fs");
@@ -16,6 +16,12 @@ 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 {
@@ -27,7 +33,7 @@ function darwinBundleDocumentType(extensions, icon) {
     };
 }
 exports.config = {
-    version: util.getElectronVersion(),
+    version: getElectronVersion(),
     productAppName: product.nameLong,
     companyName: 'Microsoft Corporation',
     copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
@@ -67,7 +73,7 @@ function getElectron(arch) {
     };
 }
 async function main(arch = process.arch) {
-    const version = util.getElectronVersion();
+    const version = 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,6 +19,12 @@ 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) {
@@ -32,7 +38,7 @@ function darwinBundleDocumentType(extensions: string[], icon: string) {
 }
 
 export const config = {
-	version: util.getElectronVersion(),
+	version: getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
 	copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
@@ -75,7 +81,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 }
 
 async function main(arch = process.arch): Promise<void> {
-	const version = util.getElectronVersion();
+	const version = 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,10 +13,6 @@ 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,9 +15,6 @@ 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.translatePackageJSON = exports.packageRebuildExtensionsStream = exports.cleanRebuildExtensions = exports.packageExternalExtensionsStream = exports.scanBuiltinExtensions = exports.packageMarketplaceExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = void 0;
+exports.packageRebuildExtensionsStream = exports.cleanRebuildExtensions = exports.packageExternalExtensionsStream = exports.packageMarketplaceExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = void 0;
 const es = require("event-stream");
 const fs = require("fs");
 const glob = require("glob");
@@ -22,66 +22,33 @@ 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://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}`;
-function minifyExtensionResources(input) {
-    const jsonFilter = filter(['**/*.json', '**/*.code-snippets'], { restore: true });
-    return input
-        .pipe(jsonFilter)
-        .pipe(buffer())
-        .pipe(es.mapSync((f) => {
-        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(jsonFilter.restore);
-}
-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)
+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);
-    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;
+    const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
+    return input
+        .pipe(tmLanguageJsonFilter)
+        .pipe(buffer())
+        .pipe(es.mapSync((f) => {
+        f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
+        return f;
+    }))
+        .pipe(tmLanguageJsonFilter.restore);
 }
-function fromLocalWebpack(extensionPath, webpackConfigFileName) {
+function fromLocalWebpack(extensionPath) {
     const result = es.through();
     const packagedDependencies = [];
     const packageJsonConfig = require(path.join(extensionPath, 'package.json'));
     if (packageJsonConfig.dependencies) {
-        const webpackRootConfig = require(path.join(extensionPath, webpackConfigFileName));
+        const webpackRootConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
         for (const key in webpackRootConfig.externals) {
             if (key in packageJsonConfig.dependencies) {
                 packagedDependencies.push(key);
@@ -97,9 +64,30 @@ function fromLocalWebpack(extensionPath, webpackConfigFileName) {
             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.
-        const webpackConfigLocations = glob.sync(path.join(extensionPath, '**', webpackConfigFileName), { ignore: ['**/node_modules'] });
+        // 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);
         const webpackStreams = webpackConfigLocations.map(webpackConfigPath => {
             const webpackDone = (err, stats) => {
                 fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
@@ -133,7 +121,7 @@ function fromLocalWebpack(extensionPath, webpackConfigFileName) {
                 this.emit('data', data);
             }));
         });
-        es.merge(...webpackStreams, es.readArray(files))
+        es.merge(...webpackStreams, patchFilesStream)
             // .pipe(es.through(function (data) {
             // 	// debug
             // 	console.log('out', data.path, data.contents.length);
@@ -194,6 +182,7 @@ 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',
@@ -210,7 +199,6 @@ const externalExtensions = [
     'admin-tool-ext-win',
     'agent',
     'arc',
-    'azdata',
     'import',
     'profiler',
     'admin-pack',
@@ -221,116 +209,42 @@ const externalExtensions = [
     'liveshare',
     'sql-database-projects',
     'machine-learning',
-    'sql-assessment',
-    'asde-deployment',
-    'sql-migration'
+    'sql-assessment'
 ];
 // extensions that require a rebuild since they have native parts
 const rebuildExtensions = [
     'big-data-cluster',
     'mssql'
 ];
-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')
+const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
+function packageLocalExtensionsStream() {
+    const localExtensionDescriptions = 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 };
+        return { name: extensionName, path: extensionPath };
     })
-        .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)
+        .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}`));
-    })));
-    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'])));
+    });
+    return es.merge(nodeModules, ...localExtensions)
+        .pipe(util2.setExecutableBit(['**/*.sh']));
 }
 exports.packageLocalExtensionsStream = packageLocalExtensionsStream;
-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)
+function packageMarketplaceExtensionsStream() {
+    const extensions = builtInExtensions.map(extension => {
+        return fromMarketplace(extension.name, extension.version, extension.metadata)
             .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-        return updateExtensionPackageJSON(input, (data) => {
-            delete data.scripts;
-            delete data.dependencies;
-            delete data.devDependencies;
-            return data;
-        });
-    })));
-    return (marketplaceExtensionsStream
-        .pipe(util2.setExecutableBit(['**/*.sh'])));
+    });
+    return es.merge(extensions)
+        .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 => {
@@ -340,13 +254,13 @@ function packageExternalExtensionsStream() {
     })
         .filter(({ name }) => externalExtensions.indexOf(name) >= 0);
     const builtExtensions = extenalExtensionDescriptions.map(extension => {
-        return fromLocal(extension.path, false)
+        return fromLocal(extension.path)
             .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
     });
     return es.merge(builtExtensions);
 }
 exports.packageExternalExtensionsStream = packageExternalExtensionsStream;
-// {{SQL CARBON EDIT}} start
+// {{SQL CARBON EDIT}} - End
 function cleanRebuildExtensions(root) {
     return Promise.all(rebuildExtensions.map(async (e) => {
         await util2.rimraf(path.join(root, e))();
@@ -362,34 +276,9 @@ function packageRebuildExtensionsStream() {
     })
         .filter(({ name }) => rebuildExtensions.indexOf(name) >= 0);
     const builtExtensions = extenalExtensionDescriptions.map(extension => {
-        return fromLocal(extension.path, false)
+        return fromLocal(extension.path)
             .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,75 +21,38 @@ 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://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}`;
+const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
 
-function minifyExtensionResources(input: Stream): Stream {
-	const jsonFilter = filter(['**/*.json', '**/*.code-snippets'], { restore: true });
-	return input
-		.pipe(jsonFilter)
-		.pipe(buffer())
-		.pipe(es.mapSync((f: File) => {
-			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(jsonFilter.restore);
-}
-
-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)
+function fromLocal(extensionPath: string): Stream {
+	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
+	const input = fs.existsSync(webpackFilename)
+		? fromLocalWebpack(extensionPath)
 		: 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;
-		});
-	}
+	const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
 
-	return input;
+	return input
+		.pipe(tmLanguageJsonFilter)
+		.pipe(buffer())
+		.pipe(es.mapSync((f: File) => {
+			f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
+			return f;
+		}))
+		.pipe(tmLanguageJsonFilter.restore);
 }
 
-
-function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string): Stream {
+function fromLocalWebpack(extensionPath: 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, webpackConfigFileName));
+		const webpackRootConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
 		for (const key in webpackRootConfig.externals) {
 			if (key in packageJsonConfig.dependencies) {
 				packagedDependencies.push(key);
@@ -107,13 +70,38 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string):
 				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.
+		// and merge its output with the files stream. also rewrite the package.json
+		// file to a new entry point
 		const webpackConfigLocations = (<string[]>glob.sync(
-			path.join(extensionPath, '**', webpackConfigFileName),
+			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: 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) => {
@@ -155,7 +143,7 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string):
 				}));
 		});
 
-		es.merge(...webpackStreams, es.readArray(files))
+		es.merge(...webpackStreams, patchFilesStream)
 			// .pipe(es.through(function (data) {
 			// 	// debug
 			// 	console.log('out', data.path, data.contents.length);
@@ -225,8 +213,10 @@ 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',
@@ -244,7 +234,6 @@ const externalExtensions = [
 	'admin-tool-ext-win',
 	'agent',
 	'arc',
-	'azdata',
 	'import',
 	'profiler',
 	'admin-pack',
@@ -255,9 +244,7 @@ const externalExtensions = [
 	'liveshare',
 	'sql-database-projects',
 	'machine-learning',
-	'sql-assessment',
-	'asde-deployment',
-	'sql-migration'
+	'sql-assessment'
 ];
 
 // extensions that require a rebuild since they have native parts
@@ -266,10 +253,6 @@ const rebuildExtensions = [
 	'mssql'
 ];
 
-const marketplaceWebExtensions = [
-	'ms-vscode.references-view'
-];
-
 interface IBuiltInExtension {
 	name: string;
 	version: string;
@@ -277,134 +260,37 @@ interface IBuiltInExtension {
 	metadata: any;
 }
 
-const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions: IBuiltInExtension[] = productJson.builtInExtensions || [];
-const webBuiltInExtensions: IBuiltInExtension[] = productJson.webBuiltInExtensions || [];
+const builtInExtensions: IBuiltInExtension[] = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 
-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 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']));
 }
 
-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}`));
-			})
-		)
-	);
+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}`));
+	});
 
-	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;
-	}
+	return es.merge(extensions)
+		.pipe(util2.setExecutableBit(['**/*.sh']));
 }
 
 export function packageExternalExtensionsStream(): NodeJS.ReadWriteStream {
@@ -417,14 +303,14 @@ export function packageExternalExtensionsStream(): NodeJS.ReadWriteStream {
 		.filter(({ name }) => externalExtensions.indexOf(name) >= 0);
 
 	const builtExtensions = extenalExtensionDescriptions.map(extension => {
-		return fromLocal(extension.path, false)
+		return fromLocal(extension.path)
 			.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))();
@@ -441,32 +327,9 @@ export function packageRebuildExtensionsStream(): NodeJS.ReadWriteStream {
 		.filter(({ name }) => rebuildExtensions.indexOf(name) >= 0);
 
 	const builtExtensions = extenalExtensionDescriptions.map(extension => {
-		return fromLocal(extension.path, false)
+		return fromLocal(extension.path)
 			.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-umd");
+const iconv = require("iconv-lite");
 const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
 function log(message, ...rest) {
     fancyLog(ansiColors.green('[i18n]'), message, ...rest);
@@ -101,158 +101,161 @@ class TextModel {
         return this._lines;
     }
 }
-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);
+let XLF = /** @class */ (() => {
+    class XLF {
+        constructor(project) {
+            this.project = project;
+            this.buffer = [];
+            this.files = Object.create(null);
+            this.numberOfMessages = 0;
         }
-        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');
+        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);
             }
-            if (!realKey || existingKeys.has(realKey)) {
-                continue;
+            this.appendFooter();
+            return this.buffer.join('\r\n');
+        }
+        addFile(original, keys, messages) {
+            if (keys.length === 0) {
+                console.log('No keys in ' + original);
+                return;
             }
-            existingKeys.add(realKey);
-            let message = encodeEntities(messages[i]);
-            this.files[original].push({ id: realKey, message: message, comment: comment });
+            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());
         }
     }
-    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());
-    }
-}
+    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;
+})();
 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;
@@ -1147,7 +1150,12 @@ function createIslFile(originalFilePath, messages, language, innoSetup) {
         if (line.length > 0) {
             let firstChar = line.charAt(0);
             if (firstChar === '[' || firstChar === ';') {
-                content.push(line);
+                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);
+                }
             }
             else {
                 let sections = line.split('=');
@@ -1176,10 +1184,9 @@ 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: Buffer.from(encoded),
+        contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage)
     });
 }
 function encodeEntities(value) {

build/lib/i18n.resources.json

@@ -138,10 +138,6 @@
 			"name": "vs/workbench/contrib/relauncher",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/contrib/sash",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/contrib/scm",
 			"project": "vscode-workbench"
@@ -218,10 +214,6 @@
 			"name": "vs/workbench/contrib/userDataSync",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/contrib/views",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/services/actions",
 			"project": "vscode-workbench"
@@ -346,10 +338,6 @@
 			"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-umd';
+import * as iconv from 'iconv-lite';
 
 const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
 
@@ -1316,7 +1316,11 @@ function createIslFile(originalFilePath: string, messages: Map<string>, language
 		if (line.length > 0) {
 			let firstChar = line.charAt(0);
 			if (firstChar === '[' || firstChar === ';') {
-				content.push(line);
+				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);
+				}
 			} else {
 				let sections: string[] = line.split('=');
 				let key = sections[0];
@@ -1343,11 +1347,10 @@ 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: Buffer.from(encoded),
+		contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage)
 	});
 }
 

build/lib/layersChecker.js

@@ -130,14 +130,6 @@ 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,15 +143,6 @@ 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,15 +28,14 @@ const REPO_ROOT_PATH = path.join(__dirname, '../..');
 function log(prefix, message) {
     fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
 }
-function loaderConfig() {
+function loaderConfig(emptyPaths) {
     const result = {
         paths: {
             'vs': 'out-build/vs',
             'sql': 'out-build/sql',
-            'vscode': 'empty:',
-            'azdata': 'empty:' // {{SQL CARBON EDIT}}
+            'vscode': 'empty:'
         },
-        amdModulesPattern: /^(vs|sql)\// // {{SQL CARBON EDIT}} include sql in regex
+        nodeModules: emptyPaths || []
     };
     result['vs/css'] = { inlineResources: true };
     return result;
@@ -72,7 +71,7 @@ function loader(src, bundledFileHeader, bundleLoader) {
     }))
         .pipe(concat('vs/loader.js')));
 }
-function toConcatStream(src, bundledFileHeader, sources, dest, fileContentMapper) {
+function toConcatStream(src, bundledFileHeader, sources, dest) {
     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
@@ -93,12 +92,10 @@ function toConcatStream(src, bundledFileHeader, sources, dest, fileContentMapper
     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: path,
+            path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
             base: base,
-            contents: Buffer.from(contents)
+            contents: Buffer.from(source.contents)
         });
     });
     return es.readArray(treatedSources)
@@ -106,9 +103,9 @@ function toConcatStream(src, bundledFileHeader, sources, dest, fileContentMapper
         .pipe(concat(dest))
         .pipe(stats_1.createStatsStream(dest));
 }
-function toBundleStream(src, bundledFileHeader, bundles, fileContentMapper) {
+function toBundleStream(src, bundledFileHeader, bundles) {
     return es.merge(bundles.map(function (bundle) {
-        return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest, fileContentMapper);
+        return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest);
     }));
 }
 const DEFAULT_FILE_HEADER = [
@@ -124,7 +121,6 @@ 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
@@ -133,7 +129,7 @@ function optimizeTask(opts) {
             if (err || !result) {
                 return bundlesStream.emit('error', JSON.stringify(err));
             }
-            toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream);
+            toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
             // Remove css inlined resources
             const filteredResources = resources.slice();
             result.cssInlinedResources.forEach(function (resource) {

build/lib/optimize.ts

@@ -18,6 +18,7 @@ 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';
@@ -31,15 +32,14 @@ function log(prefix: string, message: string): void {
 	fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
 }
 
-export function loaderConfig() {
+export function loaderConfig(emptyPaths?: string[]) {
 	const result: any = {
 		paths: {
 			'vs': 'out-build/vs',
 			'sql': 'out-build/sql', // {{SQL CARBON EDIT}}
-			'vscode': 'empty:',
-			'azdata': 'empty:' // {{SQL CARBON EDIT}}
+			'vscode': 'empty:'
 		},
-		amdModulesPattern: /^(vs|sql)\// // {{SQL CARBON EDIT}} include sql in regex
+		nodeModules: emptyPaths || []
 	};
 
 	result['vs/css'] = { inlineResources: true };
@@ -49,6 +49,10 @@ export function loaderConfig() {
 
 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`
@@ -81,7 +85,7 @@ function loader(src: string, bundledFileHeader: string, bundleLoader: boolean):
 	);
 }
 
-function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.IFile[], dest: string, fileContentMapper: (contents: string, path: string) => string): NodeJS.ReadWriteStream {
+function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.IFile[], dest: 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
@@ -105,13 +109,11 @@ 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: path,
+			path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
 			base: base,
-			contents: Buffer.from(contents)
+			contents: Buffer.from(source.contents)
 		});
 	});
 
@@ -121,9 +123,9 @@ function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.
 		.pipe(createStatsStream(dest));
 }
 
-function toBundleStream(src: string, bundledFileHeader: string, bundles: bundle.IConcatFile[], fileContentMapper: (contents: string, path: string) => string): NodeJS.ReadWriteStream {
+function toBundleStream(src: string, bundledFileHeader: string, bundles: bundle.IConcatFile[]): NodeJS.ReadWriteStream {
 	return es.merge(bundles.map(function (bundle) {
-		return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest, fileContentMapper);
+		return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest);
 	}));
 }
 
@@ -161,12 +163,6 @@ 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 = [
@@ -183,7 +179,6 @@ 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
@@ -193,7 +188,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, fileContentMapper).pipe(bundlesStream);
+			toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
 
 			// Remove css inlined resources
 			const filteredResources = resources.slice();

build/lib/preLaunch.js

@@ -1,55 +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';
-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

@@ -1,65 +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';
-
-// @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)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(program, checker, declaration)) {
+                    if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
                         enqueue_black(declaration.name);
                         for (let j = 0; j < declaration.members.length; j++) {
                             const member = declaration.members[j];
@@ -614,34 +614,6 @@ 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)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(program, checker, declaration)) {
+					if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
 						enqueue_black(declaration.name!);
 
 						for (let j = 0; j < declaration.members.length; j++) {
@@ -752,36 +752,6 @@ 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.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;
+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,7 +14,6 @@ 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();
@@ -138,7 +137,7 @@ function loadSourcemaps() {
                 version: '3',
                 names: [],
                 mappings: '',
-                sources: [f.relative],
+                sources: [f.relative.replace(/\//g, '/')],
                 sourcesContent: [contents]
             };
             cb(undefined, f);
@@ -256,9 +255,3 @@ 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,8 +18,6 @@ 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;
 }
@@ -186,7 +184,7 @@ export function loadSourcemaps(): NodeJS.ReadWriteStream {
 					version: '3',
 					names: [],
 					mappings: '',
-					sources: [f.relative],
+					sources: [f.relative.replace(/\//g, '/')],
 					sourcesContent: [contents]
 				};
 
@@ -320,9 +318,3 @@ 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,10 +33,9 @@ function yarnInstall(location, opts) {
 
 yarnInstall('extensions'); // node modules shared by all extensions
 
-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
-}
+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 => {
@@ -73,5 +72,3 @@ 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,13 +35,11 @@
     "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-umd": "0.6.8",
-    "jsonc-parser": "^2.3.0",
+    "iconv-lite": "0.4.23",
     "mime": "^1.3.4",
     "minimatch": "3.0.4",
     "minimist": "^1.2.3",
@@ -50,9 +48,9 @@
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "terser": "4.3.8",
-    "typescript": "^4.0.0-dev.20200803",
+    "typescript": "^3.9.1-rc",
     "vsce": "1.48.0",
-    "vscode-telemetry-extractor": "^1.6.0",
+    "vscode-telemetry-extractor": "^1.5.4",
     "xml2js": "^0.4.17"
   },
   "scripts": {

build/polyfills/vscode-extension-telemetry.js

@@ -1,26 +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';
-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

@@ -1,79 +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';
-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,8 +14,7 @@
 		"checkJs": true,
 		"strict": true,
 		"noUnusedLocals": true,
-		"noUnusedParameters": true,
-		"newLine": "lf"
+		"noUnusedParameters": true
 	},
 	"include": [
 		"**/*.ts"

build/win32/code.iss

@@ -1,8 +1,7 @@
-#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 + '\' + RootLicenseFileName + '"'
+      : '; LicenseFile: "' + RepoDir + '\LICENSE.txt"'
 
 [Setup]
 AppId={#AppId}
@@ -34,7 +33,6 @@ VersionInfoVersion={#RawVersion}
 ShowLanguageDialog=auto
 ArchitecturesAllowed={#ArchitecturesAllowed}
 ArchitecturesInstallIn64BitMode={#ArchitecturesInstallIn64BitMode}
-WizardStyle=modern
 
 #ifdef Sign
 SignTool=esrp
@@ -48,7 +46,7 @@ DefaultDirName={pf}\{#DirName}
 #endif
 
 [Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl,{#RepoDir}\build\win32\i18n\messages.en.isl" {#LocalizedLanguageFile}
+Name: "english"; MessagesFile: "{#RepoDir}\build\win32\i18n\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")}
@@ -58,9 +56,6 @@ 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
@@ -148,7 +143,7 @@ begin
   Result := True;
 
   #if "user" == InstallTarget
-    if not WizardSilent() and IsAdmin() then begin
+    if not WizardSilent() and IsAdminLoggedOn() 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;
@@ -156,7 +151,7 @@ begin
   #endif
 
   #if "user" == InstallTarget
-    #if "ia32" == Arch || "arm64" == Arch
+    #if "ia32" == Arch
       #define IncompatibleArchRootKey "HKLM32"
     #else
       #define IncompatibleArchRootKey "HKLM64"
@@ -266,7 +261,7 @@ begin
   end;
 end;
 
-// https://stackoverflow.com/a/23838239/261019
+// http://stackoverflow.com/a/23838239/261019
 procedure Explode(var Dest: TArrayOfString; Text: String; Separator: String);
 var
   i, p: Integer;

build/win32/i18n/Default.hu.isl

@@ -1,366 +0,0 @@
-;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

@@ -0,0 +1,336 @@
+; *** 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,16 +1,12 @@
-; *** Inno Setup version 6.0.0+ Korean messages ***
+; *** Inno Setup version 5.5.3+ Korean messages ***
+;
+; To download user-contributed translations of this file, go to:
+;   http://www.jrsoftware.org/files/istrans/
 ;
-; ▒ 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.
@@ -27,68 +23,50 @@ 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=임시 폴더의 파일을 실행할 수 없습니다, 설치를 중단합니다
-HelpTextNote=
-
+SetupLdrStartupMessage=그러면 %1이(가) 설치됩니다. 계속하시겠습니까?
+LdrCannotCreateTemp=임시 파일을 만들 수 없습니다. 설치 프로그램이 중단되었습니다.
+LdrCannotExecTemp=임시 디렉터리에서 파일을 실행할 수 없습니다. 설치 프로그램이 중단되었습니다.
 ; *** Startup error messages
 LastErrorMessage=%1.%n%n오류 %2: %3
-SetupFileMissing=%1 파일이 존재하지 않습니다, 문제를 해결해 보거나 새로운 설치 프로그램을 구하시기 바랍니다.
-SetupFileCorrupt=설치 파일이 손상되었습니다, 새로운 설치 프로그램을 구하시기 바랍니다.
-SetupFileCorruptOrWrongVer=설치 파일의 손상이거나 이 설치 버전과 호환되지 않습니다, 문제를 해결해 보거나 새로운 설치 프로그램을 구하시기 바랍니다.
-InvalidParameter=잘못된 매개 변수입니다:%n%n%1
-SetupAlreadyRunning=설치가 이미 실행 중입니다.
-WindowsVersionNotSupported=이 프로그램은 귀하의 Windows 버전을 지원하지 않습니다.
-WindowsServicePackRequired=이 프로그램을 실행하려면 %1 sp%2 이상이어야 합니다.
-NotOnThisPlatform=이 프로그램은 %1에서 작동하지 않습니다.
+SetupFileMissing=파일 %1이(가) 설치 디렉터리에서 누락되었습니다. 문제를 해결하거나 프로그램을 새로 받으세요.
+SetupFileCorrupt=설치 파일이 손상되었습니다. 프로그램을 새로 받으세요.
+SetupFileCorruptOrWrongVer=설치 파일이 손상되었거나 이 버전의 설치 프로그램과 호환되지 않습니다. 문제를 해결하거나 프로그램을 새로 받으세요.
+InvalidParameter=명령줄에 잘못된 매개 변수가 전달됨:%n%n%1
+SetupAlreadyRunning=설치 프로그램이 이미 실행 중입니다.
+WindowsVersionNotSupported=이 프로그램은 컴퓨터에서 실행 중인 버전의 Windows를 지원하지 않습니다.
+WindowsServicePackRequired=이 프로그램을 설치하려면 %1 서비스 팩 %2 이상이 필요합니다.
+NotOnThisPlatform=이 프로그램은 %1에서 실행되지 않습니다.
 OnlyOnThisPlatform=이 프로그램은 %1에서 실행해야 합니다.
-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) (추천)
-
+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이 항목의 모든 인스턴스를 지금 닫고 계속하려면 [확인]을, 종료하려면 [취소]를 클릭하세요.
 ; *** 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) >
@@ -97,271 +75,224 @@ 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=계속하려면 "다음"을, 다른 폴더를 선택하려면 "찾아보기"를 클릭하십시오.
-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그래도 계속하시겠습니까?
+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그래도 계속하시겠습니까?
 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=최소 설치
+CompactInstallation=Compact 설치
 CustomInstallation=사용자 지정 설치
-NoUninstallWarningTitle=구성 요소가 존재합니다
-NoUninstallWarning=다음 구성 요소가 이미 설치되어 있습니다:%n%n%1%n%n위 구성 요소을 선택하지 않으면, 프로그램 제거시 이 구성 요소들은 제거되지 않을 겁니다.%n%n그래도 계속하시겠습니까?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceGBLabel=현재 선택은 최소 [gb] GB의 디스크 여유 공간이 필요합니다.
-ComponentsDiskSpaceMBLabel=현재 선택은 최소 [mb] MB의 디스크 여유 공간이 필요합니다.
-
+NoUninstallWarningTitle=구성 요소가 있음
+NoUninstallWarning=설치 프로그램에서 구성 요소 %n%n%1%n%n이(가) 컴퓨터에 이미 설치되어 있음을 감지했습니다. 이러한 구성 요소는 선택 취소해도 제거되지 않습니다.%n%n그래도 계속하시겠습니까?
+ComponentSize1=%1KB
+ComponentSize2=%1MB
+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=설치 마법사가 응용프로그램을 자동으로 종료할 수 없습니다, 계속하기 전에 설치 업데이트가 필요한 파일을 사용하고 있는 응용프로그램을 모두 종료하시기 바랍니다.
-PrepareToInstallNeedsRestart=설치 마법사는 귀하의 컴퓨터를 재시작해야 합니다. [name] 설치를 완료하기 위해 컴퓨터를 다시 시작한 후에 설치 마법사를 다시 실행해 주십시오.%n%n지금 다시 시작하시겠습니까?
-
+PreparingDesc=설치 프로그램에서 컴퓨터에 [name] 설치를 준비하고 있습니다.
+PreviousInstallNotCompleted=이전 프로그램의 설치/제거 작업이 완료되지 않았습니다. 해당 설치를 완료하려면 컴퓨터를 다시 시작해야 합니다.%n%n컴퓨터를 다시 시작한 후 [name] 설치를 완료하려면 설치 프로그램을 다시 실행하세요.
+CannotContinue=설치 프로그램을 계속할 수 없습니다. 종료하려면 [취소]를 클릭하세요.
+ApplicationsFound=설치 프로그램에서 업데이트해야 하는 파일이 다음 응용 프로그램에 사용되고 있습니다. 설치 프로그램에서 이러한 응용 프로그램을 자동으로 닫도록 허용하는 것이 좋습니다.
+ApplicationsFound2=설치 프로그램에서 업데이트해야 하는 파일이 다음 응용 프로그램에 사용되고 있습니다. 설치 프로그램에서 이러한 응용 프로그램을 자동으로 닫도록 허용하는 것이 좋습니다. 설치가 완료되면 설치 프로그램에서 응용 프로그램을 다시 시작하려고 시도합니다.
+CloseApplications=응용 프로그램 자동 닫기(&A)
+DontCloseApplications=응용 프로그램을 닫지 않음(&D)
+ErrorCloseApplications=설치 프로그램에서 일부 응용 프로그램을 자동으로 닫을 수 없습니다. 계속하기 전에 설치 프로그램에서 업데이트해야 하는 파일을 사용하는 응용 프로그램을 모두 닫는 것이 좋습니다.
 ; *** "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문제를 해결한 후, 다시 설치를 시작하십시오.
-AbortRetryIgnoreSelectAction=액션을 선택해 주십시오.
-AbortRetryIgnoreRetry=재시도(&T)
-AbortRetryIgnoreIgnore=오류를 무시하고 진행(&I)
-AbortRetryIgnoreCancel=설치 취소
-
+SetupAborted=설치를 완료하지 못했습니다.%n%n문제를 해결한 다음 설치 프로그램을 다시 실행하세요.
+EntryAbortRetryIgnore=다시 시도하려면 [다시 시도]를, 그래도 계속하려면 [무시]를, 설치를 취소하려면 [중단]을 클릭하세요.
 ; *** 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
-FileAbortRetryIgnoreSkipNotRecommended=이 파일을 건너띔(&S) (권장하지 않습니다)
-FileAbortRetryIgnoreIgnoreNotRecommended=오류를 무시하고 진행(&I) (권장하지 않습니다)
-SourceIsCorrupted=원본 파일이 손상됨
-SourceDoesntExist=원본 파일 %1이(가) 존재하지 않음
-ExistingFileReadOnly2=기존 파일은 읽기 전용이기때문에 대체할 수 없습니다.
-ExistingFileReadOnlyRetry=읽기 전용 속성을 해제하고 다시 시도하려면(&R)
-ExistingFileReadOnlyKeepExisting=기존 파일을 유지(&K)
-ErrorReadingExistingDest=기존 파일을 읽는 동안 오류 발생:
-FileExists=파일이 이미 존재합니다.%n%n파일을 덮어쓰시겠습니까?
-ExistingFileNewer=기존 파일이 설치하려고 하는 파일보다 새 파일입니다, 기존 파일을 유지하시기 바랍니다.%n%n기존 파일을 유지하시겠습니까?
-ErrorChangingAttr=기존 파일의 속성을 변경하는 동안 오류 발생:
-ErrorCreatingTemp=대상 폴더에 파일을 만드는 동안 오류 발생:
-ErrorReadingSource=원본 파일을 읽는 동안 오류 발생:
-ErrorCopying=파일을 복사하는 동안 오류 발생:
-ErrorReplacingExistingFile=기존 파일을 교체하는 동안 오류 발생:
+FileAbortRetryIgnore=다시 시도하려면 [다시 시도]를, 이 파일을 건너뛰려면 [무시](권장되지 않음)를, 설치를 취소하려면 [중단]을 클릭하세요.
+FileAbortRetryIgnore2=다시 시도하려면 [다시 시도]를, 그래도 계속하려면 [무시](권장되지 않음)를, 설치를 취소하려면 [중단]을 클릭하세요.
+SourceIsCorrupted=원본 파일이 손상되었습니다.
+SourceDoesntExist=원본 파일 "%1"이(가) 없습니다.
+ExistingFileReadOnly=기존 파일이 읽기 전용으로 표시되어 있습니다.%n%n읽기 전용 특성을 제거하고 다시 시도하려면 [다시 시도]를, 이 파일을 건너뛰려면 [무시]를, 설치를 취소하려면 [중단]을 클릭하세요.
+ErrorReadingExistingDest=기존 파일을 읽는 중 오류 발생:
+FileExists=해당 파일이 이미 있습니다.%n%n설치 프로그램에서 이 파일을 덮어쓰도록 하시겠습니까?
+ExistingFileNewer=기존 파일이 설치 프로그램에서 설치하려는 파일보다 최신입니다. 기존 파일을 유지할 것을 권장합니다.%n%n기존 파일을 유지하시겠습니까?
+ErrorChangingAttr=기존 파일의 특성을 변경하는 중 오류 발생:
+ErrorCreatingTemp=대상 디렉터리에 파일을 만드는 중 오류 발생:
+ErrorReadingSource=원본 파일을 읽는 중 오류 발생:
+ErrorCopying=파일을 복사하는 중 오류 발생:
+ErrorReplacingExistingFile=기존 파일을 바꾸는 중 오류 발생:
 ErrorRestartReplace=RestartReplace 실패:
-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=현재 사용자
-
+ErrorRenamingTemp=대상 디렉터리에 있는 파일 이름을 바꾸는 중 오류 발생:
+ErrorRegisterServer=DLL/OCX를 등록할 수 없음: %1
+ErrorRegSvr32Failed=종료 코드 %1과(와) 함께 RegSvr32 실패
+ErrorRegisterTypeLib=형식 라이브러리를 등록할 수 없음: %1
 ; *** 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=파일 확장자 %2을(를) %1에 연결합니다.
-AssocingFileExtension=파일 확장자 %2을(를) %1에 연결하는 중...
+LaunchProgram=%1 시작
+AssocFileExtension=%1을(를) %2 파일 확장명과 연결(&A)
+AssocingFileExtension=%1을(를) %2 파일 확장명과 연결 중...
 AutoStartProgramGroupDescription=시작:
-AutoStartProgram=%1을(를) 자동으로 시작
-AddonHostProgramNotFound=%1은(는) 선택한 폴더에 위치할 수 없습니다.%n%n그래도 계속하시겠습니까?
+AutoStartProgram=%1 자동 시작
+AddonHostProgramNotFound=선택한 폴더에서 %1을(를) 찾을 수 없습니다.%n%n그래도 계속하시겠습니까?

build/win32/i18n/Default.zh-cn.isl

@@ -1,17 +1,16 @@
-; *** Inno Setup version 6.0.3+ Chinese Simplified messages ***
+; *** Inno Setup version 5.5.3+ Simplified Chinese messages ***
 ;
-; Maintained by Zhenghan Yang
-; Email: 847320916@QQ.com
-; Translation based on network resource
-; The latest Translation is on https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation
+; 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=简体中文
-; If Language Name display incorrect, uncomment next line
-; LanguageName=<7B80><4F53><4E2D><6587>
+LanguageName=Simplified Chinese
 LanguageID=$0804
 LanguageCodePage=936
 ; If the language you are translating to requires special font faces or
@@ -24,342 +23,276 @@ LanguageCodePage=936
 ;TitleFontSize=29
 ;CopyrightFontName=Arial
 ;CopyrightFontSize=8
-
 [Messages]
-
-; *** 应用程序标题
-SetupAppTitle=安装
-SetupWindowTitle=安装 - %1
-UninstallAppTitle=卸载
-UninstallAppFullTitle=%1 卸载
-
+; *** Application titles
+SetupAppTitle=安装程序
+SetupWindowTitle=安装程序 - %1
+UninstallAppTitle=卸载
+UninstallAppFullTitle=%1 卸载
 ; *** Misc. common
-InformationTitle=信息
-ConfirmTitle=确认
-ErrorTitle=错误
-
+InformationTitle=信息
+ConfirmTitle=确认
+ErrorTitle=错误
 ; *** SetupLdr messages
-SetupLdrStartupMessage=现在将安装 %1。您想要继续吗？
-LdrCannotCreateTemp=不能创建临时文件。安装中断。
-LdrCannotExecTemp=不能执行临时目录中的文件。安装中断。
-HelpTextNote=
-
-; *** 启动错误消息
-LastErrorMessage=%1.%n%n错误 %2: %3
-SetupFileMissing=安装目录中的文件 %1 丢失。请修正这个问题或获取一个新的程序副本。
-SetupFileCorrupt=安装文件已损坏。请获取一个新的程序副本。
-SetupFileCorruptOrWrongVer=安装文件已损坏，或是与这个安装程序的版本不兼容。请修正这个问题或获取新的程序副本。
-InvalidParameter=无效的命令行参数: %n%n%1
-SetupAlreadyRunning=安装程序正在运行。
-WindowsVersionNotSupported=这个程序不支持该版本的计算机运行。
-WindowsServicePackRequired=这个程序要求%1服务包%1或更高。
-NotOnThisPlatform=这个程序将不能运行于 %1。
-OnlyOnThisPlatform=这个程序必须运行于 %1。
-OnlyOnTheseArchitectures=这个程序只能在为下列处理器结构设计的 Windows 版本中进行安装:%n%n%1
-WinVersionTooLowError=这个程序需要 %1 版本 %2 或更高。
-WinVersionTooHighError=这个程序不能安装于 %1 版本 %2 或更高。
-AdminPrivilegesRequired=在安装这个程序时您必须以管理员身份登录。
-PowerUserPrivilegesRequired=在安装这个程序时您必须以管理员身份或有权限的用户组身份登录。
-SetupAppRunningError=安装程序发现 %1 当前正在运行。%n%n请先关闭所有运行的窗口，然后单击“确定”继续，或按“取消”退出。
-UninstallAppRunningError=卸载程序发现 %1 当前正在运行。%n%n请先关闭所有运行的窗口，然后单击“确定”继续，或按“取消”退出。
-
-; *** 启动问题
-PrivilegesRequiredOverrideTitle=选择安装程序模式
-PrivilegesRequiredOverrideInstruction=选择安装模式
-PrivilegesRequiredOverrideText1=%1 可以为所有用户安装(需要管理员权限)，或仅为您安装。
-PrivilegesRequiredOverrideText2=%1 只能为您安装，或为所有用户安装(需要管理员权限)。
-PrivilegesRequiredOverrideAllUsers=为所有用户安装(&A)
-PrivilegesRequiredOverrideAllUsersRecommended=为所有用户安装(建议选项)(&A)
-PrivilegesRequiredOverrideCurrentUser=只为我安装(&M)
-PrivilegesRequiredOverrideCurrentUserRecommended=只为我安装(建议选项)(&M)
-
-; *** 其它错误
-ErrorCreatingDir=安装程序不能创建目录“%1”。
-ErrorTooManyFilesInDir=不能在目录“%1”中创建文件，因为里面的文件太多
-
-; *** 安装程序公共消息
-ExitSetupTitle=退出安装程序
-ExitSetupMessage=安装程序未完成安装。如果您现在退出，您的程序将不能安装。%n%n您可以以后再运行安装程序完成安装。%n%n退出安装程序吗？
-AboutSetupMenuItem=关于安装程序(&A)...
-AboutSetupTitle=关于安装程序
-AboutSetupMessage=%1 版本 %2%n%3%n%n%1 主页:%n%4
+SetupLdrStartupMessage=这将安装 %1。是否要继续?
+LdrCannotCreateTemp=无法创建临时文件。安装程序已中止
+LdrCannotExecTemp=无法在临时目录中执行文件。安装程序已中止
+; *** 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 上运行。
+OnlyOnThisPlatform=此程序必须在 %1 上运行。
+OnlyOnTheseArchitectures=此程序仅可安装在为以下处理器体系结构设计的 Windows 版本上:%n%n%1
+MissingWOW64APIs=你正运行的 Windows 版本不包含安装程序执行 64 位安装所需的功能。要更正此问题，请安装服务包 %1。
+WinVersionTooLowError=此程序需要 %1 版本 %2 或更高版本。
+WinVersionTooHighError=此程序不能安装在 %1 版本 %2 或更高的版本上。
+AdminPrivilegesRequired=在安装此程序时必须作为管理员登录。
+PowerUserPrivilegesRequired=安装此程序时必须以管理员或 Power User 组成员身份登录。
+SetupAppRunningError=安装程序检测到 %1 当前正在运行。%n%n请立即关闭它的所有实例，然后单击“确定”以继续，或单击“取消”以退出。
+UninstallAppRunningError=卸载检测到 %1 当前正在运行。%n%n请立即关闭它的所有实例，然后单击“确定”以继续或单击“取消”以退出。
+; *** Misc. errors
+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
 AboutSetupNote=
 TranslatorNote=
-
-; *** 按钮
-ButtonBack=< 上一步(&B)
-ButtonNext=下一步(&N) >
-ButtonInstall=安装(&I)
-ButtonOK=确定
-ButtonCancel=取消
-ButtonYes=是(&Y)
-ButtonYesToAll=全是(&A)
-ButtonNo=否(&N)
-ButtonNoToAll=全否(&O)
-ButtonFinish=完成(&F)
-ButtonBrowse=浏览(&B)...
-ButtonWizardBrowse=浏览(&R)...
-ButtonNewFolder=新建文件夹(&M)
-
-; *** “选择语言”对话框消息
-SelectLanguageTitle=选择安装语言
-SelectLanguageLabel=选择安装时要使用的语言。
-
-; *** 公共向导文字
-ClickNext=单击“下一步”继续，或单击“取消”退出安装程序。
+; *** Buttons
+ButtonBack=< 上一步(&B)
+ButtonNext=下一步(&N) >
+ButtonInstall=安装(&I)
+ButtonOK=确定
+ButtonCancel=取消
+ButtonYes=是(&Y)
+ButtonYesToAll=接受全部(&A)
+ButtonNo=否(&N)
+ButtonNoToAll=否定全部(&O)
+ButtonFinish=完成(&F)
+ButtonBrowse=浏览(&B)...
+ButtonWizardBrowse=浏览(&R)...
+ButtonNewFolder=新建文件夹(&M)
+; *** "Select Language" dialog messages
+SelectLanguageTitle=选择安装程序语言
+SelectLanguageLabel=选择安装时要使用的语言:
+; *** Common wizard text
+ClickNext=单击“下一步”以继续，或单击“取消”以退出安装程序。
 BeveledLabel=
-BrowseDialogTitle=浏览文件夹
-BrowseDialogLabel=在下列列表中选择一个文件夹，然后单击“确定”。
-NewFolderName=新建文件夹
-
-; *** “欢迎”向导页
-WelcomeLabel1=欢迎使用 [name] 安装向导
-WelcomeLabel2=现在将安装 [name/ver] 到您的电脑中。%n%n推荐您在继续安装前关闭所有其它应用程序。
-
-; *** “密码”向导页
-WizardPassword=密码
-PasswordLabel1=这个安装程序有密码保护。
-PasswordLabel3=请输入密码，然后单击“下一步”继续。密码区分大小写。
-PasswordEditLabel=密码(&P):
-IncorrectPassword=您输入的密码不正确，请重试。
-
-; *** “许可协议”向导页
-WizardLicense=许可协议
-LicenseLabel=继续安装前请阅读下列重要信息。
-LicenseLabel3=请仔细阅读下列许可协议。您在继续安装前必须同意这些协议条款。
-LicenseAccepted=我同意此协议(&A)
-LicenseNotAccepted=我不同意此协议(&D)
-
-; *** “信息”向导页
-WizardInfoBefore=信息
-InfoBeforeLabel=请在继续安装前阅读下列重要信息。
-InfoBeforeClickLabel=如果您想继续安装，单击“下一步”。
-WizardInfoAfter=信息
-InfoAfterLabel=请在继续安装前阅读下列重要信息。
-InfoAfterClickLabel=如果您想继续安装，单击“下一步”。
-
-; *** “用户信息”向导页
-WizardUserInfo=用户信息
-UserInfoDesc=请输入您的信息。
-UserInfoName=用户名(&U):
-UserInfoOrg=组织(&O):
-UserInfoSerial=序列号(&S):
-UserInfoNameRequired=您必须输入名字。
-
-; *** “选择目标目录”向导面
-WizardSelectDir=选择目标位置
-SelectDirDesc=您想将 [name] 安装在什么地方？
-SelectDirLabel3=安装程序将安装 [name] 到下列文件夹中。
-SelectDirBrowseLabel=单击“下一步”继续。如果您想选择其它文件夹，单击“浏览”。
-DiskSpaceGBLabel=至少需要有 [gb] GB 的可用磁盘空间。
-DiskSpaceMBLabel=至少需要有 [mb] MB 的可用磁盘空间。
-CannotInstallToNetworkDrive=安装程序无法安装到一个网络驱动器。
-CannotInstallToUNCPath=安装程序无法安装到一个UNC路径。
-InvalidPath=您必须输入一个带驱动器卷标的完整路径，例如:%n%nC:\APP%n%n或下列形式的 UNC 路径:%n%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不存在。您想要创建此目录吗？
-
-; *** “选择组件”向导页
-WizardSelectComponents=选择组件
-SelectComponentsDesc=您想安装哪些程序的组件？
-SelectComponentsLabel2=选择您想要安装的组件；清除您不想安装的组件。然后单击“下一步”继续。
-FullInstallation=完全安装
+BrowseDialogTitle=浏览查找文件夹
+BrowseDialogLabel=在以下列表中选择一个文件夹，然后单击“确定”。
+NewFolderName=新建文件夹
+; *** "Welcome" wizard page
+WelcomeLabel1=欢迎使用 [name] 安装向导
+WelcomeLabel2=这将在计算机上安装 [name/ver]。%n%n建议关闭所有其他应用程序再继续。
+; *** "Password" wizard page
+WizardPassword=密码
+PasswordLabel1=此安装受密码保护。
+PasswordLabel3=请提供密码，然后单击“下一步”以继续。密码区分大小写。
+PasswordEditLabel=密码(&P):
+IncorrectPassword=输入的密码不正确。请重试。
+; *** "License Agreement" wizard page
+WizardLicense=许可协议
+LicenseLabel=请在继续操作前阅读以下重要信息。
+LicenseLabel3=请阅读以下许可协议。必须接受此协议条款才可继续安装。
+LicenseAccepted=我接受协议(&A)
+LicenseNotAccepted=我不接受协议(&D)
+; *** "Information" wizard pages
+WizardInfoBefore=信息
+InfoBeforeLabel=请在继续操作前阅读以下重要信息。
+InfoBeforeClickLabel=准备好继续安装后，单击“下一步”。
+WizardInfoAfter=信息
+InfoAfterLabel=请在继续操作前阅读以下重要信息。
+InfoAfterClickLabel=准备好继续安装后，单击“下一步”。
+; *** "User Information" wizard page
+WizardUserInfo=用户信息
+UserInfoDesc=请输入你的信息。
+UserInfoName=用户名(&U):
+UserInfoOrg=组织(&O):
+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 共享不存在或不可访问。请另外选择。
+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不存在。是否要创建该文件夹?
+; *** "Select Components" wizard page
+WizardSelectComponents=选择组件
+SelectComponentsDesc=应安装哪些组件?
+SelectComponentsLabel2=选择希望安装的组件；清除不希望安装的组件。准备就绪后单击“下一步”以继续。
+FullInstallation=完全安装
 ; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=简洁安装
-CustomInstallation=自定义安装
-NoUninstallWarningTitle=组件存在
-NoUninstallWarning=安装程序侦测到下列组件已在您的电脑中安装。:%n%n%1%n%n取消选定这些组件将不能卸载它们。%n%n您一定要继续吗？
+CompactInstallation=简洁安装
+CustomInstallation=自定义安装
+NoUninstallWarningTitle=组件存在
+NoUninstallWarning=安装程序检测到计算机上已安装以下组件:%n%n%1%n%n取消选择这些组件将不会卸载它们。%n%n是否仍要继续?
 ComponentSize1=%1 KB
 ComponentSize2=%1 MB
-ComponentsDiskSpaceGBLabel=当前选择的组件至少需要 [gb] GB 的磁盘空间。
-ComponentsDiskSpaceMBLabel=当前选择的组件至少需要 [mb] MB 的磁盘空间。
-
-; *** “选择附加任务”向导页
-WizardSelectTasks=选择附加任务
-SelectTasksDesc=您想要安装程序执行哪些附加任务？
-SelectTasksLabel2=选择您想要安装程序在安装 [name] 时执行的附加任务，然后单击“下一步”。
-
-; *** “选择开始菜单文件夹”向导页
-WizardSelectProgramGroup=选择开始菜单文件夹
-SelectStartMenuFolderDesc=您想在哪里放置程序的快捷方式？
-SelectStartMenuFolderLabel3=安装程序现在将在下列开始菜单文件夹中创建程序的快捷方式。
-SelectStartMenuFolderBrowseLabel=单击“下一步”继续。如果您想选择其它文件夹，单击“浏览”。
-MustEnterGroupName=您必须输入一个文件夹名。
-GroupNameTooLong=文件夹名或路径太长。
-InvalidGroupName=文件夹名是无效的。
-BadGroupName=文件夹名不能包含下列任何字符:%n%n%1
-NoProgramGroupCheck2=不创建开始菜单文件夹(&D)
-
-; *** “准备安装”向导页
-WizardReady=准备安装
-ReadyLabel1=安装程序现在准备开始安装 [name] 到您的电脑中。
-ReadyLabel2a=单击“安装”继续此安装程序。如果您想要回顾或改变设置，请单击“上一步”。
-ReadyLabel2b=单击“安装”继续此安装程序?
-ReadyMemoUserInfo=用户信息:
-ReadyMemoDir=目标位置:
-ReadyMemoType=安装类型:
-ReadyMemoComponents=选定组件:
-ReadyMemoGroup=开始菜单文件夹:
-ReadyMemoTasks=附加任务:
-
-; *** “正在准备安装”向导页
-WizardPreparing=正在准备安装
-PreparingDesc=安装程序正在准备安装 [name] 到您的电脑中。
-PreviousInstallNotCompleted=先前程序的安装/卸载未完成。您需要重新启动您的电脑才能完成安装。%n%n在重新启动电脑后，再运行安装完成 [name] 的安装。
-CannotContinue=安装程序不能继续。请单击“取消”退出。
-ApplicationsFound=下列应用程序正在使用的文件需要更新设置。它是建议您允许安装程序自动关闭这些应用程序。
-ApplicationsFound2=下列应用程序正在使用的文件需要更新设置。它是建议您允许安装程序自动关闭这些应用程序。安装完成后，安装程序将尝试重新启动应用程序。
-CloseApplications=自动关闭该应用程序(&A)
-DontCloseApplications=不要关闭该应用程序(D)
-ErrorCloseApplications=安装程序无法自动关闭所有应用程序。在继续之前，我们建议您关闭所有使用需要更新的安装程序文件。
-PrepareToInstallNeedsRestart=安装程序必须重新启动计算机。重新启动计算机后，请再次运行安装程序以完成 [name] 的安装。%n%n是否立即重新启动？
-
-; *** “正在安装”向导页
-WizardInstalling=正在安装
-InstallingLabel=安装程序正在安装 [name] 到您的电脑中，请稍等。
-
-; *** “安装完成”向导页
-FinishedHeadingLabel=[name] 安装完成
-FinishedLabelNoIcons=安装程序已在您的电脑中安装了 [name]。
-FinishedLabel=安装程序已在您的电脑中安装了 [name]。此应用程序可以通过选择安装的快捷方式运行。
-ClickFinish=单击“完成”退出安装程序。
-FinishedRestartLabel=要完成 [name] 的安装，安装程序必须重新启动您的电脑。您想现在重新启动吗？
-FinishedRestartMessage=要完成 [name] 的安装，安装程序必须重新启动您的电脑。%n%n您想现在重新启动吗？
-ShowReadmeCheck=是，您想查阅自述文件
-YesRadio=是，立即重新启动电脑(&Y)
-NoRadio=否，稍后重新启动电脑(&N)
-; 用于象“运行 MyProg.exe”
-RunEntryExec=运行 %1
-; 用于象“查阅 Readme.txt”
-RunEntryShellExec=查阅 %1
-
-; *** “安装程序需要下一张磁盘”提示
-ChangeDiskTitle=安装程序需要下一张磁盘
-SelectDiskLabel2=请插入磁盘 %1 并单击“确定”。%n%n如果这个磁盘中的文件不能在不同于下列显示的文件夹中找到，输入正确的路径或单击“浏览”。
-PathLabel=路径(&P):
-FileNotInDir2=文件“%1”不能在“%2”定位。请插入正确的磁盘或选择其它文件夹。
-SelectDirectoryLabel=请指定下一张磁盘的位置。
-
-; *** 安装状态消息
-SetupAborted=安装程序未完成安装。%n%n请修正这个问题并重新运行安装程序。
-AbortRetryIgnoreSelectAction=选项
-AbortRetryIgnoreRetry=重试(&T)
-AbortRetryIgnoreIgnore=忽略错误并继续(&I)
-AbortRetryIgnoreCancel=关闭安装程序
-
-; *** 安装状态消息
-StatusClosingApplications=正在关闭应用程序...
-StatusCreateDirs=正在创建目录...
-StatusExtractFiles=正在解压缩文件...
-StatusCreateIcons=正在创建快捷方式...
-StatusCreateIniEntries=正在创建 INI 条目...
-StatusCreateRegistryEntries=正在创建注册表条目...
-StatusRegisterFiles=正在注册文件...
-StatusSavingUninstall=正在保存卸载信息...
-StatusRunProgram=正在完成安装...
-StatusRestartingApplications=正在重启应用程序...
-StatusRollback=正在撤销更改...
-
-; *** 其它错误
-ErrorInternal2=内部错误: %1
-ErrorFunctionFailedNoCode=%1 失败
-ErrorFunctionFailed=%1 失败；错误代码 %2
-ErrorFunctionFailedWithMessage=%1 失败；错误代码 %2.%n%3
-ErrorExecutingProgram=不能执行文件:%n%1
-
-; *** 注册表错误
-ErrorRegOpenKey=打开注册表项时出错:%n%1\%2
-ErrorRegCreateKey=创建注册表项时出错:%n%1\%2
-ErrorRegWriteKey=写入注册表项时出错:%n%1\%2
-
-; *** INI 错误
-ErrorIniEntry=在文件“%1”创建 INI 项目错误。
-
-; *** 文件复制错误
-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=重启电脑后替换文件失败:
-ErrorRenamingTemp=尝试重新命名以下目标目录中的一个文件时发生错误:
-ErrorRegisterServer=不能注册 DLL/OCX: %1
-ErrorRegSvr32Failed=RegSvr32 失败；退出代码 %1
-ErrorRegisterTypeLib=不能注册类型库: %1
-
-; *** 卸载显示名字标记
-; 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=当前用户
-
-; *** 安装后错误
-ErrorOpeningReadme=当尝试打开自述文件时发生一个错误。
-ErrorRestartingComputer=安装程序不能重新启动电脑，请手动重启。
-
-; *** 卸载消息
-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”文件被破坏，不能卸载
-
-; *** 卸载状态消息
-ConfirmDeleteSharedFileTitle=删除共享文件吗？
-ConfirmDeleteSharedFile2=系统中包含的下列共享文件已经不被其它程序使用。您想要卸载程序删除这些共享文件吗？%n%n如果这些文件被删除，但还有程序正在使用这些文件，这些程序可能不能正确执行。如果您不能确定，选择“否”。把这些文件保留在系统中以免引起问题。
-SharedFileNameLabel=文件名:
-SharedFileLocationLabel=位置:
-WizardUninstalling=卸载状态
-StatusUninstalling=正在卸载 %1...
-
+ComponentsDiskSpaceMBLabel=当前选择需要至少 [mb] MB 磁盘空间。
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=选择其他任务
+SelectTasksDesc=应执行哪些其他任务?
+SelectTasksLabel2=选择安装 [name] 时希望安装程序来执行的其他任务，然后单击“下一步”。
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=选择开始菜单文件夹
+SelectStartMenuFolderDesc=安装程序应将程序的快捷方式放置到哪里?
+SelectStartMenuFolderLabel3=安装程序将在以下开始菜单文件夹中创建该程序的快捷方式。
+SelectStartMenuFolderBrowseLabel=若要继续，单击“下一步”。如果想选择其他文件夹，单击“浏览”。
+MustEnterGroupName=必须输入文件夹名。
+GroupNameTooLong=文件夹名称或路径太长。
+InvalidGroupName=文件夹名称无效。
+BadGroupName=文件夹名不能保护以下任一字符:%n%n%1
+NoProgramGroupCheck2=不创建开始菜单文件夹(&D)
+; *** "Ready to Install" wizard page
+WizardReady=安装准备就绪
+ReadyLabel1=安装程序现已准备好在计算机上安装 [name]。
+ReadyLabel2a=单击“安装”以继续安装，如想查看或更改任何设置则单击"返回"。
+ReadyLabel2b=单击“安装”以继续安装。
+ReadyMemoUserInfo=用户信息:
+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=安装程序无法自动关闭所有应用程序。建议在继续操作之前先关闭所有使用需通过安装程序进行更新的文件的应用程序。
+; *** "Installing" wizard page
+WizardInstalling=正在安装
+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)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=运行 %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=查看 %1
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=安装程序需要下一个磁盘
+SelectDiskLabel2=请插入磁盘 %1 并点击“确定”。%n%n如果此磁盘上的文件可在以下文件夹外的其他文件夹中找到，请输入正确路径或单击“浏览”。
+PathLabel=路径(&P):
+FileNotInDir2=在“%2”中无法定位文件“%1”。请插入正确的磁盘或选择其他文件夹。
+SelectDirectoryLabel=请指定下一个磁盘的位置。
+; *** Installation phase messages
+SetupAborted=安装程序未完成。%n%n请更正问题并重新运行安装程序。
+EntryAbortRetryIgnore=单击“重试”以再次尝试，单击“忽略”以继续，或单击“中止”以取消安装。
+; *** Installation status messages
+StatusClosingApplications=正在关闭应用程序...
+StatusCreateDirs=正在创建目录...
+StatusExtractFiles=正在解压缩文件...
+StatusCreateIcons=正在创建快捷方式...
+StatusCreateIniEntries=正在创建 INI 项...
+StatusCreateRegistryEntries=正在创建注册表项...
+StatusRegisterFiles=正在注册文件...
+StatusSavingUninstall=正在保存卸载信息...
+StatusRunProgram=正在完成安装...
+StatusRestartingApplications=正在重启应用程序...
+StatusRollback=正在回退更改...
+; *** Misc. errors
+ErrorInternal2=内部错误: %1
+ErrorFunctionFailedNoCode=%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
+; *** INI errors
+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=尝试替换现有文件时出错:
+ErrorRestartReplace=RestartReplace 失败:
+ErrorRenamingTemp=尝试在目标目录重命名文件时出错:
+ErrorRegisterServer=无法注册 DLL/OCX: %1
+ErrorRegSvr32Failed=RegSvr32 失败，退出代码为 %1
+ErrorRegisterTypeLib=无法注册类型库: %1
+; *** Post-installation errors
+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”文件已损坏。无法卸载
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=删除共享文件?
+ConfirmDeleteSharedFile2=系统表示以下共享文件不再被任何程序使用。是否要卸载删除此共享文件?%n%n如果在有程序仍在使用此文件而它被删除，则程序可能不会正常运行。如果不确定，请选择“否”。将文件留住系统上不会造成任何问题。
+SharedFileNameLabel=文件名:
+SharedFileLocationLabel=位置:
+WizardUninstalling=卸载状态
+StatusUninstalling=正在卸载 %1...
 ; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=正在安装 %1.
-ShutdownBlockReasonUninstallingApp=正在卸载 %1.
-
+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 网站
-UninstallProgram=卸载 %1
-LaunchProgram=运行 %1
-AssocFileExtension=将 %2 文件扩展名与 %1 建立关联(&A)
-AssocingFileExtension=正在将 %2 文件扩展名与 %1 建立关联...
-AutoStartProgramGroupDescription=启动组:
-AutoStartProgram=自动启动 %1
-AddonHostProgramNotFound=%1无法找到您所选择的文件夹。%n%n您想要继续吗？
-
+NameAndVersion=%1 版本 %2
+AdditionalIcons=其他快捷方式:
+CreateDesktopIcon=创建桌面快捷方式(&D)
+CreateQuickLaunchIcon=创建快速启动快捷方式(&Q)
+ProgramOnTheWeb=Web 上的 %1
+UninstallProgram=卸载 %1
+LaunchProgram=启动 %1
+AssocFileExtension=将 %1 与 %2 文件扩展名关联(&A)
+AssocingFileExtension=正将 %1 与 %2 文件扩展名关联...
+AutoStartProgramGroupDescription=启动:
+AutoStartProgram=自动启动 %1
+AddonHostProgramNotFound=无法在所选文件夹中定位 %1。%n%n是否仍要继续?