[automated] Merge branch 'release/9.0.2xx' => 'main'

NuGet.config

@@ -10,6 +10,7 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <add key="darc-pub-DotNet-msbuild-Trusted-4ae11fa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-4ae11fa8/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->

src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs

@@ -22,8 +22,11 @@ public IncrementalMSBuildWorkspace(IReporter reporter)
     {
         WorkspaceFailed += (_sender, diag) =>
         {
-            // Errors reported here are not fatal, an exception would be thrown for fatal issues.
-            reporter.Verbose($"MSBuildWorkspace warning: {diag.Diagnostic}");
+            // Report both Warning and Failure as warnings.
+            // MSBuildProjectLoader reports Failures for cases where we can safely continue loading projects
+            // (e.g. non-C#/VB project is ignored).
+            // https://github.com/dotnet/roslyn/issues/75170
+            reporter.Warn($"msbuild: {diag.Diagnostic}", "⚠");
         };
 
         _reporter = reporter;

src/Cli/dotnet/CommandFactory/CommandSpec.cs

@@ -6,8 +6,8 @@ namespace Microsoft.DotNet.CommandFactory
     public class CommandSpec
     {
         public CommandSpec(
-            string path,
-            string args,
+            string? path,
+            string? args,
             Dictionary<string, string> environmentVariables = null)
         {
             Path = path;

src/Cli/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsApplyResult.cs

@@ -5,7 +5,7 @@ namespace Microsoft.DotNet.Tools.Run.LaunchSettings
 {
     public class LaunchSettingsApplyResult
     {
-        public LaunchSettingsApplyResult(bool success, string failureReason, ProjectLaunchSettingsModel launchSettings = null)
+        public LaunchSettingsApplyResult(bool success, string? failureReason, ProjectLaunchSettingsModel launchSettings = null)
         {
             Success = success;
             FailureReason = failureReason;

src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsModel.cs

@@ -5,17 +5,17 @@ namespace Microsoft.DotNet.Tools.Run.LaunchSettings
 {
     public class ProjectLaunchSettingsModel
     {
-        public string LaunchProfileName { get; set; }
+        public string? LaunchProfileName { get; set; }
 
-        public string CommandLineArgs { get; set; }
+        public string? CommandLineArgs { get; set; }
 
         public bool LaunchBrowser { get; set; }
 
-        public string LaunchUrl { get; set; }
+        public string? LaunchUrl { get; set; }
 
-        public string ApplicationUrl { get; set; }
+        public string? ApplicationUrl { get; set; }
 
-        public string DotNetRunMessages { get; set; }
+        public string? DotNetRunMessages { get; set; }
 
         public Dictionary<string, string> EnvironmentVariables { get; } = new Dictionary<string, string>(StringComparer.Ordinal);
     }

src/Cli/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs

@@ -78,7 +78,7 @@ public LaunchSettingsApplyResult TryGetLaunchSettings(string? launchProfileName,
                     {
                         if (TryGetStringValue(environmentVariable.Value, out var environmentVariableValue))
                         {
-                            config.EnvironmentVariables[environmentVariable.Name] = environmentVariableValue;
+                            config.EnvironmentVariables[environmentVariable.Name] = environmentVariableValue!;
                         }
                     }
                 }

src/Cli/dotnet/commands/dotnet-workload/LocalizableStrings.resx

@@ -169,4 +169,12 @@
   <data name="WorkloadManifestInstallationConfiguration" xml:space="preserve">
     <value>Configured to use {0} when installing new manifests.</value>
   </data>
+  <data name="WorkloadSetFromGlobalJsonNotInstalled" xml:space="preserve">
+    <value>Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version.</value>
+    <comment>{Locked="dotnet workload restore"}</comment>
+  </data>
+  <data name="ShouldInstallAWorkloadSet" xml:space="preserve">
+    <value>Workloads are configured to install and update using workload versions, but none were found. Run "dotnet workload restore" to install a workload version.</value>
+    <comment>{Locked="dotnet workload restore"}</comment>
+  </data>
 </root>

src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs

@@ -85,7 +85,7 @@ protected bool VerifySignatures
         public WorkloadCommandBase(
             ParseResult parseResult,
             CliOption<VerbosityOptions> verbosityOptions = null,
-            IReporter reporter = null,
+            IReporter? reporter = null,
             string tempDirPath = null,
             INuGetPackageDownloader nugetPackageDownloader = null) : base(parseResult)
         {

src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs

@@ -42,26 +42,13 @@ internal static string GetWorkloadsVersion(WorkloadInfoHelper workloadInfoHelper
             var versionInfo = workloadInfoHelper.ManifestProvider.GetWorkloadVersion();
 
             // The explicit space here is intentional, as it's easy to miss in localization and crucial for parsing
-            return versionInfo.Version + (versionInfo.VersionNotInstalledMessage is not null ? ' ' + Workloads.Workload.List.LocalizableStrings.WorkloadVersionNotInstalledShort : string.Empty);
+            return versionInfo.Version + (versionInfo.IsInstalled ? string.Empty : ' ' + Workloads.Workload.List.LocalizableStrings.WorkloadVersionNotInstalledShort);
         }
 
         internal static void ShowWorkloadsInfo(ParseResult parseResult = null, WorkloadInfoHelper workloadInfoHelper = null, IReporter reporter = null, string dotnetDir = null, bool showVersion = true)
         {
             workloadInfoHelper ??= new WorkloadInfoHelper(parseResult != null ? parseResult.HasOption(SharedOptions.InteractiveOption) : false);
             reporter ??= Utils.Reporter.Output;
-            var globalJsonInformation = workloadInfoHelper.ManifestProvider.GetGlobalJsonInformation();
-            if (globalJsonInformation?.WorkloadVersionInstalled == false)
-            {
-                reporter.WriteLine(string.Format(Workloads.Workload.List.LocalizableStrings.WorkloadSetFromGlobalJsonNotInstalled, globalJsonInformation.GlobalJsonVersion, globalJsonInformation.GlobalJsonPath));
-                return;
-            }
-
-            IEnumerable<WorkloadId> installedList = workloadInfoHelper.InstalledSdkWorkloadIds;
-            InstalledWorkloadsCollection installedWorkloads = workloadInfoHelper.AddInstalledVsWorkloads(installedList);
-            string dotnetPath = dotnetDir ?? Path.GetDirectoryName(Environment.ProcessPath);
-
-
-
             var versionInfo = workloadInfoHelper.ManifestProvider.GetWorkloadVersion();
 
             void WriteUpdateModeAndAnyError(string indent = "")
@@ -70,10 +57,13 @@ void WriteUpdateModeAndAnyError(string indent = "")
                 var workloadSetsString = useWorkloadSets == true ? "workload sets" : "loose manifests";
                 reporter.WriteLine(indent + string.Format(CommonStrings.WorkloadManifestInstallationConfiguration, workloadSetsString));
 
-                var additionalMessage = versionInfo.VersionNotInstalledMessage ?? versionInfo.UpdateModeMessage;
-                if (additionalMessage != null)
+                if (!versionInfo.IsInstalled)
                 {
-                    reporter.WriteLine(indent + additionalMessage);
+                    reporter.WriteLine(indent + string.Format(CommonStrings.WorkloadSetFromGlobalJsonNotInstalled, versionInfo.Version, versionInfo.GlobalJsonPath));
+                }
+                else if (versionInfo.WorkloadSetsEnabledWithoutWorkloadSet)
+                {
+                    reporter.WriteLine(indent + CommonStrings.ShouldInstallAWorkloadSet);
                 }
             }
 
@@ -85,37 +75,44 @@ void WriteUpdateModeAndAnyError(string indent = "")
                 reporter.WriteLine();
             }
 
-            if (installedWorkloads.Count == 0)
-            {
-                reporter.WriteLine(CommonStrings.NoWorkloadsInstalledInfoWarning);
-            }
-            else
+            if (versionInfo.IsInstalled)
             {
-                var manifestInfoDict = workloadInfoHelper.WorkloadResolver.GetInstalledManifests().ToDictionary(info => info.Id, StringComparer.OrdinalIgnoreCase);
+                IEnumerable<WorkloadId> installedList = workloadInfoHelper.InstalledSdkWorkloadIds;
+                InstalledWorkloadsCollection installedWorkloads = workloadInfoHelper.AddInstalledVsWorkloads(installedList);
+                string dotnetPath = dotnetDir ?? Path.GetDirectoryName(Environment.ProcessPath);
 
-                foreach (var workload in installedWorkloads.AsEnumerable())
+                if (installedWorkloads.Count == 0)
                 {
-                    var workloadManifest = workloadInfoHelper.WorkloadResolver.GetManifestFromWorkload(new WorkloadId(workload.Key));
-                    var workloadFeatureBand = manifestInfoDict[workloadManifest.Id].ManifestFeatureBand;
+                    reporter.WriteLine(CommonStrings.NoWorkloadsInstalledInfoWarning);
+                }
+                else
+                {
+                    var manifestInfoDict = workloadInfoHelper.WorkloadResolver.GetInstalledManifests().ToDictionary(info => info.Id, StringComparer.OrdinalIgnoreCase);
+
+                    foreach (var workload in installedWorkloads.AsEnumerable())
+                    {
+                        var workloadManifest = workloadInfoHelper.WorkloadResolver.GetManifestFromWorkload(new WorkloadId(workload.Key));
+                        var workloadFeatureBand = manifestInfoDict[workloadManifest.Id].ManifestFeatureBand;
 
-                    const int align = 10;
-                    const string separator = "   ";
+                        const int align = 10;
+                        const string separator = "   ";
 
-                    reporter.WriteLine($" [{workload.Key}]");
+                        reporter.WriteLine($" [{workload.Key}]");
 
-                    reporter.Write($"{separator}{CommonStrings.WorkloadSourceColumn}:");
-                    reporter.WriteLine($" {workload.Value,align}");
+                        reporter.Write($"{separator}{CommonStrings.WorkloadSourceColumn}:");
+                        reporter.WriteLine($" {workload.Value,align}");
 
-                    reporter.Write($"{separator}{CommonStrings.WorkloadManifestVersionColumn}:");
-                    reporter.WriteLine($"    {workloadManifest.Version + '/' + workloadFeatureBand,align}");
+                        reporter.Write($"{separator}{CommonStrings.WorkloadManifestVersionColumn}:");
+                        reporter.WriteLine($"    {workloadManifest.Version + '/' + workloadFeatureBand,align}");
 
-                    reporter.Write($"{separator}{CommonStrings.WorkloadManifestPathColumn}:");
-                    reporter.WriteLine($"       {workloadManifest.ManifestPath,align}");
+                        reporter.Write($"{separator}{CommonStrings.WorkloadManifestPathColumn}:");
+                        reporter.WriteLine($"       {workloadManifest.ManifestPath,align}");
 
-                    reporter.Write($"{separator}{CommonStrings.WorkloadInstallTypeColumn}:");
-                    reporter.WriteLine($"       {WorkloadInstallType.GetWorkloadInstallType(new SdkFeatureBand(Utils.Product.Version), dotnetPath).ToString(),align}"
-                    );
-                    reporter.WriteLine("");
+                        reporter.Write($"{separator}{CommonStrings.WorkloadInstallTypeColumn}:");
+                        reporter.WriteLine($"       {WorkloadInstallType.GetWorkloadInstallType(new SdkFeatureBand(Utils.Product.Version), dotnetPath).ToString(),align}"
+                        );
+                        reporter.WriteLine("");
+                    }
                 }
             }
 

src/Cli/dotnet/commands/dotnet-workload/clean/WorkloadCleanCommand.cs

@@ -18,7 +18,7 @@ internal class WorkloadCleanCommand : WorkloadCommandBase
     {
         private readonly bool _cleanAll;
 
-        private string? _dotnetPath;
+        private string _dotnetPath;
         private string _userProfileDir;
 
         private readonly ReleaseVersion _sdkVersion;

src/Cli/dotnet/commands/dotnet-workload/config/WorkloadConfigCommand.cs

@@ -24,7 +24,7 @@ internal class WorkloadConfigCommand : WorkloadCommandBase
         private string? _updateMode;
         private readonly IWorkloadResolverFactory _workloadResolverFactory;
 
-        private string? _dotnetPath;
+        private string _dotnetPath;
         private string _userProfileDir;
         private readonly IWorkloadResolver _workloadResolver;
         private readonly ReleaseVersion _sdkVersion;

src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs

@@ -94,7 +94,7 @@ IEnumerable<PackInfo> GetPacksInWorkloads(IEnumerable<WorkloadId> workloadIds)
 
         public WorkloadSet InstallWorkloadSet(ITransactionContext context, string workloadSetVersion, DirectoryPath? offlineCache = null)
         {
-            string workloadSetPackageVersion = WorkloadSet.WorkloadSetVersionToWorkloadSetPackageVersion(workloadSetVersion, out SdkFeatureBand workloadSetFeatureBand);
+            string workloadSetPackageVersion = WorkloadSetVersion.ToWorkloadSetPackageVersion(workloadSetVersion, out SdkFeatureBand workloadSetFeatureBand);
             var workloadSetPackageId = GetManifestPackageId(new ManifestId(WorkloadManifestUpdater.WorkloadSetManifestId), workloadSetFeatureBand);
 
             var workloadSetPath = Path.Combine(_workloadRootDir, "sdk-manifests", _sdkFeatureBand.ToString(), "workloadsets", workloadSetVersion);
@@ -124,7 +124,7 @@ public WorkloadSet InstallWorkloadSet(ITransactionContext context, string worklo
 
         public async Task<WorkloadSet> GetWorkloadSetContentsAsync(string workloadSetVersion)
         {
-            string workloadSetPackageVersion = WorkloadSet.WorkloadSetVersionToWorkloadSetPackageVersion(workloadSetVersion, out var workloadSetFeatureBand);
+            string workloadSetPackageVersion = WorkloadSetVersion.ToWorkloadSetPackageVersion(workloadSetVersion, out var workloadSetFeatureBand);
             var packagePath = await _nugetPackageDownloader.DownloadPackageAsync(GetManifestPackageId(new ManifestId(WorkloadManifestUpdater.WorkloadSetManifestId), workloadSetFeatureBand),
                                 new NuGetVersion(workloadSetPackageVersion), _packageSourceLocation);
             var tempExtractionDir = Path.Combine(_tempPackagesDir.Value, $"{WorkloadManifestUpdater.WorkloadSetManifestId}-{workloadSetPackageVersion}-extracted");
@@ -381,7 +381,7 @@ public void GarbageCollect(Func<string, IWorkloadResolver> getResolverForWorkloa
             foreach ((string workloadSetVersion, _) in installedWorkloadSets)
             {
                 //  Get the feature band of the workload set
-                WorkloadSet.WorkloadSetVersionToWorkloadSetPackageVersion(workloadSetVersion, out var workloadSetFeatureBand);
+                WorkloadSetVersion.ToWorkloadSetPackageVersion(workloadSetVersion, out var workloadSetFeatureBand);
 
                 List<SdkFeatureBand> referencingFeatureBands;
                 if (!workloadSetInstallRecords.TryGetValue((workloadSetVersion, workloadSetFeatureBand), out referencingFeatureBands))

src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.InstallRecords.cs

@@ -34,7 +34,7 @@ protected List<WorkloadSetRecord> GetWorkloadSetRecords()
                     {
                         using RegistryKey workloadSetPackageVersionKey = workloadSetFeatureBandKey.OpenSubKey(workloadSetPackageVersion);
 
-                        string workloadSetVersion = WorkloadManifestUpdater.WorkloadSetPackageVersionToWorkloadSetVersion(new SdkFeatureBand(workloadSetFeatureBand), workloadSetPackageVersion);
+                        string workloadSetVersion = WorkloadSetVersion.FromWorkloadSetPackageVersion(new SdkFeatureBand(workloadSetFeatureBand), workloadSetPackageVersion);
 
                         WorkloadSetRecord record = new WorkloadSetRecord()
                         {

src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs

@@ -354,7 +354,7 @@ public WorkloadSet InstallWorkloadSet(ITransactionContext context, string worklo
         (MsiPayload msi, string msiPackageId, string installationFolder) GetWorkloadSetPayload(string workloadSetVersion, DirectoryPath? offlineCache)
         {
             SdkFeatureBand workloadSetFeatureBand;
-            string msiPackageVersion = WorkloadSet.WorkloadSetVersionToWorkloadSetPackageVersion(workloadSetVersion, out workloadSetFeatureBand);
+            string msiPackageVersion = WorkloadSetVersion.ToWorkloadSetPackageVersion(workloadSetVersion, out workloadSetFeatureBand);
             string msiPackageId = GetManifestPackageId(new ManifestId("Microsoft.NET.Workloads"), workloadSetFeatureBand).ToString();
 
             Log?.LogMessage($"Resolving Microsoft.NET.Workloads ({workloadSetVersion}) to {msiPackageId} ({msiPackageVersion}).");

src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs

@@ -153,16 +153,6 @@ public void DeleteUpdatableWorkloadsFile()
             }
         }
 
-        //  Corresponding method for opposite direction is in WorkloadSet class.  This version is kept here as implementation
-        //  depends on NuGetVersion
-        public static string WorkloadSetPackageVersionToWorkloadSetVersion(SdkFeatureBand sdkFeatureBand, string packageVersion)
-        {
-            var nugetVersion = new NuGetVersion(packageVersion);
-            var patch = nugetVersion.Patch > 0 ? $".{nugetVersion.Patch}" : string.Empty;
-            var release = string.IsNullOrWhiteSpace(nugetVersion.Release) ? string.Empty : $"-{nugetVersion.Release}";
-            return $"{sdkFeatureBand.Major}.{sdkFeatureBand.Minor}.{nugetVersion.Minor}{patch}{release}";
-        }
-
         public static void AdvertiseWorkloadUpdates()
         {
             try
@@ -362,7 +352,7 @@ private async Task<bool> UpdateManifestWithVersionAsync(string id, bool includeP
                         throw new NuGetPackageNotFoundException($"Requested workload version {packageVersion} of {id} but found version {downloadedPackageVersion} instead.");
                     }
 
-                    var workloadSetVersion = WorkloadSetPackageVersionToWorkloadSetVersion(band, downloadedPackageVersion.ToString());
+                    var workloadSetVersion = WorkloadSetVersion.FromWorkloadSetPackageVersion(band, downloadedPackageVersion.ToString());
                     File.WriteAllText(Path.Combine(adManifestPath, Constants.workloadSetVersionFileName), workloadSetVersion);
                 }
 

src/Cli/dotnet/commands/dotnet-workload/list/LocalizableStrings.resx

@@ -132,12 +132,9 @@
     <value>Workload version: {0}</value>
   </data>
   <data name="WorkloadSetFromGlobalJsonInstalled" xml:space="preserve">
-    <value>Found workload version {0} pinned in the global.json file at {1}.</value>
+    <value>Using workload version {0}, which was specified in the global.json file at {1}.</value>
   </data>
   <data name="WorkloadVersionNotInstalledShort" xml:space="preserve">
     <value>(not installed)</value>
   </data>
-  <data name="WorkloadSetFromGlobalJsonNotInstalled" xml:space="preserve">
-    <value>Found workload version {0} pinned in the global.json file at {1}, but it was not installed. Running `dotnet workload install`, `dotnet workload update`, or `dotnet workload restore` may fix this.</value>
-  </data>
-</root>
+</root>