Add darc vmr add-repo and remove-repo commands #5415

Copilot · 2025-10-30T14:27:38Z

Adds explicit commands for adding/removing repositories from the VMR. Previously, users had to use the less discoverable initialize command for additions, and removal required manual manipulation of VMR files.

Changes

New Commands:

darc vmr add-repo - Aliases existing IVmrInitializer functionality for better discoverability
darc vmr remove-repo - New command that removes repos from VMR

Implementation:

Created IVmrRemover interface and VmrRemover implementation extending VmrManagerBase
Both commands use hardcoded settings for consistency: TpnTemplate = THIRD-PARTY-NOTICES.txt, GenerateCodeowners = false, GenerateCredScanSuppressions = true
add-repo uses default source-mappings path from VmrInfo.DefaultRelativeSourceMappingsPath
Removal updates: source manifest, source directories, and regenerates TPN and CredScanSuppressions
Both commands registered in VMR subcommand group

Usage:

# Add a repository (uses default source-mappings.json from src/ directory)
darc vmr add-repo runtime:main

# Remove a repository
darc vmr remove-repo runtime

The initialize command remains for backward compatibility.

Fixes Create darc vmr add-repo and darc vmr remove-repo commands #5414

Original prompt

This section details on the original issue you should resolve

<issue_title>Create darc vmr add-repo and darc vmr remove-repo commands</issue_title>
<issue_description>To facilitate changing the VMR to include more repos (e.g. adding something into a feature band), or removal (initializing a feature band by removing shared components), it is necessary to have add and remove commands. There is sort of an add command today (initialize), but no remove.

Recommended course of action is to make darc vmr initialize into add-repo. However, if initialize does more than add a repo, then it should be retained and add-repo would added to the vmr command set. In addition, a remove-repo would also be created.

The commands should update all files that are involved in a repo being in the VMR, with one notable exception

Source mappings

source manifest

cred scan suppressoins

3rd party notices

src/

Exception: Repo projects - If a repo project is present in the repo, remove should NOT remove it. The repo project tends to have a bit of non-mechanically creatable logic. However, on add, if a repo project is missing, one should be created. This file should just be a barebones <Project Sdk="Microsoft.Build.NoTargets"> project.

Additional notes:

When adding a specific sha and remote of the source repo given to do initial population of sources.

Changes should be staged locally

The add command should accept these arguments:

Remote URI - required

Commit SHA - required

List of file exclusions (optional)

The remove command should accept repository (mapping) name</issue_description>

Comments on the Issue (you are @copilot in this section)

Fixes Create darc vmr add-repo and darc vmr remove-repo commands #5414

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: premun <[email protected]>

premun · 2025-10-30T14:51:36Z

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/AddRepoCommandLineOptions.cs

+    [Option("tpn-template", Required = false, HelpText = "Path to a template for generating VMRs THIRD-PARTY-NOTICES file. Leave empty to skip generation.")]
+    public string TpnTemplate { get; set; }
+
+    [Option("generate-codeowners", Required = false, HelpText = "Generate a common CODEOWNERS file for all repositories.")]
+    public bool GenerateCodeowners { get; set; } = false;
+
+    [Option("generate-credscansuppressions", Required = false, HelpText = "Generate a common .config/CredScanSuppressions.json file for all repositories.")]
+    public bool GenerateCredScanSuppressions { get; set; } = false;


@copilot remove these. The settings should be hardcoded to:

TpnTemplate to VmrInfo.ThirdPartyNoticesFileName

GenerateCodeowners to false

GenerateCredScanSuppressions to true

Same for the removal command

Done. Removed all optional parameters and hardcoded the settings as requested. (2603e44)

premun · 2025-10-30T14:52:15Z

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/AddRepoCommandLineOptions.cs

+    [Option("additional-remotes", Required = false, HelpText =
+        "List of additional remote URIs to add to mappings in the format [mapping name]:[remote URI]. " +
+        "Example: installer:https://github.com/myfork/installer sdk:/local/path/to/sdk")]
+    [RedactFromLogging]
+    public IEnumerable<string> AdditionalRemotes { get; set; }


@copilot remove this one

Done. Removed additional-remotes option. (2603e44)

premun · 2025-10-30T14:52:49Z

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/AddRepoCommandLineOptions.cs

+    [Option("source-mappings", Required = true, HelpText = $"A path to the {VmrInfo.SourceMappingsFileName} file to be used for syncing.")]
+    public string SourceMappings { get; set; }


@copilot this one, the default path from VmrInfo should be used

Done. Removed source-mappings option and now using default path from VmrInfo. (2603e44)

premun · 2025-10-30T14:53:14Z

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/RemoveRepoCommandLineOptions.cs

+    [Option("additional-remotes", Required = false, Hidden = true)]
+    [RedactFromLogging]
+    public IEnumerable<string> AdditionalRemotes { get; set; }


@copilot remove this one

Done. Removed additional-remotes option. (2603e44)

premun · 2025-10-30T14:54:48Z

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrRemover.cs

+    private async Task RegenerateThirdPartyNoticesAsync(string templatePath, CancellationToken cancellationToken)
+    {
+        _logger.LogInformation("Regenerating third-party notices");
+        await _thirdPartyNoticesGenerator.UpdateThirdPartyNotices(templatePath);
+        await _localGitClient.StageAsync(_vmrInfo.VmrPath, new[] { VmrInfo.ThirdPartyNoticesFileName }, cancellationToken);
+    }
+
+    private async Task RegenerateCodeownersAsync(CancellationToken cancellationToken)
+    {
+        _logger.LogInformation("Regenerating CODEOWNERS");
+        await _codeownersGenerator.UpdateCodeowners(cancellationToken);
+    }
+
+    private async Task RegenerateCredScanSuppressionsAsync(CancellationToken cancellationToken)
+    {
+        _logger.LogInformation("Regenerating credential scan suppressions");
+        await _credScanSuppressionsGenerator.UpdateCredScanSuppressions(cancellationToken);
+    }


@copilot Do not define these as methods but call them directly and remove the logging which is inside of the methods (or should be).

Done. Inlined all three methods and removed the extra logging. (2603e44)

premun · 2025-10-30T14:55:12Z

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrRemover.cs

+    private string PrepareCommitMessage(string template, string repoName)
+    {
+        return template.Replace("{name}", repoName);
+    }


@copilot Inline this too

Done. Inlined PrepareCommitMessage. (2603e44)

Co-authored-by: premun <[email protected]>

Initial plan

be23e7e

Copilot AI assigned Copilot and premun Oct 30, 2025

Copilot started work on behalf of premun October 30, 2025 14:29 View session

Copilot AI and others added 4 commits October 30, 2025 14:41

Add add-repo and remove-repo VMR commands

5c7d6ad

Co-authored-by: premun <[email protected]>

Address code review feedback

9f2f52d

Co-authored-by: premun <[email protected]>

Final implementation of add-repo and remove-repo commands

5a9fc52

Co-authored-by: premun <[email protected]>

Remove accidentally committed nuget.exe

3c4c5ad

Copilot AI changed the title ~~[WIP] Add darc vmr add-repo and remove-repo commands~~ Add darc vmr add-repo and remove-repo commands Oct 30, 2025

Copilot AI requested a review from premun October 30, 2025 14:53

Copilot finished work on behalf of premun October 30, 2025 14:53

premun reviewed Oct 30, 2025

View reviewed changes

Copilot started work on behalf of premun October 30, 2025 14:58 View session

Address code review feedback - simplify commands and hardcode settings

2603e44

Co-authored-by: premun <[email protected]>

Copilot AI requested a review from premun October 30, 2025 15:05

Copilot finished work on behalf of premun October 30, 2025 15:05

		[Option("source-mappings", Required = true, HelpText = $"A path to the {VmrInfo.SourceMappingsFileName} file to be used for syncing.")]
		public string SourceMappings { get; set; }

Add darc vmr add-repo and remove-repo commands #5415

Are you sure you want to change the base?

Add darc vmr add-repo and remove-repo commands #5415

Uh oh!

Conversation

Copilot AI commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Comments on the Issue (you are @copilot in this section)

Uh oh!

premun Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

premun Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

premun Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

premun Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

premun Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

premun Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

premun Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Copilot AI commented Oct 30, 2025 •

edited

Loading