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

.vsts-ci.yml

@@ -5,7 +5,7 @@ trigger:
   branches:
     include:
     - main
-    - release/9.0.1xx
+    - release/9.0.2xx
     - internal/release/*
     - exp/*
 

NuGet.config

@@ -4,6 +4,8 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspire -->
+    <add key="darc-pub-dotnet-aspire-137e8dc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-137e8dca/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-aspire-137e8dc-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-137e8dca-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspire -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->

eng/Version.Details.xml

@@ -660,14 +660,14 @@
       aren't shipping, or those extensions packages depend on aspnetcore packages that won't ship. However, given the cost
       of maintaining this coherency path is high. This being toolset means that aspire is responsible for its own coherency.
     -->
-    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="9.0.0-preview.4.24456.4">
+    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.2.1">
       <Uri>https://github.com/dotnet/aspire</Uri>
-      <Sha>b88ce9e7cb0430fb0b4e2d018f13694a4c733289</Sha>
+      <Sha>137e8dcae0a7b22c05f48c4e7a5d36fe3f00a8d7</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.aspire" Version="9.0.0-preview.4.24456.4">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.aspire" Version="8.2.1-preview.1.24473.4">
       <Uri>https://github.com/dotnet/aspire</Uri>
-      <Sha>b88ce9e7cb0430fb0b4e2d018f13694a4c733289</Sha>
+      <Sha>137e8dcae0a7b22c05f48c4e7a5d36fe3f00a8d7</Sha>
       <SourceBuild RepoName="aspire" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.IO.Redist" Version="6.0.1">

eng/Versions.props

@@ -362,7 +362,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Workload manifest package versions">
     <AspireFeatureBand>8.0.100</AspireFeatureBand>
-    <MicrosoftNETSdkAspireManifest80100PackageVersion>9.0.0-preview.4.24456.4</MicrosoftNETSdkAspireManifest80100PackageVersion>
+    <MicrosoftNETSdkAspireManifest80100PackageVersion>8.2.1</MicrosoftNETSdkAspireManifest80100PackageVersion>
     <MauiFeatureBand>9.0.100-preview.6</MauiFeatureBand>
     <MauiWorkloadManifestVersion>9.0.0-preview.6.24327.7</MauiWorkloadManifestVersion>
     <XamarinAndroidWorkloadManifestVersion>34.99.0-preview.6.340</XamarinAndroidWorkloadManifestVersion>

sdk.sln

@@ -510,6 +510,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.WebTools.AspireSe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Sdk.Compilers.Toolset", "src\Microsoft.Net.Sdk.Compilers.Toolset\Microsoft.Net.Sdk.Compilers.Toolset.csproj", "{FA579C03-2EB4-4D47-88EE-BFF339E96FAF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.WebTools.AspireService.Tests", "test\Microsoft.WebTools.AspireService.Tests\Microsoft.WebTools.AspireService.Tests.csproj", "{1F0B4B3C-DC88-4740-B04F-1707102E9930}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -968,6 +970,10 @@ Global
 		{FA579C03-2EB4-4D47-88EE-BFF339E96FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA579C03-2EB4-4D47-88EE-BFF339E96FAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA579C03-2EB4-4D47-88EE-BFF339E96FAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F0B4B3C-DC88-4740-B04F-1707102E9930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F0B4B3C-DC88-4740-B04F-1707102E9930}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F0B4B3C-DC88-4740-B04F-1707102E9930}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F0B4B3C-DC88-4740-B04F-1707102E9930}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1146,13 +1152,15 @@ Global
 		{19014C60-F87C-4CC7-AC0F-C41B6126EBCE} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
 		{94C8526E-DCC2-442F-9868-3DD0BA2688BE} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
 		{FA579C03-2EB4-4D47-88EE-BFF339E96FAF} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
+		{1F0B4B3C-DC88-4740-B04F-1707102E9930} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{03c5a84a-982b-4f38-ac73-ab832c645c4a}*SharedItemsImports = 5
 		src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{0a3c9afd-f6e6-4a5d-83fb-93bf66732696}*SharedItemsImports = 5
+		src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{1f0b4b3c-dc88-4740-b04f-1707102e9930}*SharedItemsImports = 5
 		src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{94c8526e-dcc2-442f-9868-3dd0ba2688be}*SharedItemsImports = 13
 		src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{9d36039f-d0a1-462f-85b4-81763c6b02cb}*SharedItemsImports = 13
 		src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{a9103b98-d888-4260-8a05-fa36f640698a}*SharedItemsImports = 5

src/BuiltInTools/AspireService/AspireServerService.cs

@@ -1,18 +1,12 @@
 // 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.Diagnostics;
 using System.Net;
 using System.Net.WebSockets;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;

src/BuiltInTools/AspireService/Helpers/CertGenerator.cs

@@ -1,7 +1,6 @@
 // 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.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 
@@ -35,7 +34,11 @@ public static X509Certificate2 GenerateCert()
             // The file will be automatically generated by the following call and disposed when the returned cert is disposed.
             using (cert)
             {
+#if NET9_0_OR_GREATER
+                return X509CertificateLoader.LoadPkcs12(cert.Export(X509ContentType.Pfx), password: null, X509KeyStorageFlags.UserKeySet);
+#else
                 return new X509Certificate2(cert.Export(X509ContentType.Pfx), "", X509KeyStorageFlags.UserKeySet);
+#endif
             }
         }
         else

src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs

@@ -82,7 +82,7 @@ private UpdateHandlerActions GetMetadataUpdateHandlerActions()
             var handlerActions = new UpdateHandlerActions();
             foreach (var assembly in sortedAssemblies)
             {
-                foreach (var attr in assembly.GetCustomAttributesData())
+                foreach (var attr in TryGetCustomAttributesData(assembly))
                 {
                     // Look up the attribute by name rather than by type. This would allow netstandard targeting libraries to
                     // define their own copy without having to cross-compile.
@@ -106,6 +106,25 @@ private UpdateHandlerActions GetMetadataUpdateHandlerActions()
             return handlerActions;
         }
 
+        private IList<CustomAttributeData> TryGetCustomAttributesData(Assembly assembly)
+        {
+            try
+            {
+                return assembly.GetCustomAttributesData();
+            }
+            catch (Exception e)
+            {
+                // In cross-platform scenarios, such as debugging in VS through WSL, Roslyn
+                // runs on Windows, and the agent runs on Linux. Assemblies accessible to Windows
+                // may not be available or loaded on linux (such as WPF's assemblies).
+                // In such case, we can ignore the assemblies and continue enumerating handlers for
+                // the rest of the assemblies of current domain.
+                _log($"'{assembly.FullName}' is not loaded ({e.Message})");
+
+                return new List<CustomAttributeData>();
+            }
+        }
+
         internal void GetHandlerActions(UpdateHandlerActions handlerActions, Type handlerType)
         {
             bool methodFound = false;

src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs

@@ -26,9 +26,11 @@ public static void Initialize()
         // When launching the application process dotnet-watch sets Hot Reload environment variables via CLI environment directives (dotnet [env:X=Y] run).
         // Currently, the CLI parser sets the env variables to the dotnet.exe process itself, rather then to the target process.
         // This may cause the dotnet.exe process to connect to the named pipe and break it for the target process.
-        if (Path.ChangeExtension(processPath, ".exe") != Path.ChangeExtension(s_targetProcessPath, ".exe"))
+        var processExe = Path.ChangeExtension(processPath, ".exe");
+        var expectedExe = Path.ChangeExtension(s_targetProcessPath, ".exe");
+        if (!string.Equals(processExe, expectedExe, Path.DirectorySeparatorChar == '\\' ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal))
         {
-            Log($"Ignoring process '{processPath}', expecting '{s_targetProcessPath}'");
+            Log($"Ignoring process '{processExe}', expecting '{expectedExe}'");
             return;
         }
 

src/BuiltInTools/dotnet-watch/DotNetWatcher.cs

@@ -27,7 +27,7 @@ public override async Task WatchAsync(CancellationToken cancellationToken)
 
             var environmentBuilder = EnvironmentVariablesBuilder.FromCurrentEnvironment();
 
-            FileItem? changedFile = null;
+            ChangedFile? changedFile = null;
             var buildEvaluator = new BuildEvaluator(Context, RootFileSetFactory);
             await using var browserConnector = new BrowserConnector(Context);
 
@@ -86,17 +86,17 @@ public override async Task WatchAsync(CancellationToken cancellationToken)
 
                 var processTask = ProcessRunner.RunAsync(processSpec, Context.Reporter, isUserApplication: true, processExitedSource: null, combinedCancellationSource.Token);
 
-                Task<FileItem?> fileSetTask;
+                Task<ChangedFile?> fileSetTask;
                 Task finishedTask;
 
                 while (true)
                 {
                     fileSetTask = fileSetWatcher.GetChangedFileAsync(startedWatching: null, combinedCancellationSource.Token);
                     finishedTask = await Task.WhenAny(processTask, fileSetTask, cancelledTaskSource.Task);
 
-                    if (staticFileHandler != null && finishedTask == fileSetTask && fileSetTask.Result is FileItem fileItem)
+                    if (staticFileHandler != null && finishedTask == fileSetTask && fileSetTask.Result.HasValue)
                     {
-                        if (await staticFileHandler.HandleFileChangesAsync([fileItem], combinedCancellationSource.Token))
+                        if (await staticFileHandler.HandleFileChangesAsync([fileSetTask.Result.Value], combinedCancellationSource.Token))
                         {
                             // We're able to handle the file change event without doing a full-rebuild.
                             continue;
@@ -131,7 +131,7 @@ public override async Task WatchAsync(CancellationToken cancellationToken)
                     Debug.Assert(finishedTask == fileSetTask);
                     changedFile = fileSetTask.Result;
                     Debug.Assert(changedFile != null, "ChangedFile should only be null when cancelled");
-                    Context.Reporter.Output($"File changed: {changedFile.Value.FilePath}");
+                    Context.Reporter.Output($"File changed: {changedFile.Value.Item.FilePath}");
                 }
             }
         }

src/BuiltInTools/dotnet-watch/FileItem.cs

@@ -1,9 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.DotNet.Watcher.Internal;
+
 namespace Microsoft.DotNet.Watcher
 {
-    internal readonly struct FileItem
+    internal readonly record struct FileItem
     {
         public string FilePath { get; init; }
 
@@ -14,7 +16,7 @@ internal readonly struct FileItem
 
         public string? StaticWebAssetPath { get; init; }
 
-        public bool IsNewFile { get; init; }
+        public ChangeKind Change { get; init; }
 
         public bool IsStaticFile => StaticWebAssetPath != null;
     }

src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs

@@ -46,15 +46,15 @@ public IReadOnlyList<string> GetProcessArguments(int iteration)
             return [context.RootProjectOptions.Command, .. context.RootProjectOptions.CommandArguments];
         }
 
-        public async ValueTask<EvaluationResult> EvaluateAsync(FileItem? changedFile, CancellationToken cancellationToken)
+        public async ValueTask<EvaluationResult> EvaluateAsync(ChangedFile? changedFile, CancellationToken cancellationToken)
         {
             if (context.EnvironmentOptions.SuppressMSBuildIncrementalism)
             {
                 RequiresRevaluation = true;
                 return _evaluationResult = await CreateEvaluationResult(cancellationToken);
             }
 
-            if (_evaluationResult == null || RequiresMSBuildRevaluation(changedFile))
+            if (_evaluationResult == null || RequiresMSBuildRevaluation(changedFile?.Item))
             {
                 RequiresRevaluation = true;
             }

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

@@ -1,20 +1,15 @@
 // 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.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.MSBuild;
-using Microsoft.Extensions.Tools.Internal;
-using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api;
-using System.Collections.Immutable;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.DotNet.Watcher.Internal;
+using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.DotNet.Watcher.Tools;
 
@@ -106,13 +101,24 @@ ImmutableArray<DocumentInfo> MapDocuments(ProjectId mappedProjectId, IReadOnlyLi
             }).ToImmutableArray();
     }
 
-    public async ValueTask UpdateFileContentAsync(IEnumerable<FileItem> changedFiles, CancellationToken cancellationToken)
+    public async ValueTask UpdateFileContentAsync(IEnumerable<ChangedFile> changedFiles, CancellationToken cancellationToken)
     {
         var updatedSolution = CurrentSolution;
 
-        foreach (var changedFile in changedFiles)
+        var documentsToRemove = new List<DocumentId>();
+
+        foreach (var (changedFile, change) in changedFiles)
         {
+            // when a file is added we reevaluate the project:
+            Debug.Assert(change != ChangeKind.Add);
+
             var documentIds = updatedSolution.GetDocumentIdsWithFilePath(changedFile.FilePath);
+            if (change == ChangeKind.Delete)
+            {
+                documentsToRemove.AddRange(documentIds);
+                continue;
+            }
+
             foreach (var documentId in documentIds)
             {
                 var textDocument = updatedSolution.GetDocument(documentId)
@@ -140,9 +146,17 @@ public async ValueTask UpdateFileContentAsync(IEnumerable<FileItem> changedFiles
             }
         }
 
+        updatedSolution = RemoveDocuments(updatedSolution, documentsToRemove);
+
         await ReportSolutionFilesAsync(SetCurrentSolution(updatedSolution), cancellationToken);
     }
 
+    private static Solution RemoveDocuments(Solution solution, IEnumerable<DocumentId> ids)
+        => solution
+        .RemoveDocuments(ids.Where(id => solution.GetDocument(id) != null).ToImmutableArray())
+        .RemoveAdditionalDocuments(ids.Where(id => solution.GetAdditionalDocument(id) != null).ToImmutableArray())
+        .RemoveAnalyzerConfigDocuments(ids.Where(id => solution.GetAnalyzerConfigDocument(id) != null).ToImmutableArray());
+
     private static async ValueTask<SourceText> GetSourceTextAsync(string filePath, CancellationToken cancellationToken)
     {
         var zeroLengthRetryPerformed = false;

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

@@ -5,6 +5,7 @@
 using System.Collections;
 using System.Diagnostics;
 using Microsoft.Build.Graph;
+using Microsoft.DotNet.Watcher.Internal;
 using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.DotNet.Watcher.Tools
@@ -13,14 +14,14 @@ internal sealed class ScopedCssFileHandler(IReporter reporter, ProjectNodeMap pr
     {
         private const string BuildTargetName = "GenerateComputedBuildStaticWebAssets";
 
-        public async ValueTask HandleFileChangesAsync(IReadOnlyList<FileItem> files, CancellationToken cancellationToken)
+        public async ValueTask HandleFileChangesAsync(IReadOnlyList<ChangedFile> files, CancellationToken cancellationToken)
         {
             var projectsToRefresh = new HashSet<ProjectGraphNode>();
             var hasApplicableFiles = false;
 
             for (int i = 0; i < files.Count; i++)
             {
-                var file = files[i];
+                var file = files[i].Item;
 
                 if (!file.FilePath.EndsWith(".razor.css", StringComparison.Ordinal) &&
                     !file.FilePath.EndsWith(".cshtml.css", StringComparison.Ordinal))

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

@@ -7,6 +7,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.CodeAnalysis.StackTraceExplorer;
+using Microsoft.DotNet.Watcher.Internal;
 using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.DotNet.Watcher.Tools
@@ -18,13 +19,13 @@ internal sealed class StaticFileHandler(IReporter reporter, ProjectNodeMap proje
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
         };
 
-        public async ValueTask<bool> HandleFileChangesAsync(IReadOnlyList<FileItem> files, CancellationToken cancellationToken)
+        public async ValueTask<bool> HandleFileChangesAsync(IReadOnlyList<ChangedFile> files, CancellationToken cancellationToken)
         {
             var allFilesHandled = true;
             var refreshRequests = new Dictionary<BrowserRefreshServer, List<string>>();
             for (int i = 0; i < files.Count; i++)
             {
-                var file = files[i];
+                var file = files[i].Item;
 
                 if (file.StaticWebAssetPath is null)
                 {