Put package build assets in TFM-specific folders

wtgodbe · Copilot · wtgodbe · commit b3d1eb6022be · 2026-05-01T08:02:58.000-07:00
When a package has a build/ or buildMultiTargeting/ folder without a TFM subfolder, NuGet considers it compatible with any TFM. This causes builds that should fail at restore to instead hit confusing runtime errors. Change PackagePath in csproj/nuspec to pack build assets into TFM subfolders (e.g., build/net11.0/ instead of build/). The source files themselves keep their original relative paths — NuGet resolves the TFM subfolder at restore time, and the relative directory structure within the package mirrors the source layout. Affected packages: - Microsoft.AspNetCore.SpaProxy - Microsoft.AspNetCore.Identity.UI - Microsoft.AspNetCore.Components.WebView - Microsoft.AspNetCore.Grpc.JsonTranscoding - Microsoft.Extensions.ApiDescription.Client Fixes #58990 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
diff --git a/src/Components/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj b/src/Components/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj
@@ -9,7 +9,7 @@
     <_BlazorModulesFilePath>..\..\..\..\WebView\src\blazor.modules.json</_BlazorModulesFilePath>
   </PropertyGroup>
 
-  <Import Project="..\..\..\..\WebView\src\buildTransitive\Microsoft.AspNetCore.Components.WebView.props" />
+  <Import Project="..\..\..\..\WebView\src\build\Microsoft.AspNetCore.Components.WebView.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Components.WebView.Photino.csproj" />
diff --git a/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj b/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj
@@ -6,7 +6,7 @@
     <EmbeddedFilesManifestFileName>Microsoft.Extensions.FileProviders.Embedded.Manifest.xml</EmbeddedFilesManifestFileName>
     <IsShippingPackage>true</IsShippingPackage>
     <DefineConstants>$(DefineConstants);BLAZOR_WEBVIEW</DefineConstants>
-    <NoWarn>$(NoWarn);BL0006</NoWarn>
+    <NoWarn>$(NoWarn);BL0006;NU5129</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Nullable>annotations</Nullable>
   </PropertyGroup>
@@ -33,9 +33,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="buildTransitive\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
-    <None Include="buildMultiTargeting\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
-    <None Include="build\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
+    <None Include="buildTransitive\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="buildTransitive\$(DefaultNetCoreTargetFramework)\" />
+    <None Include="buildMultiTargeting\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="buildMultiTargeting\$(DefaultNetCoreTargetFramework)\" />
+    <None Include="build\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Components/WebView/WebView/src/buildMultiTargeting/Microsoft.AspNetCore.Components.WebView.props b/src/Components/WebView/WebView/src/buildMultiTargeting/Microsoft.AspNetCore.Components.WebView.props
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="..\build\Microsoft.AspNetCore.Components.WebView.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\$(TargetFramework)\Microsoft.AspNetCore.Components.WebView.props"/>
 </Project>
diff --git a/src/Components/WebView/WebView/src/buildTransitive/Microsoft.AspNetCore.Components.WebView.props b/src/Components/WebView/WebView/src/buildTransitive/Microsoft.AspNetCore.Components.WebView.props
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="..\build\Microsoft.AspNetCore.Components.WebView.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\$(TargetFramework)\Microsoft.AspNetCore.Components.WebView.props"/>
 </Project>
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj
@@ -3,6 +3,8 @@
     <Description>HTTP API for gRPC ASP.NET Core</Description>
     <PackageTags>gRPC RPC HTTP/2 REST</PackageTags>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <!-- Suppress NU5129: build assets are intentionally in TFM subfolders -->
+    <NoWarn>$(NoWarn);NU5129</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -48,7 +50,7 @@
     <!-- See https://github.com/dotnet/aspnetcore/issues/52006 for more details. -->
     <None Include="build\*.targets">
       <Pack>true</Pack>
-      <PackagePath>build;buildTransitive</PackagePath>
+      <PackagePath>build\$(DefaultNetCoreTargetFramework);buildTransitive\$(DefaultNetCoreTargetFramework)</PackagePath>
     </None>
   </ItemGroup>
 </Project>
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/build/Microsoft.AspNetCore.Grpc.JsonTranscoding.targets b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/build/Microsoft.AspNetCore.Grpc.JsonTranscoding.targets
@@ -4,7 +4,7 @@
   <!-- This saves the developer having to find and copy these files to the right location when doing gRPC JSON transcoding. -->
   <PropertyGroup>
     <!-- The path of the proto files. Content from the nupkg. -->
-    <GrpcJsonTranscoding_ProtosPath>$( [System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)../content/protos) )</GrpcJsonTranscoding_ProtosPath>
+    <GrpcJsonTranscoding_ProtosPath>$( [System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)../../content/protos) )</GrpcJsonTranscoding_ProtosPath>
   </PropertyGroup>
 
   <!-- Run immediately before the Protobuf_BeforeCompile extension point. -->
diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
@@ -10,6 +10,8 @@
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 
     <PackageThirdPartyNoticesFile>$(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
+    <!-- Suppress NU5129: build assets are intentionally in TFM subfolders (build/<tfm>/) -->
+    <NoWarn>$(NoWarn);NU5129</NoWarn>
 
     <StaticWebAssetBasePath>Identity</StaticWebAssetBasePath>
     <ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
@@ -28,9 +30,9 @@
   <ItemGroup>
     <None Include="@(Content)" />
     <Content Remove="@(Content)" />
-    <None Include="build\*" Pack="true" PackagePath="build\" />
-    <None Include="buildMultiTargeting\*" Pack="true" PackagePath="buildMultiTargeting\" />
-    <None Include="buildTransitive\*" Pack="true" PackagePath="buildTransitive\" />
+    <None Include="build\*" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\" />
+    <None Include="buildMultiTargeting\*" Pack="true" PackagePath="buildMultiTargeting\$(DefaultNetCoreTargetFramework)\" />
+    <None Include="buildTransitive\*" Pack="true" PackagePath="buildTransitive\$(DefaultNetCoreTargetFramework)\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -187,16 +189,16 @@
 
     <ItemGroup>
       <StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V4.targets">
-        <PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V4.targets</PackagePath>
+        <PackagePath>build\$(DefaultNetCoreTargetFramework)\Microsoft.AspNetCore.StaticWebAssets.V4.targets</PackagePath>
       </StaticWebAssetPackageFile>
       <StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V4.endpoints.targets">
-        <PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V4.endpoints.targets</PackagePath>
+        <PackagePath>build\$(DefaultNetCoreTargetFramework)\Microsoft.AspNetCore.StaticWebAssets.V4.endpoints.targets</PackagePath>
       </StaticWebAssetPackageFile>
       <StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V5.targets">
-        <PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V5.targets</PackagePath>
+        <PackagePath>build\$(DefaultNetCoreTargetFramework)\Microsoft.AspNetCore.StaticWebAssets.V5.targets</PackagePath>
       </StaticWebAssetPackageFile>
       <StaticWebAssetPackageFile Include="$(IntermediateOutputPath)IdentityUI.V5.endpoints.targets">
-        <PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.V5.endpoints.targets</PackagePath>
+        <PackagePath>build\$(DefaultNetCoreTargetFramework)\Microsoft.AspNetCore.StaticWebAssets.V5.endpoints.targets</PackagePath>
       </StaticWebAssetPackageFile>
     </ItemGroup>
   </Target>
diff --git a/src/Identity/UI/src/buildMultiTargeting/Microsoft.AspNetCore.Identity.UI.targets b/src/Identity/UI/src/buildMultiTargeting/Microsoft.AspNetCore.Identity.UI.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)..\buildTransitive\Microsoft.AspNetCore.Identity.UI.targets"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\$(TargetFramework)\Microsoft.AspNetCore.Identity.UI.targets"/>
 </Project>
diff --git a/src/Identity/UI/src/buildTransitive/Microsoft.AspNetCore.Identity.UI.targets b/src/Identity/UI/src/buildTransitive/Microsoft.AspNetCore.Identity.UI.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.AspNetCore.Identity.UI.targets"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\$(TargetFramework)\Microsoft.AspNetCore.Identity.UI.targets"/>
 </Project>
diff --git a/src/Middleware/Spa/SpaProxy/src/Microsoft.AspNetCore.SpaProxy.csproj b/src/Middleware/Spa/SpaProxy/src/Microsoft.AspNetCore.SpaProxy.csproj
@@ -5,6 +5,8 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <IsTrimmable>true</IsTrimmable>
     <EnableAOTAnalyzer>false</EnableAOTAnalyzer>
+    <!-- Suppress NU5129: build assets are intentionally in TFM subfolders -->
+    <NoWarn>$(NoWarn);NU5129</NoWarn>
     <!-- This is ok since this assembly is not referenced by any application but it is loaded as a hosting startup
     assembly for apps referencing this package-->
   </PropertyGroup>
@@ -14,7 +16,7 @@
     <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Http.Features" />
-    <None Update="build\Microsoft.AspNetCore.SpaProxy.targets" Pack="true" PackagePath="build\Microsoft.AspNetCore.SpaProxy.targets" />
+    <None Update="build\Microsoft.AspNetCore.SpaProxy.targets" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\Microsoft.AspNetCore.SpaProxy.targets" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
@@ -6,8 +6,8 @@
 
   <files>
     $CommonFileElements$
-    <file src="build\*" target="build" />
-    <file src="buildMultiTargeting\*" target="buildMultiTargeting" />
+    <file src="build\*" target="build\netstandard2.0" />
+    <file src="buildMultiTargeting\*" target="buildMultiTargeting\netstandard2.0" />
     <file src="$baseOutputPath$\$configuration$\netstandard2.0\Microsoft.Extensions.ApiDescription.Client.*" target="tasks\netstandard2.0" />
   </files>
 </package>
diff --git a/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props b/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project>
   <PropertyGroup>
-    <_ApiDescriptionClientAssemblyPath>$(MSBuildThisFileDirectory)../tasks/netstandard2.0/Microsoft.Extensions.ApiDescription.Client.dll</_ApiDescriptionClientAssemblyPath>
+    <_ApiDescriptionClientAssemblyPath>$(MSBuildThisFileDirectory)../../tasks/netstandard2.0/Microsoft.Extensions.ApiDescription.Client.dll</_ApiDescriptionClientAssemblyPath>
   </PropertyGroup>
   
   <!-- Emit deprecation warning for this package -->
diff --git a/src/Tools/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props b/src/Tools/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project>
-  <Import Project="../build/Microsoft.Extensions.ApiDescription.Client.props" />
+  <Import Project="$(MSBuildThisFileDirectory)../../build/netstandard2.0/Microsoft.Extensions.ApiDescription.Client.props"/>
 </Project>
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/TargetTest.cs b/src/Tools/Extensions.ApiDescription.Client/test/TargetTest.cs
@@ -28,7 +28,7 @@ public TargetTest(ITestOutputHelper output)
         _output = output;
         _temporaryDirectory = new TemporaryDirectory();
 
-        var build = _temporaryDirectory.SubDir("build");
+        var build = _temporaryDirectory.SubDir("build").SubDir("netstandard2.0");
         var files = _temporaryDirectory.SubDir("files");
         var tasks = _temporaryDirectory.SubDir("tasks").SubDir("netstandard2.0");
         _temporaryDirectory.Create();
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/TemporaryOpenApiProject.cs b/src/Tools/Extensions.ApiDescription.Client/test/TemporaryOpenApiProject.cs
@@ -14,7 +14,7 @@ public TemporaryOpenApiProject(string name, TemporaryDirectory directory, string
 
     protected override string Template =>
 @"<Project Sdk=""{2}"">
-  <Import Project=""build/Microsoft.Extensions.ApiDescription.Client.props"" />
+  <Import Project=""build/netstandard2.0/Microsoft.Extensions.ApiDescription.Client.props"" />
 
   <PropertyGroup>
     {0}
@@ -34,8 +34,8 @@ public TemporaryOpenApiProject(string name, TemporaryDirectory directory, string
         Condition="" '@(TypeScriptCompile)' != '' "" />
   </Target>
 
-  <Import Project=""build/Microsoft.Extensions.ApiDescription.Client.targets"" />
-  <Import Project=""build/Fakes.targets"" />
+  <Import Project=""build/netstandard2.0/Microsoft.Extensions.ApiDescription.Client.targets"" />
+  <Import Project=""build/netstandard2.0/Fakes.targets"" />
 </Project>";
 
     protected override void AddAdditionalAttributes(StringBuilder sb, TemporaryCSharpProject.ItemSpec item)
