Skip to content

Put package assets in TFM-specific folder #58995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wtgodbe wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Put package assets in TFM-specific folder #58995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3d1eb6
Put package build assets in TFM-specific folders
wtgodbe Apr 30, 2026
27035b5
Move Identity.UI static web assets under build/<tfm>/
wtgodbe May 1, 2026
c1d6f7f
Revert Identity.UI TFM subfolder changes
wtgodbe May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...omponents/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
8 changes: 4 additions & 4 deletions src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...nts/WebView/WebView/src/buildMultiTargeting/Microsoft.AspNetCore.Components.WebView.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project>
<Import Project="..\build\Microsoft.AspNetCore.Components.WebView.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\build\$(TargetFramework)\Microsoft.AspNetCore.Components.WebView.props"/>
</Project>
2 changes: 1 addition & 1 deletion ...ponents/WebView/WebView/src/buildTransitive/Microsoft.AspNetCore.Components.WebView.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project>
<Import Project="..\build\Microsoft.AspNetCore.Components.WebView.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\build\$(TargetFramework)\Microsoft.AspNetCore.Components.WebView.props"/>
</Project>
4 changes: 3 additions & 1 deletion ...icrosoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ...t.AspNetCore.Grpc.JsonTranscoding/build/Microsoft.AspNetCore.Grpc.JsonTranscoding.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand Down
4 changes: 3 additions & 1 deletion src/Middleware/Spa/SpaProxy/src/Microsoft.AspNetCore.SpaProxy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
4 changes: 2 additions & 2 deletions ...ls/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ...tensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion ...scription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/Tools/Extensions.ApiDescription.Client/test/TargetTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/Tools/Extensions.ApiDescription.Client/test/TemporaryOpenApiProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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)
Expand Down
Loading