Merge branch 'ads-main-vscode-2020-07-24T05-27-28' into main

extensions/configuration-editing/package.json

@@ -54,7 +54,7 @@
         "url": "vscode://schemas/keybindings"
       },
       {
-        "fileMatch": "vscode://defaultsettings/*/*.json",
+        "fileMatch": "vscode://defaultsettings/defaultSettings.json",
         "url": "vscode://schemas/settings/default"
       },
       {

extensions/markdown-language-features/preview-src/index.ts

@@ -163,13 +163,15 @@ document.addEventListener('click', event => {
 				return;
 			}
 
-			// Pass through known schemes
-			if (passThroughLinkSchemes.some(scheme => node.href.startsWith(scheme))) {
-				return;
+			let hrefText = node.getAttribute('data-href');
+			if (!hrefText) {
+				// Pass through known schemes
+				if (passThroughLinkSchemes.some(scheme => node.href.startsWith(scheme))) {
+					return;
+				}
+				hrefText = node.getAttribute('href');
 			}
 
-			const hrefText = node.getAttribute('data-href') || node.getAttribute('href');
-
 			// If original link doesn't look like a url, delegate back to VS Code to resolve
 			if (!/^[a-z\-]+:/i.test(hrefText)) {
 				messaging.postMessage('openLink', { href: hrefText });

extensions/microsoft-authentication/package.json

@@ -15,6 +15,10 @@
 		"*",
 		"onAuthenticationRequest:microsoft"
 	],
+	"extensionKind": [
+		"ui",
+		"workspace"
+	],
 	"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
 	"main": "./out/extension.js",
 	"browser": "./dist/browser/extension.js",