Merge remote-tracking branch 'origin/main' into connor4312/cli-self-update

.vscode/settings.json

@@ -53,7 +53,7 @@
 			"fileMatch": [
 				"cgmanifest.json"
 			],
-			"url": "./.vscode/cgmanifest.schema.json"
+			"url": "https://json.schemastore.org/component-detection-manifest.json",
 		},
 		{
 			"fileMatch": [
@@ -65,11 +65,12 @@
 	"git.ignoreLimitWarning": true,
 	"git.branchProtection": [
 		"main",
+		"distro",
 		"release/*"
 	],
 	"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
 	"git.branchRandomName.enable": true,
-	"git.fetchBeforeCheckout": true,
+	"git.pullBeforeCheckout": true,
 	"git.mergeEditor": true,
 	"remote.extensionKind": {
 		"msjsdiag.debugger-for-chrome": "workspace"
@@ -106,11 +107,6 @@
 		"git",
 		"sash"
 	],
-	"editor.quickSuggestions": {
-		"other": "inline",
-		"comments": "inline",
-		"strings": "inline"
-	},
 	"githubPullRequests.assignCreated": "${user}",
 	"githubPullRequests.defaultMergeMethod": "squash"
 }