Merge pull request #1250 from unoplatform/dev/dr/feedStyle2

fix: Fix FeedView template not loading on windows

src/Uno.Extensions.Reactive.UI/Themes/Generic.UI.xaml

@@ -1,10 +1,9 @@
 <ResourceDictionary
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:toolkit="using:Uno.UI.Toolkit">
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
 	<ResourceDictionary.MergedDictionaries>
-		<ResourceDictionary Source="View/FeedView.xaml" />
+		<ResourceDictionary Source="ms-appx:///Uno.Extensions.Reactive.UI/View/FeedView.xaml" />
 	</ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>

src/Uno.Extensions.Reactive.UI/Themes/Generic.WinUI.xaml

@@ -0,0 +1,9 @@
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<ResourceDictionary.MergedDictionaries>
+		<ResourceDictionary Source="ms-appx:///Uno.Extensions.Reactive.WinUI/View/FeedView.xaml" />
+	</ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>

src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.csproj

@@ -13,6 +13,20 @@
 	</PropertyGroup>
 	
 	<Import Project="common.props" />
+	
+	<ItemGroup>
+		<Page Update="Themes\Generic.UI.xaml" Link="Themes\Generic.xaml" />
+		<Page Remove="Themes\Generic.WinUI.xaml" />
+		<None Include="Themes\Generic.WinUI.xaml" />
+	</ItemGroup>
+
+	<Target Name="_RenameGenericXamlFile" BeforeTargets="_CopyOutOfDateSourceItemsToOutputDirectory">
+		<!-- The generic.xaml file is referenced using a Link, but XAML and XBF files generated by the MarkupCompilePass1 are still named generic.UI.<xaml|xbf>, which causes the _CopyOutOfDateSourceItemsToOutputDirectory to fail. -->
+		<ItemGroup>
+			<GenericXamlOutput Include="$(IntermediateOutputPath)\Themes\Generic.UI.*" />
+		</ItemGroup>
+		<Copy SourceFiles="@(GenericXamlOutput)" DestinationFiles="@(GenericXamlOutput->Replace('Generic.UI', 'Generic'))" />
+	</Target>
 
 	<ItemGroup>
 		<PackageReference Include="Uno.UI" />

src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.WinUI.csproj

@@ -16,6 +16,20 @@
 
 	<Import Project="common.props" />
 
+	<ItemGroup>
+		<Page Update="Themes\Generic.WinUI.xaml" Link="Themes\Generic.xaml" />
+		<Page Remove="Themes\Generic.UI.xaml" />
+		<None Include="Themes\Generic.UI.xaml" />
+	</ItemGroup>
+
+	<Target Name="_RenameGenericXamlFile" BeforeTargets="_CopyOutOfDateSourceItemsToOutputDirectory">
+		<!-- The generic.xaml file is referenced using a Link, but XAML and XBF files generated by the MarkupCompilePass1 are still named generic.WinUI.<xaml|xbf>, which causes the _CopyOutOfDateSourceItemsToOutputDirectory to fail. -->
+		<ItemGroup>
+			<GenericXamlOutput Include="$(IntermediateOutputPath)\Themes\Generic.WinUI.*" />
+		</ItemGroup>
+		<Copy SourceFiles="@(GenericXamlOutput)" DestinationFiles="@(GenericXamlOutput->Replace('Generic.WinUI', 'Generic'))" />
+	</Target>
+
 	<ItemGroup Condition="'$(_IsWinUI)'=='false'">
 		<PackageReference Include="Uno.WinUI" />
 	</ItemGroup>