Skip to content

Commit d56da4c

Browse files
committed
Fix package definition
1 parent 9b0c831 commit d56da4c

File tree

1 file changed

+29
-4
lines changed

1 file changed

+29
-4
lines changed

src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj

+29-4
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,26 @@
9191
</V5AssetsCandidates>
9292
</ItemGroup>
9393

94-
<DefineStaticWebAssets Condition="'@(V4AssetsCandidates->Count())' != '0'" CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V4" BasePath="$(StaticWebAssetBasePath)">
94+
<DefineStaticWebAssets
95+
Condition="'@(V4AssetsCandidates->Count())' != '0'"
96+
CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)"
97+
SourceType="Package"
98+
AssetKind="All"
99+
ContentRoot="assets/V4"
100+
BasePath="$(StaticWebAssetBasePath)"
101+
>
95102
<Output TaskParameter="Assets" ItemName="V4Assets" />
96103
</DefineStaticWebAssets>
97-
<DefineStaticWebAssets Condition="'@(V5AssetsCandidates->Count())' != '0'" CandidateAssets="@(V5AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V5" BasePath="$(StaticWebAssetBasePath)">
104+
105+
<DefineStaticWebAssets
106+
Condition="'@(V5AssetsCandidates->Count())' != '0'"
107+
CandidateAssets="@(V5AssetsCandidates)"
108+
SourceId="$(PackageId)"
109+
SourceType="Package"
110+
AssetKind="All"
111+
ContentRoot="assets/V5"
112+
BasePath="$(StaticWebAssetBasePath)"
113+
>
98114
<Output TaskParameter="Assets" ItemName="V5Assets" />
99115
</DefineStaticWebAssets>
100116

@@ -116,8 +132,17 @@
116132
<Output TaskParameter="Endpoints" ItemName="V5AssetEndpoints" />
117133
</DefineStaticWebAssetEndpoints>
118134

119-
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
120-
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
135+
<ItemGroup>
136+
<FinalV4Assets Include="@(V4Assets)">
137+
<SourceType>Discovered</SourceType>
138+
</FinalV4Assets>
139+
<FinalV5Assets Include="@(V5Assets)">
140+
<SourceType>Discovered</SourceType>
141+
</FinalV5Assets>
142+
</ItemGroup>
143+
144+
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(FinalV4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
145+
<GenerateStaticWebAssetsPropsFile StaticWebAssets="@(FinalV5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
121146

122147
<GenerateStaticWebAssetEndpointsPropsFile
123148
StaticWebAssets="@(V4Assets)"

0 commit comments

Comments
 (0)