Merge remote-tracking branch 'origin/main' into aamunger/scrapbookIW

Author: amunger

build/azure-pipelines/.gdntsa

@@ -1,12 +1,21 @@
 {
-	"instanceUrl": "https://msazure.visualstudio.com/defaultcollection",
-	"projectName": "One",
-	"areaPath": "One\\VSCode\\Client",
-	"iterationPath": "One",
+	"codebaseName": "devdiv_vscode-client",
+	"ppe": false,
 	"notificationAliases": [
-		"[email protected]"
+			"[email protected]"
 	],
-	"ppe": "false",
-	"template": "TFSMSAzure",
-	"codebaseName": "vscode-client"
+	"codebaseAdmins": [
+			"REDMOND\\stbatt",
+			"REDMOND\\monacotools"
+	],
+	"instanceUrl": "https://devdiv.visualstudio.com/defaultcollection",
+	"projectName": "DevDiv",
+	"areaPath": "DevDiv\\VS Code (compliance tracking only)\\Visual Studio Code Client",
+	"notifyAlways": true,
+	"template": "TFSDEVDIV",
+	"tools": [
+			"BinSkim",
+			"CredScan",
+			"CodeQL"
+	]
 }

build/azure-pipelines/config/tsaoptions.json

@@ -35,7 +35,7 @@ variables:
   - name: Codeql.TSAEnabled
     value: true
   - name: Codeql.TSAOptionsPath
-    value: '$(Build.SourcesDirectory)\build\azure-pipelines\.gdntsa'
+    value: '$(Build.SourcesDirectory)\build\azure-pipelines\config\tsaoptions.json'
 
 stages:
   - stage: Windows
@@ -161,7 +161,7 @@ stages:
           - task: TSAUpload@2
             inputs:
               GdnPublishTsaOnboard: true
-              GdnPublishTsaConfigFile: '$(Build.SourcesDirectory)\build\azure-pipelines\.gdntsa'
+              GdnPublishTsaConfigFile: '$(Build.SourcesDirectory)\build\azure-pipelines\config\tsaoptions.json'
 
   - stage: Linux
     dependsOn: []
@@ -280,4 +280,4 @@ stages:
 
           - task: TSAUpload@2
             inputs:
-              GdnPublishTsaConfigFile: '$(Build.SourceDirectory)\build\azure-pipelines\.gdntsa'
+              GdnPublishTsaConfigFile: '$(Build.SourceDirectory)\build\azure-pipelines\config\tsaoptions.json'

build/azure-pipelines/sdl-scan.yml

@@ -163,7 +163,7 @@
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/interactiveSession",
+			"name": "vs/workbench/contrib/chat",
 			"project": "vscode-workbench"
 		},
 		{

build/lib/i18n.resources.json

@@ -30,7 +30,6 @@ const svgsNotValid = l10n.t("SVGs are not a valid image source.");
 const embeddedSvgsNotValid = l10n.t("Embedded SVGs are not a valid image source.");
 const dataUrlsNotValid = l10n.t("Data URLs are not a valid image source.");
 const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a repository with HTTPS protocol to be specified in the package.json.");
-const relativeIconUrlRequiresHttpsRepository = l10n.t("An icon requires a repository with HTTPS protocol to be specified in this package.json.");
 const relativeBadgeUrlRequiresHttpsRepository = l10n.t("Relative badge URLs require a repository with HTTPS protocol to be specified in this package.json.");
 const apiProposalNotListed = l10n.t("This proposal cannot be used because for this extension the product defines a fixed set of API proposals. You can test your extension but before publishing you MUST reach out to the VS Code team.");
 const implicitActivationEvent = l10n.t("This activation event cannot be explicitly listed by your extension.");
@@ -458,11 +457,10 @@ export class ExtensionLinter {
 			diagnostics.push(new Diagnostic(range, dataUrlsNotValid, DiagnosticSeverity.Warning));
 		}
 
-		if (!hasScheme && !info.hasHttpsRepository) {
+		if (!hasScheme && !info.hasHttpsRepository && context !== Context.ICON) {
 			const range = new Range(document.positionAt(begin), document.positionAt(end));
 			const message = (() => {
 				switch (context) {
-					case Context.ICON: return relativeIconUrlRequiresHttpsRepository;
 					case Context.BADGE: return relativeBadgeUrlRequiresHttpsRepository;
 					default: return relativeUrlRequiresHttpsRepository;
 				}

extensions/extension-editing/src/extensionLinter.ts

@@ -13,6 +13,7 @@
     "diffCommand",
     "contribEditorContentMenu",
     "contribEditSessions",
+    "canonicalUriIdentityProvider",
     "contribViewsWelcome",
     "editSessionIdentityProvider",
     "quickDiffProvider",

extensions/git/package.json

@@ -24,7 +24,7 @@ export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentit
 		this.providerRegistration.dispose();
 	}
 
-	async provideEditSessionIdentity(workspaceFolder: vscode.WorkspaceFolder, _token: vscode.CancellationToken): Promise<string | undefined> {
+	async provideEditSessionIdentity(workspaceFolder: vscode.WorkspaceFolder, token: vscode.CancellationToken): Promise<string | undefined> {
 		await this.model.openRepository(path.dirname(workspaceFolder.uri.fsPath));
 
 		const repository = this.model.getRepository(workspaceFolder.uri);
@@ -34,8 +34,11 @@ export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentit
 			return undefined;
 		}
 
+		const remoteUrl = repository.remotes.find((remote) => remote.name === repository.HEAD?.upstream?.remote)?.pushUrl?.replace(/^(git@[^\/:]+)(:)/i, 'ssh://$1/');
+		const remote = remoteUrl ? await vscode.workspace.provideCanonicalUriIdentity(vscode.Uri.parse(remoteUrl), token) : null;
+
 		return JSON.stringify({
-			remote: repository.remotes.find((remote) => remote.name === repository.HEAD?.upstream?.remote)?.pushUrl ?? null,
+			remote: remote?.toString() ?? remoteUrl,
 			ref: repository.HEAD?.upstream?.name ?? null,
 			sha: repository.HEAD?.commit ?? null,
 		});

extensions/git/src/editSessionIdentityProvider.ts

@@ -152,7 +152,7 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu
 	private _onDidChangePostCommitCommandsProviders = new EventEmitter<void>();
 	readonly onDidChangePostCommitCommandsProviders = this._onDidChangePostCommitCommandsProviders.event;
 
-	private branchProtectionProviders = new Map<Uri, Set<BranchProtectionProvider>>();
+	private branchProtectionProviders = new Map<string, Set<BranchProtectionProvider>>();
 
 	private _onDidChangeBranchProtectionProviders = new EventEmitter<Uri>();
 	readonly onDidChangeBranchProtectionProviders = this._onDidChangeBranchProtectionProviders.event;
@@ -769,17 +769,17 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu
 	registerBranchProtectionProvider(root: Uri, provider: BranchProtectionProvider): Disposable {
 		const providerDisposables: Disposable[] = [];
 
-		this.branchProtectionProviders.set(root, (this.branchProtectionProviders.get(root) ?? new Set()).add(provider));
+		this.branchProtectionProviders.set(root.toString(), (this.branchProtectionProviders.get(root.toString()) ?? new Set()).add(provider));
 		providerDisposables.push(provider.onDidChangeBranchProtection(uri => this._onDidChangeBranchProtectionProviders.fire(uri)));
 
 		this._onDidChangeBranchProtectionProviders.fire(root);
 
 		return toDisposable(() => {
-			const providers = this.branchProtectionProviders.get(root);
+			const providers = this.branchProtectionProviders.get(root.toString());
 
 			if (providers && providers.has(provider)) {
 				providers.delete(provider);
-				this.branchProtectionProviders.set(root, providers);
+				this.branchProtectionProviders.set(root.toString(), providers);
 				this._onDidChangeBranchProtectionProviders.fire(root);
 			}
 
@@ -788,7 +788,7 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu
 	}
 
 	getBranchProtectionProviders(root: Uri): BranchProtectionProvider[] {
-		return [...(this.branchProtectionProviders.get(root) ?? new Set()).values()];
+		return [...(this.branchProtectionProviders.get(root.toString()) ?? new Set()).values()];
 	}
 
 	registerPostCommitCommandsProvider(provider: PostCommitCommandsProvider): Disposable {

extensions/git/src/model.ts

@@ -2385,7 +2385,9 @@ export class Repository implements Disposable {
 					}
 				}
 
-				this.branchProtection.set(remote, matchers);
+				if (matchers.length !== 0) {
+					this.branchProtection.set(remote, matchers);
+				}
 			}
 		}
 

extensions/git/src/repository.ts

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// https://github.com/microsoft/vscode/issues/180582
+
+	export namespace workspace {
+		/**
+		 *
+		 * @param scheme The URI scheme that this provider can provide canonical URI identities for.
+		 * A canonical URI represents the conversion of a resource's alias into a source of truth URI.
+		 * Multiple aliases may convert to the same source of truth URI.
+		 * @param provider A provider which can convert URIs for workspace folders of scheme @param scheme to
+		 * a canonical URI identifier which is stable across machines.
+		 */
+		export function registerCanonicalUriIdentityProvider(scheme: string, provider: CanonicalUriIdentityProvider): Disposable;
+
+		/**
+		 *
+		 * @param uri The URI to provide a canonical URI identity for.
+		 * @param token A cancellation token for the request.
+		 */
+		export function provideCanonicalUriIdentity(uri: Uri, token: CancellationToken): ProviderResult<Uri>;
+	}
+
+	export interface CanonicalUriIdentityProvider {
+		/**
+		 *
+		 * @param uri The URI to provide a canonical URI identity for.
+		 * @param token A cancellation token for the request.
+		 * @returns The canonical URI identity for the requested URI.
+		 */
+		provideCanonicalUriIdentity(uri: Uri, token: CancellationToken): ProviderResult<Uri>;
+	}
+}