| 
90 | 90 |         <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>  | 
91 | 91 |       </V5AssetsCandidates>  | 
92 | 92 |     </ItemGroup>  | 
93 |  | -      | 
94 |  | -    <DefineStaticWebAssets Condition="'@(V4AssetsCandidates->Count())' != '0'" CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V4" BasePath="$(StaticWebAssetBasePath)">  | 
 | 93 | + | 
 | 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 | +    >  | 
95 | 102 |       <Output TaskParameter="Assets" ItemName="V4Assets" />  | 
96 | 103 |     </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 | +    >  | 
98 | 114 |       <Output TaskParameter="Assets" ItemName="V5Assets" />  | 
99 | 115 |     </DefineStaticWebAssets>  | 
100 | 116 | 
 
  | 
 | 
106 | 122 |     >  | 
107 | 123 |       <Output TaskParameter="Endpoints" ItemName="V4AssetEndpoints" />  | 
108 | 124 |     </DefineStaticWebAssetEndpoints>  | 
109 |  | -      | 
 | 125 | + | 
110 | 126 |     <DefineStaticWebAssetEndpoints  | 
111 | 127 |       Condition="'@(V5Assets)' != ''"  | 
112 | 128 |       CandidateAssets="@(V5Assets)"  | 
 | 
116 | 132 |       <Output TaskParameter="Endpoints" ItemName="V5AssetEndpoints" />  | 
117 | 133 |     </DefineStaticWebAssetEndpoints>  | 
118 | 134 | 
 
  | 
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" />  | 
121 | 146 | 
 
  | 
122 | 147 |     <GenerateStaticWebAssetEndpointsPropsFile  | 
123 | 148 |       StaticWebAssets="@(V4Assets)"  | 
 | 149 | +      PackagePathPrefix="staticwebassets/V4"  | 
124 | 150 |       StaticWebAssetEndpoints="@(V4AssetEndpoints)"  | 
125 | 151 |       TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.endpoints.targets" />  | 
126 | 152 | 
 
  | 
127 | 153 |     <GenerateStaticWebAssetEndpointsPropsFile  | 
128 | 154 |       StaticWebAssets="@(V5Assets)"  | 
 | 155 | +      PackagePathPrefix="staticwebassets/V5"  | 
129 | 156 |       StaticWebAssetEndpoints="@(V5AssetEndpoints)"  | 
130 | 157 |       TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.endpoints.targets" />  | 
131 | 158 | 
 
  | 
132 |  | -    <ComputeStaticWebAssetsTargetPaths Assets="@(V4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">  | 
 | 159 | +    <ComputeStaticWebAssetsTargetPaths Assets="@(FinalV4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">  | 
133 | 160 |       <Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />  | 
134 | 161 |     </ComputeStaticWebAssetsTargetPaths>  | 
135 |  | -    <ComputeStaticWebAssetsTargetPaths Assets="@(V5Assets)" PathPrefix="staticwebassets/V5" AdjustPathsForPack="true">  | 
 | 162 | +    <ComputeStaticWebAssetsTargetPaths Assets="@(FinalV5Assets)" PathPrefix="staticwebassets/V5" AdjustPathsForPack="true">  | 
136 | 163 |       <Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />  | 
137 | 164 |     </ComputeStaticWebAssetsTargetPaths>  | 
138 | 165 | 
 
  | 
 | 
0 commit comments