Skip to content

[Identity] Fix Identity UI asset definitions #59100

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

Merged
merged 1 commit into from
Apr 29, 2025
Merged

[Identity] Fix Identity UI asset definitions #59100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 35 additions & 8 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 @@ -90,11 +90,27 @@
<RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
</V5AssetsCandidates>
</ItemGroup>

<DefineStaticWebAssets Condition="'@(V4AssetsCandidates->Count())' != '0'" CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V4" BasePath="$(StaticWebAssetBasePath)">

<DefineStaticWebAssets
Condition="'@(V4AssetsCandidates->Count())' != '0'"
CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)"
SourceType="Package"
AssetKind="All"
ContentRoot="assets/V4"
BasePath="$(StaticWebAssetBasePath)"
>
<Output TaskParameter="Assets" ItemName="V4Assets" />
</DefineStaticWebAssets>
<DefineStaticWebAssets Condition="'@(V5AssetsCandidates->Count())' != '0'" CandidateAssets="@(V5AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V5" BasePath="$(StaticWebAssetBasePath)">

<DefineStaticWebAssets
Condition="'@(V5AssetsCandidates->Count())' != '0'"
CandidateAssets="@(V5AssetsCandidates)"
SourceId="$(PackageId)"
SourceType="Package"
AssetKind="All"
ContentRoot="assets/V5"
BasePath="$(StaticWebAssetBasePath)"
>
<Output TaskParameter="Assets" ItemName="V5Assets" />
</DefineStaticWebAssets>

Expand All @@ -106,7 +122,7 @@
>
<Output TaskParameter="Endpoints" ItemName="V4AssetEndpoints" />
</DefineStaticWebAssetEndpoints>

<DefineStaticWebAssetEndpoints
Condition="'@(V5Assets)' != ''"
CandidateAssets="@(V5Assets)"
Expand All @@ -116,23 +132,34 @@
<Output TaskParameter="Endpoints" ItemName="V5AssetEndpoints" />
</DefineStaticWebAssetEndpoints>

<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
<ItemGroup>
<FinalV4Assets Include="@(V4Assets)">
<SourceType>Discovered</SourceType>
</FinalV4Assets>
<FinalV5Assets Include="@(V5Assets)">
<SourceType>Discovered</SourceType>
</FinalV5Assets>
</ItemGroup>

<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(FinalV4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(FinalV5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />

<GenerateStaticWebAssetEndpointsPropsFile
StaticWebAssets="@(V4Assets)"
PackagePathPrefix="staticwebassets/V4"
StaticWebAssetEndpoints="@(V4AssetEndpoints)"
TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.endpoints.targets" />

<GenerateStaticWebAssetEndpointsPropsFile
StaticWebAssets="@(V5Assets)"
PackagePathPrefix="staticwebassets/V5"
StaticWebAssetEndpoints="@(V5AssetEndpoints)"
TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.endpoints.targets" />

<ComputeStaticWebAssetsTargetPaths Assets="@(V4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">
<ComputeStaticWebAssetsTargetPaths Assets="@(FinalV4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">
<Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
</ComputeStaticWebAssetsTargetPaths>
<ComputeStaticWebAssetsTargetPaths Assets="@(V5Assets)" PathPrefix="staticwebassets/V5" AdjustPathsForPack="true">
<ComputeStaticWebAssetsTargetPaths Assets="@(FinalV5Assets)" PathPrefix="staticwebassets/V5" AdjustPathsForPack="true">
<Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
</ComputeStaticWebAssetsTargetPaths>

Expand Down
Loading