[Production Rollout] Rollout 2025-07-09 (#5041)

<!-- Link the GitHub or AzDO issue this pull request is associated with.
Please copy and paste the full URL rather than using the
dotnet/arcade-services# syntax -->
#5040

---------

Co-authored-by: Přemek Vysoký <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: premun <[email protected]>
Co-authored-by: ondrejsmid <[email protected]>
Co-authored-by: Adam <[email protected]>

Author: 5 people

docs/Darc.md

@@ -65,13 +65,13 @@ use darc to achieve them, as well as a general reference guide to darc commands.
 
   Darc also has a suite of new VMR commands. These all have the following format `darc vmr <command>`:
   - [initialize](#initialize) - Initializes new repo(s) that haven't been synchronized into the VMR yet.
-  - [update](#update) - Updates given repo(s) in the VMR to match given refs.
   - [backflow](#backflow) - Flows source code from the current commit of a locally checked out VMR into a target local repository.
   - [cherry-pick](#cherry-pick) - Cherry-picks a single commit from a repository to/from the VMR.
   - [forwardflow](#forwardflow) - Flows source code from the current commit of a local repository into a local VMR.
   - [generate-tpn](#generate-tpn) - Generates a new THIRD-PARTY-NOTICES.txt.
   - [get-version](#get-version) - Gets the current version (a SHA) of a repository in the VMR.
   - [push](#push) - Pushes given VMR branch to a given remote.
+  - [reset](#reset) - Resets the contents of a VMR mapping to match a specific commit SHA from the source repository.
   - [diff](#diff) - Diffs the VMR and the product repositories.
 
 ## Scenarios
@@ -2681,16 +2681,6 @@ Initializes new repo(s) that haven't been synchronized into the VMR yet. The new
 darc vmr initialize -r --source-mappings <path to source mappings> arcade-services
 ```
 
-### **`update`**
-
-Updates given repo(s) in the VMR to match given refs. This command was primarely used in the dotnet/sdk pipelines to recursevly update the VMR with the latest commits.
-The command shouldn't be used for local development, [backflow](#backflow) and [forwardflow](#forwardflow) commands are reccomended for this scenario
-
-**Sample**
-```
-darc vmr update --recursive sdk:<sha>
-```
-
 ### **`backflow`**
 
 Flows source code from the current commit of a locally checked out VMR into a target local repository. Must be called from
@@ -2762,6 +2752,19 @@ Note: this command was used prior to onboarding repos onto flat flow to push new
 darc vmr push --remote-url https://github.com/myfork/dotnet --branch main --skip-commit-verification
 ```
 
+### **`reset`**
+
+Resets the contents of a VMR mapping to match a specific commit SHA from the source repository, effectively restoring the mapping to a known good state. This command takes a single parameter in the format `[mapping]:[sha]`.
+
+**Sample**
+```
+# Reset runtime mapping to specific commit
+darc vmr reset runtime:abc123def456
+# Invalid format - shows clear error
+darc vmr reset invalid-format
+# Output: fail: Invalid format. Expected [mapping]:[sha] but got: invalid-format
+```
+
 ### **`diff`**
 
 Diffs the VMR and the product repositories. Outputs the diff to stdout or saves it to a patch file (or multiple if patch > 1 GB), if --output-path is provided.

eng/enforce-issue.ps1

@@ -24,19 +24,27 @@ elseif ($prDetail.title -match "\[automated\]") {
 	exit 0
 }
 
-# Look for https://github.com/dotnet/arcade-services/issues/3625
-$hasIssue = $prDetail.body -Match "github\.com/dotnet/(.+)/issues/(\d+)"
+
+$issuePatterns = @{
+    "GitHub Full Link"      = "github\.com/dotnet/(.+)/issues/(\d+)" # Eg: https://github.com/dotnet/arcade-services/issues/3625
+    "AzDO DevOps Link"      = "dev\.azure\.com/(.+)/(.+)/_workitems" #Eg: https://dev.azure.com/dnceng/internal/_workitems/edit/45126
+    "AzDO Visual Studio Link" = "(.+)\.visualstudio\.com/(.+)/_workitems"
+    "GitHub Issue Shortcut" = "(?<!\w)#\d+\b" # Eg: #5374
+}
+
+$hasIssue = $false
+
+foreach ($name in $issuePatterns.Keys) {
+    if ($prDetail.body -match $issuePatterns[$name]) {
+        Write-Host "Found issue link matching pattern: $name"
+        $hasIssue = $true
+        break
+    }
+}
+
 if (-not $hasIssue) {
-	# Or for https://dev.azure.com/dnceng/internal/_workitems/edit/45126
-	$hasIssue = $prDetail.body -Match "dev\.azure\.com/(.+)/(.+)/_workitems"
-	if (-not $hasIssue) {
-		# Or for https://dev.azure.com/dnceng/internal/_workitems/edit/12345
-		$hasIssue = $prDetail.body -Match "(.+)\.visualstudio\.com/(.+)/_workitems"
-		if (-not $hasIssue) {
-			Write-Host "##vso[task.LogIssue type=error;]Link to the corresponding GitHub/AzDO issue is missing in the PR description. Check failed."
-			exit 1
-		}
-	}
+    Write-Host "##vso[task.LogIssue type=error;]Link to the corresponding GitHub/AzDO issue is missing in the PR description. Check failed."
+    exit 1
 }
 
 exit 0

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/CodeFlowOperation.cs

@@ -125,7 +125,6 @@ protected async Task FlowCodeLocallyAsync(
                     excludedAssets: [],
                     tmpTargetBranch,
                     tmpHeadBranch,
-                    discardPatches: true,
                     headBranchExisted: false,
                     cancellationToken);
             }

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/InitializeOperation.cs

@@ -37,16 +37,12 @@ protected override async Task ExecuteInternalAsync(
         await _vmrInitializer.InitializeRepository(
             repoName,
             targetRevision,
-            _options.Recursive,
             new NativePath(_options.SourceMappings),
             new CodeFlowParameters(
                 additionalRemotes,
                 _options.TpnTemplate,
                 _options.GenerateCodeowners,
-                _options.GenerateCredScanSuppressions,
-                _options.DiscardPatches,
-                ApplyAdditionalMappings: true),
-            _options.EnableBuildLookUp,
+                _options.GenerateCredScanSuppressions),
             cancellationToken);
     }
 }

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ResetOperation.cs

@@ -0,0 +1,154 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
+using Microsoft.DotNet.DarcLib;
+using Microsoft.DotNet.DarcLib.Helpers;
+using Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
+using Microsoft.DotNet.DarcLib.VirtualMonoRepo;
+using Microsoft.Extensions.Logging;
+
+#nullable enable
+namespace Microsoft.DotNet.Darc.Operations.VirtualMonoRepo;
+
+internal class ResetOperation : Operation
+{
+    private readonly ResetCommandLineOptions _options;
+    private readonly IVmrInfo _vmrInfo;
+    private readonly IVmrUpdater _vmrUpdater;
+    private readonly IVmrDependencyTracker _dependencyTracker;
+    private readonly IProcessManager _processManager;
+    private readonly ILogger<ResetOperation> _logger;
+
+    public ResetOperation(
+        ResetCommandLineOptions options,
+        IVmrInfo vmrInfo,
+        IVmrUpdater vmrUpdater,
+        IVmrDependencyTracker dependencyTracker,
+        IProcessManager processManager,
+        ILogger<ResetOperation> logger)
+    {
+        _options = options;
+        _vmrInfo = vmrInfo;
+        _vmrUpdater = vmrUpdater;
+        _dependencyTracker = dependencyTracker;
+        _processManager = processManager;
+        _logger = logger;
+    }
+
+    public override async Task<int> ExecuteAsync()
+    {
+        // Parse the mapping:sha parameter
+        var parts = _options.Target.Split(':', 2);
+        if (parts.Length != 2)
+        {
+            _logger.LogError("Invalid format. Expected [mapping]:[sha] but got: {input}", _options.Target);
+            return Constants.ErrorCode;
+        }
+
+        var mappingName = parts[0];
+        var targetSha = parts[1];
+
+        if (string.IsNullOrWhiteSpace(mappingName) || string.IsNullOrWhiteSpace(targetSha))
+        {
+            _logger.LogError("Both mapping name and SHA must be provided. Got mapping: '{mapping}', SHA: '{sha}'",
+                mappingName, targetSha);
+            return Constants.ErrorCode;
+        }
+
+        _logger.LogInformation("Resetting VMR mapping '{mapping}' to SHA '{sha}'", mappingName, targetSha);
+
+        _vmrInfo.VmrPath = new NativePath(_options.VmrPath);
+
+        // Validate that the mapping exists
+        await _dependencyTracker.RefreshMetadata();
+
+        SourceMapping mapping;
+        try
+        {
+            mapping = _dependencyTracker.GetMapping(mappingName);
+            _logger.LogInformation("Found mapping '{mapping}' pointing to remote '{remote}'",
+                mappingName, mapping.DefaultRemote);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Mapping '{mapping}' not found: {error}", mappingName, ex.Message);
+            return Constants.ErrorCode;
+        }
+
+        var currentVersion = _dependencyTracker.GetDependencyVersion(mapping);
+        if (currentVersion == null)
+        {
+            _logger.LogError("Could not find current dependency version for mapping '{mapping}'", mappingName);
+            return Constants.ErrorCode;
+        }
+
+        // Additional remotes are in the form of [mapping name]:[remote URI]
+        IReadOnlyCollection<AdditionalRemote> additionalRemotes = Array.Empty<AdditionalRemote>();
+        if (_options.AdditionalRemotes != null)
+        {
+            additionalRemotes = _options.AdditionalRemotes
+                .Select(a => a.Split(':', 2))
+                .Select(parts => new AdditionalRemote(parts[0], parts[1]))
+                .ToImmutableArray();
+        }
+
+        // Perform the reset by updating to the target SHA
+        // This will erase differences and repopulate content to match the target SHA
+        var codeFlowParameters = new CodeFlowParameters(
+            AdditionalRemotes: additionalRemotes,
+            TpnTemplatePath: null,
+            GenerateCodeOwners: false,
+            GenerateCredScanSuppressions: false);
+
+        // We will remove everything not-cloaked and replace it with current contents of the source repo
+        // When flowing to the VMR, we remove all files but the cloaked files
+        List<string> removalFilters =
+        [
+            .. mapping.Include.Select(VmrPatchHandler.GetInclusionRule),
+            .. mapping.Exclude.Select(VmrPatchHandler.GetExclusionRule)
+        ];
+
+        try
+        {
+            // Delete all uncloaked files in the mapping directory
+            var targetDir = _vmrInfo.GetRepoSourcesPath(mapping);
+            var result = await _processManager.Execute(
+                _processManager.GitExecutable,
+                ["rm", "-r", "-q", "--", .. removalFilters],
+                workingDir: targetDir);
+
+            result.ThrowIfFailed($"Failed to remove files in {targetDir}");
+
+            // Tell the VMR dependency tracker that the repository has been reset
+            _dependencyTracker.UpdateDependencyVersion(new VmrDependencyUpdate(
+                mapping,
+                mapping.DefaultRemote,
+                DarcLib.Constants.EmptyGitObject,
+                Parent: null,
+                OfficialBuildId: null,
+                BarId: null));
+
+            await _vmrUpdater.UpdateRepository(
+                mappingName,
+                targetSha,
+                codeFlowParameters,
+                resetToRemoteWhenCloningRepo: false,
+                CancellationToken.None);
+
+            _logger.LogInformation("Successfully reset {mapping} to {sha}", mappingName, targetSha);
+            return Constants.SuccessCode;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "An error occurred while resetting {mapping}", mappingName);
+            return Constants.ErrorCode;
+        }
+    }
+}

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/UpdateOperation.cs

@@ -1,22 +1,36 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Generic;
 using CommandLine;
 using Microsoft.DotNet.Darc.Operations.VirtualMonoRepo;
-using Microsoft.DotNet.DarcLib.Helpers;
 using Microsoft.DotNet.DarcLib.VirtualMonoRepo;
 
 namespace Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
 
 [Verb("initialize", HelpText = "Initializes new repo(s) that haven't been synchronized into the VMR yet.")]
-internal class InitializeCommandLineOptions : VmrSyncCommandLineOptions<InitializeOperation>
+internal class InitializeCommandLineOptions : VmrCommandLineOptions<InitializeOperation>, IBaseVmrCommandLineOptions
 {
-    [Option('r', "recursive", Required = false, HelpText = $"Process also dependencies (from {VersionFiles.VersionDetailsXml}) recursively.")]
-    public bool Recursive { get; set; } = false;
-
     [Option("source-mappings", Required = true, HelpText = $"A path to the {VmrInfo.SourceMappingsFileName} file to be used for syncing.")]
     public string SourceMappings { get; set; }
 
-    [Option("enable-build-lookup", Required = false, HelpText = "Look up package versions and build number from BAR when populating version files.")]
-    public bool EnableBuildLookUp { get; set; } = false;
+    [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; }
+
+    [Value(0, Required = true, HelpText =
+        "Repository names in the form of NAME or NAME:REVISION where REVISION is a commit SHA or other git reference (branch, tag). " +
+        "Omitting REVISION will synchronize the repo to current HEAD.")]
+    public IEnumerable<string> Repositories { get; set; }
+
+    [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;
 }