Use project name in project path map to account for multi-targeting (#…

…45602)
dotnet · Dec 20, 2024 · 2f99a87 · 2f99a87
1 parent bfa1bbc
commit 2f99a87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs
@@ -48,13 +48,13 @@ public async Task UpdateProjectConeAsync(string rootProjectPath, CancellationTok
             projectInfos = [];
         }
 
-        var oldProjectIdsByPath = oldSolution.Projects.ToDictionary(keySelector: static p => p.FilePath!, elementSelector: static p => p.Id);
+        var oldProjectIdsByPath = oldSolution.Projects.ToDictionary(keySelector: static p => (p.FilePath!, p.Name), elementSelector: static p => p.Id);
 
-        // Map new project id to the corresponding old one based on file path, if it exists, and null for added projects.
+        // Map new project id to the corresponding old one based on file path and project name (includes TFM), if it exists, and null for added projects.
         // Deleted projects won't be included in this map.
         var projectIdMap = projectInfos.ToDictionary(
             keySelector: static info => info.Id,
-            elementSelector: info => oldProjectIdsByPath.TryGetValue(info.FilePath!, out var oldProjectId) ? oldProjectId : null);
+            elementSelector: info => oldProjectIdsByPath.TryGetValue((info.FilePath!, info.Name), out var oldProjectId) ? oldProjectId : null);
 
         var newSolution = oldSolution;
 

diff --git a/test/TestAssets/TestProjects/WatchAppWithProjectDeps/Dependency/Dependency.csproj b/test/TestAssets/TestProjects/WatchAppWithProjectDeps/Dependency/Dependency.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;$(CurrentTargetFramework)</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>