From 6cf8c2dee65d23fb23cf6e0b23740e0b440e4e87 Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Sat, 14 Mar 2026 22:08:20 -0500
Subject: [PATCH] Move PackageReference Update to .targets.in (imported after
 project)

PackageReference Update in Directory.Build.props runs before the
project file, so it cannot affect items declared in the project.
Move to Directory.Build.targets.in which is imported after, and
pipe the version variable to the targets template instead.
---
 .../TestInfrastructure/Directory.Build.targets.in     | 11 +++++++++++
 .../TestInfrastructure/PrepareForTest.targets         |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/TestInfrastructure/Directory.Build.targets.in b/src/ProjectTemplates/TestInfrastructure/Directory.Build.targets.in
index 94ab88b37546..b88e658e8b3d 100644
--- a/src/ProjectTemplates/TestInfrastructure/Directory.Build.targets.in
+++ b/src/ProjectTemplates/TestInfrastructure/Directory.Build.targets.in
@@ -6,4 +6,15 @@
     <!-- This sets an option which prevents the tests from rolling forward into a newer shared framework. -->
     <UserRuntimeConfig Condition="'$(PublishAot)' != 'true'">$(MSBuildThisFileDirectory)runtimeconfig.norollforward.json</UserRuntimeConfig>
   </PropertyGroup>
+
+  <!--
+    Pin the DevServer package to the exact locally-built version so that stable versions from
+    darc feeds (which outrank prerelease in SemVer) don't cause NU1603 with TreatWarningsAsErrors.
+    PackageReference Update must be in .targets (not .props) so it runs after the project's items.
+    See https://github.com/dotnet/aspnetcore/issues/65701
+  -->
+  <ItemGroup Condition="'${MicrosoftAspNetCoreComponentsWebAssemblyDevServerVersion}' != ''">
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.DevServer"
+                      Version="[${MicrosoftAspNetCoreComponentsWebAssemblyDevServerVersion}]" />
+  </ItemGroup>
 </Project>
diff --git a/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets b/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets
index 912874a029a4..f41892311245 100644
--- a/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets
+++ b/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets
@@ -136,7 +136,7 @@
     <GenerateFileFromTemplate
       TemplateFile="$(MSBuildThisFileDirectory)..\TestInfrastructure\Directory.Build.targets.in"
       Properties="Configuration=$(Configuration);
-          RestoreAdditionalProjectSources=$([MSBuild]::Escape('$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)'))"
+          RestoreAdditionalProjectSources=$([MSBuild]::Escape('$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)'));MicrosoftAspNetCoreComponentsWebAssemblyDevServerVersion=$(MicrosoftAspNetCoreComponentsWebAssemblyDevServerVersion)"
       OutputPath="$(TestTemplateCreationFolder)Directory.Build.targets" />
 
     <GenerateFileFromTemplate