[automated] Merge branch 'release/10.0.2xx' => 'release/10.0.3xx'

eng/Versions.props

@@ -37,8 +37,8 @@
     <VersionFeature60>36</VersionFeature60>
     <VersionFeature70>20</VersionFeature70>
     <!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
-    <VersionFeature80>22</VersionFeature80>
-    <VersionFeature90>11</VersionFeature90>
+    <VersionFeature80>23</VersionFeature80>
+    <VersionFeature90>12</VersionFeature90>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
     <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -1572,4 +1572,8 @@ Proceed?</value>
   <data name="DurationColon" xml:space="preserve">
     <value>duration:</value>
   </data>
+  <data name="WorkloadSetHasMissingManifests" xml:space="preserve">
+    <value>Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this.</value>
+    <comment>{0} is the workload set version. {Locked="dotnet workload repair"}</comment>
+  </data>
 </root>

src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
 using System.IO.Pipes;
 using System.Threading;
 using Microsoft.DotNet.Cli.Commands.Test.IPC;
@@ -129,6 +130,7 @@ private ProcessStartInfo CreateProcessStartInfo()
             processStartInfo.Environment[Module.DotnetRootArchVariableName] = Path.GetDirectoryName(new Muxer().MuxerPath);
         }
 
+        processStartInfo.Environment["DOTNET_CLI_TEST_COMMAND_WORKING_DIRECTORY"] = Directory.GetCurrentDirectory();
         return processStartInfo;
     }
 

src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs

@@ -5,6 +5,7 @@
 
 using System.Collections.Concurrent;
 using System.Text.Json;
+using Microsoft.DotNet.Cli.Commands.Workload;
 using Microsoft.DotNet.Cli.Commands.Workload.Config;
 using Microsoft.DotNet.Cli.Commands.Workload.Install.WorkloadInstallRecords;
 using Microsoft.DotNet.Cli.Extensions;
@@ -643,7 +644,7 @@ public IEnumerable<WorkloadHistoryRecord> GetWorkloadHistoryRecords(string sdkFe
     public void Shutdown()
     {
         // Perform any additional cleanup here that's intended to run at the end of the command, regardless
-        // of success or failure. For file based installs, there shouldn't be any additional work to 
+        // of success or failure. For file based installs, there shouldn't be any additional work to
         // perform.
     }
 

src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallerFactory.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using Microsoft.DotNet.Cli.Commands.Workload;
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
@@ -48,7 +49,7 @@ public static IInstaller GetWorkloadInstaller(
 
         userProfileDir ??= CliFolderPathCalculator.DotnetUserProfileFolderPath;
 
-        return new FileBasedInstaller(
+        var installer = new FileBasedInstaller(
             reporter,
             sdkFeatureBand,
             workloadResolver,
@@ -59,6 +60,25 @@ public static IInstaller GetWorkloadInstaller(
             verbosity: verbosity,
             packageSourceLocation: packageSourceLocation,
             restoreActionConfig: restoreActionConfig);
+
+        // Attach corruption repairer to recover from corrupt workload sets
+        if (nugetPackageDownloader is not null &&
+            workloadResolver?.GetWorkloadManifestProvider() is SdkDirectoryWorkloadManifestProvider sdkProvider &&
+            sdkProvider.CorruptionRepairer is null)
+        {
+            sdkProvider.CorruptionRepairer = new WorkloadManifestCorruptionRepairer(
+                reporter,
+                installer,
+                workloadResolver,
+                sdkFeatureBand,
+                dotnetDir,
+                userProfileDir,
+                nugetPackageDownloader,
+                packageSourceLocation,
+                verbosity);
+        }
+
+        return installer;
     }
 
     private static bool CanWriteToDotnetRoot(string dotnetDir = null)

src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommand.cs

@@ -70,7 +70,8 @@ public override int Execute()
             {
                 Reporter.WriteLine();
 
-                var workloadIds = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(new SdkFeatureBand(_sdkVersion));
+                var sdkFeatureBand = new SdkFeatureBand(_sdkVersion);
+                var workloadIds = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(sdkFeatureBand);
 
                 if (!workloadIds.Any())
                 {
@@ -80,7 +81,7 @@ public override int Execute()
 
                 Reporter.WriteLine(string.Format(CliCommandStrings.RepairingWorkloads, string.Join(" ", workloadIds)));
 
-                ReinstallWorkloadsBasedOnCurrentManifests(workloadIds, new SdkFeatureBand(_sdkVersion));
+                ReinstallWorkloadsBasedOnCurrentManifests(workloadIds, sdkFeatureBand);
 
                 WorkloadInstallCommand.TryRunGarbageCollection(_workloadInstaller, Reporter, Verbosity, workloadSetVersion => _workloadResolverFactory.CreateForWorkloadSet(_dotnetPath, _sdkVersion.ToString(), _userProfileDir, workloadSetVersion));
 
@@ -106,4 +107,5 @@ private void ReinstallWorkloadsBasedOnCurrentManifests(IEnumerable<WorkloadId> w
     {
         _workloadInstaller.RepairWorkloads(workloadIds, sdkFeatureBand);
     }
+
 }

src/Cli/dotnet/Commands/Workload/WorkloadHistoryRecorder.cs

@@ -54,6 +54,10 @@ public void Run(Action workloadAction)
     private WorkloadHistoryState GetWorkloadState()
     {
         var resolver = _workloadResolverFunc();
+        if (resolver.GetWorkloadManifestProvider() is SdkDirectoryWorkloadManifestProvider sdkProvider)
+        {
+            sdkProvider.CorruptionFailureMode = ManifestCorruptionFailureMode.Ignore;
+        }
         var currentWorkloadVersion = resolver.GetWorkloadVersion().Version;
         return new WorkloadHistoryState()
         {

src/Cli/dotnet/Commands/Workload/WorkloadManifestCorruptionRepairer.cs

@@ -0,0 +1,121 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.DotNet.Cli;
+using Microsoft.DotNet.Cli.Commands.Workload.Install;
+using Microsoft.DotNet.Cli.NuGetPackageDownloader;
+using Microsoft.DotNet.Cli.Utils;
+using Microsoft.NET.Sdk.WorkloadManifestReader;
+
+namespace Microsoft.DotNet.Cli.Commands.Workload;
+
+internal sealed class WorkloadManifestCorruptionRepairer : IWorkloadManifestCorruptionRepairer
+{
+    private readonly IReporter _reporter;
+    private readonly IInstaller _workloadInstaller;
+    private readonly IWorkloadResolver _workloadResolver;
+    private readonly SdkFeatureBand _sdkFeatureBand;
+    private readonly string _dotnetPath;
+    private readonly string _userProfileDir;
+    private readonly INuGetPackageDownloader? _packageDownloader;
+    private readonly PackageSourceLocation? _packageSourceLocation;
+    private readonly VerbosityOptions _verbosity;
+
+    private bool _checked;
+
+    public WorkloadManifestCorruptionRepairer(
+        IReporter reporter,
+        IInstaller workloadInstaller,
+        IWorkloadResolver workloadResolver,
+        SdkFeatureBand sdkFeatureBand,
+        string dotnetPath,
+        string userProfileDir,
+        INuGetPackageDownloader? packageDownloader,
+        PackageSourceLocation? packageSourceLocation,
+        VerbosityOptions verbosity)
+    {
+        _reporter = reporter ?? NullReporter.Instance;
+        _workloadInstaller = workloadInstaller;
+        _workloadResolver = workloadResolver;
+        _sdkFeatureBand = sdkFeatureBand;
+        _dotnetPath = dotnetPath;
+        _userProfileDir = userProfileDir;
+        _packageDownloader = packageDownloader;
+        _packageSourceLocation = packageSourceLocation;
+        _verbosity = verbosity;
+    }
+
+    public void EnsureManifestsHealthy(ManifestCorruptionFailureMode failureMode)
+    {
+        if (_checked)
+        {
+            return;
+        }
+
+        _checked = true;
+
+        if (failureMode == ManifestCorruptionFailureMode.Ignore)
+        {
+            return;
+        }
+
+        // Get the workload set directly from the provider - it was already resolved during construction
+        // and doesn't require reading the install state file again
+        var provider = _workloadResolver.GetWorkloadManifestProvider() as SdkDirectoryWorkloadManifestProvider;
+        var workloadSet = provider?.ResolvedWorkloadSet;
+
+        if (workloadSet is null)
+        {
+            // No workload set is being used
+            return;
+        }
+
+        if (!provider?.HasMissingManifests(workloadSet) ?? true)
+        {
+            return;
+        }
+
+        if (failureMode == ManifestCorruptionFailureMode.Throw)
+        {
+            throw new InvalidOperationException(string.Format(CliCommandStrings.WorkloadSetHasMissingManifests, workloadSet.Version));
+        }
+
+        _reporter.WriteLine($"Repairing workload set {workloadSet.Version}...");
+        CliTransaction.RunNew(context => RepairCorruptWorkloadSet(context, workloadSet));
+    }
+
+
+
+    private void RepairCorruptWorkloadSet(ITransactionContext context, WorkloadSet workloadSet)
+    {
+        var manifestUpdates = CreateManifestUpdatesFromWorkloadSet(workloadSet);
+
+        foreach (var manifestUpdate in manifestUpdates)
+        {
+            _workloadInstaller.InstallWorkloadManifest(manifestUpdate, context);
+        }
+
+    }
+
+    [MemberNotNull(nameof(_packageDownloader))]
+    private IEnumerable<ManifestVersionUpdate> CreateManifestUpdatesFromWorkloadSet(WorkloadSet workloadSet)
+    {
+        if (_packageDownloader is null)
+        {
+            throw new InvalidOperationException("Package downloader is required to repair workload manifests.");
+        }
+
+        var manifestUpdater = new WorkloadManifestUpdater(
+            _reporter,
+            _workloadResolver,
+            _packageDownloader,
+            _userProfileDir,
+            _workloadInstaller.GetWorkloadInstallationRecordRepository(),
+            _workloadInstaller,
+            _packageSourceLocation,
+            displayManifestUpdates: _verbosity >= VerbosityOptions.detailed);
+
+        return manifestUpdater.CalculateManifestUpdatesForWorkloadSet(workloadSet);
+    }
+}