Merge pull request #980 from unoplatform/dev/jela/9-0-300-assets

fix: Adjust workaround for #973

Author: jeromelaban

src/Uno.Wasm.Bootstrap.Server/build/Uno.Wasm.Bootstrap.Server.targets

@@ -1,3 +1,14 @@
 <Project>
 
+	<!-- Workaround for https://github.com/unoplatform/Uno.Wasm.Bootstrap/issues/973 -->
+	<Target Name="_UnoAdjustResolveReferencedProjectsStaticWebAssetsConfiguration"
+			AfterTargets="ResolveReferencedProjectsStaticWebAssetsConfiguration"
+			Condition=" $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.300')) and '$(UnoDisableGetCurrentProjectBuildStaticWebAssetItems)' != 'true' ">
+		<ItemGroup>
+			<_UnoStaticWebAssetProjectConfiguration Include="@(StaticWebAssetProjectConfiguration)"  GetBuildAssetsTargets="_UnoAdjustGetCurrentProjectBuildStaticWebAssetItems"/>
+			<StaticWebAssetProjectConfiguration Remove="@(StaticWebAssetProjectConfiguration)" />
+			<StaticWebAssetProjectConfiguration Include="@(_UnoStaticWebAssetProjectConfiguration)" />
+		</ItemGroup>
+	</Target>
+
 </Project>

src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets

@@ -429,15 +429,17 @@
 	</Target>
 
 	<!-- Workaround for https://github.com/unoplatform/Uno.Wasm.Bootstrap/issues/973 -->
-	<Target Name="_UnoAdjustOriginalItemSpecForProjectReference"
-			BeforeTargets="GetCurrentProjectBuildStaticWebAssetItems"
-			Condition=" $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.300')) and '$(UnoDisableAdjustOriginalItemSpecForProjectReference)' != 'true' ">  
+	<Target Name="_UnoAdjustGetCurrentProjectBuildStaticWebAssetItems"
+			DependsOnTargets="GetCurrentProjectBuildStaticWebAssetItems"
+			Returns="@(_CachedBuildStaticWebAssetItems)"
+			Condition=" $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.300')) and '$(UnoDisableGetCurrentProjectBuildStaticWebAssetItems)' != 'true' ">
+
 		<ItemGroup>
-			<_UnoCachedBuildStaticWebAssets Include="@(_CachedBuildStaticWebAssets)">
-				<OriginalItemSpec Condition="'%(_CachedBuildStaticWebAssets.OriginalItemSpec)' != ''">$([System.IO.Path]::GetFullPath('%(_CachedBuildStaticWebAssets.OriginalItemSpec)'))</OriginalItemSpec>
+			<_UnoCachedBuildStaticWebAssets Include="@(_CachedBuildStaticWebAssetItems)">
+				<OriginalItemSpec Condition="'%(_CachedBuildStaticWebAssetItems.OriginalItemSpec)' != ''">$([System.IO.Path]::GetFullPath('%(_CachedBuildStaticWebAssetItems.OriginalItemSpec)'))</OriginalItemSpec>
 			</_UnoCachedBuildStaticWebAssets>
-			<_CachedBuildStaticWebAssets Remove="@(_CachedBuildStaticWebAssets)" />
-			<_CachedBuildStaticWebAssets Include="@(_UnoCachedBuildStaticWebAssets)" />
+			<_CachedBuildStaticWebAssetItems Remove="@(_CachedBuildStaticWebAssetItems)" />
+			<_CachedBuildStaticWebAssetItems Include="@(_UnoCachedBuildStaticWebAssets)" />
 		</ItemGroup>
 	</Target>
 </Project>