Skip to content
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

Jump to bottom

Put package assets in TFM-specific folder #58995

Open
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
3bcc096
Put package assets in TFM-specific folder
wtgodbe Nov 15, 2024
4222092
Fixup
wtgodbe Nov 15, 2024
ae98ff6
Fix Identity.UI
wtgodbe Nov 19, 2024
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
6 changes: 3 additions & 3 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 @@ -34,9 +34,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 ...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 @@ -40,7 +40,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>
6 changes: 3 additions & 3 deletions src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,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>
Expand Down
2 changes: 1 addition & 1 deletion src/Identity/UI/src/buildMultiTargeting/Microsoft.AspNetCore.Identity.UI.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)..\buildTransitive\Microsoft.AspNetCore.Identity.UI.targets"/>
<Import Project="$(MSBuildThisFileDirectory)..\buildTransitive\**\Microsoft.AspNetCore.Identity.UI.targets"/>
</Project>
2 changes: 1 addition & 1 deletion src/Identity/UI/src/buildTransitive/Microsoft.AspNetCore.Identity.UI.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.AspNetCore.Identity.UI.targets"/>
<Import Project="$(MSBuildThisFileDirectory)..\build\**\Microsoft.AspNetCore.Identity.UI.targets"/>
</Project>
2 changes: 1 addition & 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 @@ -11,7 +11,7 @@

<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Hosting" />
<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>
Loading